vue2-client 1.11.2 → 1.11.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.11.2",
+  "version": "1.11.4",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

package/src/base-client/components/common/XForm/XFormItem.vue

@@ -774,7 +774,9 @@ export default {
     },
     labelCol: {
       type: Object,
-      default: () => { return { span: 8 } }
+      default: () => {
+        return { span: 8 }
+      }
     }
   },
   provide () {
@@ -1095,6 +1097,8 @@ export default {
         } else if (this.attr.keyName.indexOf('async ') !== -1 || this.attr.keyName.indexOf('function ') !== -1) {
           this.updateOptions()
         }
+      } else if (this.attr.keys) {
+        this.getDataCallback(this.attr.keys)
       }
       this.focusInput()
     },
@@ -1110,14 +1114,16 @@ export default {
     getDataCallback (res) {
       this.option = res
       if (this.attr.type === 'treeSelect') {
-        this.$refs.xTreeSelect.init({
-          option: this.option,
-          form: this.form,
-          queryType: this.attr.queryType,
-          name: this.attr.name,
-          model: this.attr.model,
-          mode: this.mode,
-          disabled: this.disabled
+        this.$nextTick(() => {
+          this.$refs.xTreeSelect.init({
+            option: this.option,
+            form: this.form,
+            queryType: this.attr.queryType,
+            name: this.attr.name,
+            model: this.attr.model,
+            mode: this.mode,
+            disabled: this.disabled
+          })
         })
       } else if (this.attr.type === 'radio' || ['radioGroup', 'clickChange'].includes(this.attr.showMode)) {
         this.initRadioValue()

package/src/base-client/components/common/XForm/XTreeSelect.vue

@@ -89,6 +89,7 @@ export default {
             if (this.mode === '查询') {
               const values = []
               this.getValues(option, value, values)
+              this.$emit('onChange', values)
             } else {
               this.value = value
             }
@@ -101,14 +102,25 @@ export default {
       this.$emit('mounted', this)
       this.loaded = true
     },
-    getValues (option, value, values, flag) {
+    getValues (option, value, values) {
       for (const item of option) {
         if (value.includes(item.value)) {
           values.push(item.value)
-          flag = true
+          // 找到匹配节点后，递归添加所有子节点的值
+          if (item.children && item.children.length) {
+            this.getAllChildrenValues(item.children, values)
+          }
         }
         if (item.children && item.children.length) {
-          this.getValues(item.children, value, values, flag)
+          this.getValues(item.children, value, values)
+        }
+      }
+    },
+    getAllChildrenValues (children, values) {
+      for (const child of children) {
+        values.push(child.value)
+        if (child.children && child.children.length) {
+          this.getAllChildrenValues(child.children, values)
         }
       }
     },
@@ -181,7 +193,9 @@ export default {
             const values = []
             if (extra.allCheckedNodes) {
               for (const item of extra.allCheckedNodes) {
-                if (item.node.key && item.node?.data?.props?.label !== item.node?.data?.props?.value) {
+                console.log(item.node.key, '=====', item.children)
+                if (item.node.key) {
+                // if (item.node.key && item.node?.data?.props?.label !== item.node?.data?.props?.value) {
                   values.push(`${item.node.key}`)
                 }
                 if (item.children && item.children.length) {

package/src/base-client/components/common/XFormGroupDetails/XFormGroupDetails.vue

@@ -8,7 +8,7 @@
               <a-rate disabled v-model="formJson.default[item.groupName][col.model]" />
             </template>
             <template v-else>
-              {{formJson.default[item.groupName][col.model]}}
+              {{ formJson.default[item.groupName][col.model] }}
             </template>
           </a-descriptions-item>
         </template>

package/src/base-client/components/common/XFormTable/demo.vue

@@ -1,60 +1,60 @@
-<template>
-  <a-card :bordered="false">
-    <!--    <a-button @click="()=>{queryParamsName = 'MeterBookUnallocatedUserCRUD'}">测试1</a-button>-->
-    <!--    <a-button @click="()=>{queryParamsName = 'MeterBookUnallocatedAreaCRUD'}">测试2</a-button>-->
-    <x-form-table
-      title="示例表单"
-      :queryParamsName="queryParamsName"
-      :fixedAddForm="fixedAddForm"
-      service-name="af-system"
-      @action="action"
-      @columnClick="columnClick"
-      ref="xFormTable">
-    </x-form-table>
-  </a-card>
-</template>
-
-<script>
-import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable.vue'
-import { microDispatch } from '@vue2-client/utils/microAppUtils'
-export default {
-  name: 'Demo',
-  components: {
-    XFormTable
-  },
-  data () {
-    return {
-      // 查询配置文件名
-      queryParamsName: 'ceshiCRUD',
-      // 查询配置左侧tree
-      // xTreeConfigName: 'addressType',
-      // 新增表单固定值
-      fixedAddForm: {},
-      // 是否显示详情抽屉
-      detailVisible: false,
-      // 当前记录
-      record: {}
-    }
-  },
-  methods: {
-    columnClick (key, value, record) {
-      microDispatch({ type: 'v3route', path: '/bingliguanli/dianzibingliluru', props: { selected: arguments[0].his_f_admission_id } })
-    },
-    action (record, id, actionType) {
-      this.detailVisible = true
-      console.log('触发了详情操作', record, id, actionType)
-    },
-    onClose () {
-      this.detailVisible = false
-      // 关闭详情之后重新查询表单
-      this.$refs.xFormTable.refreshTable(true)
-    }
-  },
-  computed: {
-  },
-}
-</script>
-
-<style scoped>
-
-</style>
+<template>
+  <a-card :bordered="false">
+    <!--    <a-button @click="()=>{queryParamsName = 'MeterBookUnallocatedUserCRUD'}">测试1</a-button>-->
+    <!--    <a-button @click="()=>{queryParamsName = 'MeterBookUnallocatedAreaCRUD'}">测试2</a-button>-->
+    <x-form-table
+      title="示例表单"
+      :queryParamsName="queryParamsName"
+      :fixedAddForm="fixedAddForm"
+      service-name="af-system"
+      @action="action"
+      @columnClick="columnClick"
+      ref="xFormTable">
+    </x-form-table>
+  </a-card>
+</template>
+
+<script>
+import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable.vue'
+import { microDispatch } from '@vue2-client/utils/microAppUtils'
+export default {
+  name: 'Demo',
+  components: {
+    XFormTable
+  },
+  data () {
+    return {
+      // 查询配置文件名
+      queryParamsName: 'ceshiCRUD',
+      // 查询配置左侧tree
+      // xTreeConfigName: 'addressType',
+      // 新增表单固定值
+      fixedAddForm: {},
+      // 是否显示详情抽屉
+      detailVisible: false,
+      // 当前记录
+      record: {}
+    }
+  },
+  methods: {
+    columnClick (key, value, record) {
+      microDispatch({ type: 'v3route', path: '/bingliguanli/dianzibingliluru', props: { selected: arguments[0].his_f_admission_id } })
+    },
+    action (record, id, actionType) {
+      this.detailVisible = true
+      console.log('触发了详情操作', record, id, actionType)
+    },
+    onClose () {
+      this.detailVisible = false
+      // 关闭详情之后重新查询表单
+      this.$refs.xFormTable.refreshTable(true)
+    }
+  },
+  computed: {
+  },
+}
+</script>
+
+<style scoped>
+
+</style>