Merge branch 'master' of http://192.168.0.27:8090/xuxu/integrate-admin

src/layout/menu/MenuBar.vue

@@ -24,15 +24,12 @@ const activeIdex = computed(() => {
     return path;
 })
 //菜单数据
-const menuList = computed(() => {
-    console.log(store.getters['menu/getMenuList']);
-    return store.getters['menu/getMenuList']
-})
+const menuList = computed(() => store.getters['menu/getMenuList'])
 
-const isCollapse = computed(() => {
+const isCollapse = computed(() =>
     // return store.getters['getCollapse']
-    return store.getters['menu/getCollapse']
-})
+    store.getters['menu/getCollapse']
+)
 const handleOpen = (key: string, keyPath: string[]) => {
     // console.log(key, keyPath)
 }

src/views/manage/components/fieldConfiguration/newField.vue

@@ -10,7 +10,7 @@
                 </el-col>
                 <el-col :span="8">
                     <el-form-item label="同步顺序" prop="paiXu">
-                        <el-input v-model="fieidForm.paiXu" placeholder="请输入同步顺序" />
+                        <el-input v-model="fieidForm.paiXu" type="number" placeholder="请输入同步顺序" />
                     </el-form-item>
                 </el-col>
                 <el-col :span="8">
@@ -117,6 +117,7 @@
 import { ref, watch } from 'vue';
 import { ElMessage, ElMessageBox } from 'element-plus';
 import { addCommonConfig, putCommonConfig } from '@/services/api/systemApi/fieldConfiguration/commonConfig'
