vue2-client 1.9.85 → 1.9.86

package/package.json

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

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

@@ -188,6 +188,12 @@ export default {
         return item.type === 'childTable'
       })
     },
+    // 过滤出用于form子表数据新增/修改场景的表单项
+    childFormData: function () {
+      return this.formItems.filter((item) => {
+        return item.type === 'rowEdit'
+      })
+    },
     // 过滤出用于静默新增场景的表单项
     silenceAddJsonData: function () {
       return this.formItems.filter(function (item) {
@@ -619,6 +625,21 @@ export default {
           realForm[childModel] = childData
         }
       }
+      // 增加form子表数据
+      if (this.childFormData.length > 0) {
+        for (const item of this.childFormData) {
+          const childModel = item.model
+          const childData = this.$refs[item.model].getTableData()
+          for (let i = 0; i < childData.length; i++) {
+            childData[i] = this.handleFormKeys(childData[i])
+            // 外键不需要带表别名，所以此处放到表单处理后赋值
+            if (realForm.id) {
+              childData[i][item.childTableForeignKeyName] = realForm.id
+            }
+          }
+          realForm[childModel] = childData
+        }
+      }
       if (this.$listeners.onSubmit) {
         // 交由父级处理
         this.$emit('onSubmit', {
@@ -834,6 +855,13 @@ export default {
     },
     setForm (obj) {
       this.form = Object.assign(this.form, obj)
+      // 给子表赋外键条件
+      if (this.childFormData.length > 0) {
+        for (const item of this.childFormData) {
+          const child = this.$refs[item.model]
+          Object.assign(child.fixedQueryForm, this.configContent.primaryKey)
+        }
+      }
     },
     setFormWithKey (obj) {
       setDataByRealKey(this.form, obj)

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

@@ -883,8 +883,8 @@ export default {
     // 把内部的crud表单录入放到表单中，以便外部可以调用
     onComponentMounted (h, attr) {
       console.log('crud表单', h)
-      if (cell.slotRef) {
-        this.registerComponent(attr.key, this.$refs["'childXFormTable_' + attr.model"])
+      if (attr.crud) {
+        this.registerComponent(attr.model, this.$refs['childXFormTable_' + attr.model])
       }
     },
     childTableFixedQueryForm (item) {

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

@@ -181,8 +181,8 @@ export default {
             const values = []
             if (extra.allCheckedNodes) {
               for (const item of extra.allCheckedNodes) {
-                if (item.node.key) {
-                  values.push(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) {
                   this.getNodeValues(item.children, value, values)
@@ -198,7 +198,7 @@ export default {
     },
     getNodeValues (data, value, values) {
       for (const item of data) {
-        values.push(item.node.key)
+        values.push(`${item.node.key}`)
         if (item.children && item.children.length) {
           this.getNodeValues(item.children, value, values)
         }

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

@@ -40,7 +40,7 @@ export default {
   data () {
     return {
       // 查询配置文件名
-      queryParamsName: 'ceshiCRUD',
+      queryParamsName: 'ChargeQueryCRUD',
       // 查询配置左侧tree
       // xTreeConfigName: 'addressType',
       // 新增表单固定值