+import Change from 'wangeditor/dist/editor/change';
 
 const props = defineProps({
     currentPage: {
@@ -136,7 +137,7 @@ const fieldTitle = ref('新增字段')
 const fieidForm = ref({
     sFormId: '',
     docType: '',
-    paiXu:"",
+    paiXu: undefined,
     name: '',
     direction: '',
     operation: '1',
@@ -154,14 +155,17 @@ const fieidForm = ref({
     entryPrimaryKeyField: '',
 })
 const kingdeeFiledDetailData = ref<any>([])
-const fieidRules = ref({
+const fieidRules: any = ref({
     docType: [{ required: true, message: '', trigger: 'blur' }],
-    paiXu: [{ required: true, message: '', trigger: 'blur' }],
     sFormId: [{ required: true, message: '', trigger: 'blur' }],
+    paiXu: [
+        { required: true, message: '', trigger: 'blur' },
+        // { type: 'number', message: '必须为数字值', trigger: 'blur' }
+    ],
     name: [{ required: true, message: '', trigger: 'blur' }],
     entryName: [{ required: true, message: '', trigger: 'blur' }],
     primaryKeyField: [{ required: true, message: '', trigger: 'blur' }],
-    direction: [{ required: true, message: '', trigger: 'blur' }],
+    direction: [{ required: true, message: '', trigger: 'blur' }]
 })
 
 const updateCount = ref(0)
@@ -203,7 +207,7 @@ const clear = () => {
     fieidForm.value = {
         sFormId: '',
         docType: '',
-        paiXu:'',
+        paiXu: undefined,
         name: '',
         direction: '',
         operation: '1',

src/views/manage/formConfiguration.vue

@@ -117,6 +117,7 @@ const handleScreen = () => init(searchValue.value, tablePage.value.pageNo, table
 const handleAdd = () => {
     title.value = '添加'
     visible.value = true
+    nextTick(() => jsonRef.value.clear())
 }
 
 const handleDetails = (row: any) => {
@@ -174,17 +175,16 @@ const onConfirm = () => {
     if (title.value === '添加') {
         saveStructure(json).then((res: any) => {
             if (res.code === 200) {
-                jsonRef.value.clear()
+                jsonRef.value.handleClearable()
                 init(searchValue.value, tablePage.value.pageNo, tablePage.value.pageSize)
                 visible.value = false
                 ElMessage({ type: 'success', message: '添加成功' })
             }
         })
     } else {
-
         saveStructure(json, structureId.value).then((res: any) => {
             if (res.code === 200) {
-                jsonRef.value.clear()
+                jsonRef.value.handleClearable()
                 init(searchValue.value, tablePage.value.pageNo, tablePage.value.pageSize)
                 visible.value = false
                 ElMessage({ type: 'success', message: '编辑成功' })
@@ -195,15 +195,15 @@ const onConfirm = () => {
 }
 
 const handleClose = () => {
-    jsonRef.value.clear()
+    jsonRef.value.handleClearable()
     visible.value = false
 }
 
 const handleCloseDialog = () => {
     dialogVisible.value = false
     loadingDialog.value = true
-    dataList.value = undefined
-    fieldList.value = undefined
+    dataList.value = null
+    fieldList.value = null
 }
 
 const initStructureData = (formId: string, pageNo?: number, pageSize?: number) => {
@@ -214,8 +214,8 @@ const initStructureData = (formId: string, pageNo?: number, pageSize?: number) =
             tablePageDialog.value.total = res.data.total
             loadingDialog.value = true
         } else {
-            dataList.value = undefined
-            fieldList.value = undefined
+            dataList.value = null
+            fieldList.value = null
         }
     })
 }
@@ -234,7 +234,7 @@ init(searchValue.value, tablePage.value.pageNo, tablePage.value.pageSize)
 
 <style lang="scss" scoped>
 :deep(.fc-style) {
-    height: 800px;
+    min-height: 400px;
     border: 1px solid #ccc;
 }
 </style>
\ No newline at end of file

src/views/manage/synchronousMonitoring.vue

@@ -276,7 +276,6 @@ const handleManual = async () => {
     }
 };
 
-
 const handleMacAddress = () => {
     getMacAddress().then((res: any) => {
         if (res.code === 200) {

src/vueFormCreate/core/element/ElDesignForm.vue

@@ -33,7 +33,7 @@
               </el-header>
               <el-main class="config-content">
                 <ElWidgetConfig v-show="configTab === 'widget'" v-model:select="widgetFormSelect" />
-                <ElFormConfig v-show="configTab === 'form'" v-model:config="widgetForm.config" />
+                <ElFormConfig v-show="configTab === 'form'" v-model:config="widgetForm.config" ref="formConfigRef" />
               </el-main>
             </el-container>
           </el-aside>
@@ -96,7 +96,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, reactive, PropType, toRefs, watchEffect } from 'vue'
+import { defineComponent, reactive, PropType, toRefs, watchEffect, ref, nextTick } from 'vue'
 import { ElMessage } from 'element-plus'
 import { defaultsDeep } from 'lodash'
 import CodeEditor from '../../components/CodeEditor.vue'
@@ -169,6 +169,8 @@ export default defineComponent({
       loading: false
     })
 
+    const formConfigRef = ref()
+
     const showPreviewVisible = () => {
       state.previewVisible = true
     }
@@ -178,13 +180,9 @@ export default defineComponent({
     }
     const detailJson = (Json: string) => {
       if (Json) {
-        console.log('json', JSON.parse(Json));
         state.widgetForm = {}
-        defaultsDeep(state.widgetForm, JSON.parse(Json))
-        element.widgetForm.config = JSON.parse(Json).config
-        // element.widgetForm.config
-        console.log('state.widgetForm', state.widgetForm);
-        console.log('element.widgetForm', element.widgetForm);
+        nextTick(() => defaultsDeep(state.widgetForm, JSON.parse(Json))) // 加载速度要比下面快
+        formConfigRef.value.updataNewData(JSON.parse(Json))
       }
     }
     // 导入json
@@ -192,12 +190,8 @@ export default defineComponent({
       try {
         state.widgetForm.list = []
         defaultsDeep(state.widgetForm, JSON.parse(state.jsonEg))
-        console.log("json1", state.widgetForm.list);
 
-        if (state.widgetForm.list) {
-          state.widgetFormSelect = state.widgetForm.list[0]
-          console.log("json", state.widgetFormSelect);
-        }
+        if (state.widgetForm.list) state.widgetFormSelect = state.widgetForm.list[0]
 
         state.uploadJsonVisible = false
         ElMessage.success('上传成功')
@@ -263,10 +257,10 @@ export default defineComponent({
 
     const handleClearable = () => {
       state.widgetForm.list = []
-      defaultsDeep(
+      nextTick(() => defaultsDeep(
         state.widgetForm,
         JSON.parse(JSON.stringify(element.widgetForm))
-      )
+      ))
       state.widgetFormSelect = undefined
     }
 
@@ -285,9 +279,13 @@ export default defineComponent({
     const getTemplate = (codeType: CodeType) =>
       generateCode(state.widgetForm, codeType, PlatformType.Element)
 
-    const clear = () => handleClearable()
+    const clear = () => {
+      handleClearable()
+      formConfigRef.value.updataNewData(element.widgetForm)
+    }
     return {
       state,
+      formConfigRef,
       ...toRefs(state),
       handleUploadJson,
       handleCopyClick,
@@ -300,11 +298,11 @@ export default defineComponent({
       getJson,
       setJson,
       getTemplate,
-      clear,
       showPreviewVisible,
       showGenerateJsonVisible,
       onConfirm,
-      detailJson
+      detailJson,
+      clear
     }
   }
 })

src/vueFormCreate/core/element/ElFormConfig.vue

@@ -38,7 +38,7 @@
 </template>
 
 <script lang="ts">
-import { put, widgetForm, WidgetForm } from '../../config/element'
+import { WidgetForm } from '../../config/element'
 import { element } from '../../config'
 import { defineComponent, PropType, ref, watch } from 'vue'
 
@@ -55,21 +55,20 @@ export default defineComponent({
     const data = ref(props.config)
 
     watch(data, () => {
-      console.log(data);
       context.emit('update:config', data)
     })
     const state = ref<any>({
       widgetForm: element.widgetForm
     })
 
-    // 深度监听 widgetForm.config 表单属性的值，获取最新的数据
-    watch(() => data.value, (newVal) => {
-      widgetForm.config = newVal
-    }, { deep: true })
+    // 编辑时更新数据
+    const updataNewData = (value: any) => data.value = value.config
+
 
     return {
       data,
-      state
+      state,
+      updataNewData
     }
   }
 })

src/vueFormCreate/core/element/ElGenerateForm.vue

 <template>
-  <div class="fc-style">
+  <div class="fc-style" style="padding: 20px;">
     <el-form ref="generateForm" label-suffix=":" :model="model" :rules="rules" :size="widgetForm.config.size"
       :label-position="widgetForm.config.labelPosition" :label-width="`${widgetForm.config.labelWidth}px`"
       :hide-required-asterisk="widgetForm.config.hideRequiredAsterisk">

vite.config.ts

@@ -89,7 +89,7 @@ export default ({ command, mode }) => {
         // '/foo': '',
         // 选项写法
         "/integrate": {
-          target: "http://localhost:8090",
+          target: "http://192.168.0.60",
           //  rewrite: (path) => path.replace(/^\/api/, '')
         },
         // 正则表达式写法