vue2-client 1.9.13 → 1.9.15

package/package.json

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

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

@@ -151,9 +151,9 @@ export default {
             treeDatas[name] = values
           }
           // 移除默认的表单项，将组织好后的表单项合并进表单
-          // this.form[this.model] = undefined
-          // Object.assign(this.form, treeDatas)
-          this.$emit('onChange', treeDatas)
+          this.form[this.model] = undefined
+          Object.assign(this.form, treeDatas)
+          // this.$emit('onChange', treeDatas)
         } else {
           // 从单一数据源组成的树可以直接赋值
           // this.form[this.model] = value

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

@@ -173,6 +173,10 @@ export default {
     emitFunc (func, data) {
       this.$emit('x-form-item-emit-func', func, data)
     },
+    // 提交表单
+    asyncSubmit () {
+      return this.asyncSubmit()
+    },
     async onSubmit () {
       let pass = true
       const promises = this.groups.map((item, index) => {

package/src/base-client/components/common/XReportGrid/XReportTrGroup.vue

@@ -12,7 +12,7 @@
           :span="cell.colSpan ? cell.colSpan * 2 : undefined">
           <!-- 插槽渲染 -->
           <template v-if="cell.type === 'slot'">
-            <template v-if="['x-form-table','x-add-native-form','x-tree-pro', 'x-his-editor', 'x-tab'].includes(cell.slotType)">
+            <template v-if="['x-form-table','x-add-native-form','x-tree-pro', 'x-his-editor', 'x-tab', 'x-form-group'].includes(cell.slotType)">
               <component
                 :is="getComponentName(cell.slotConfig, cell.serviceName, cell.slotType)"
                 :key="cellIndex"
@@ -503,8 +503,8 @@ export default {
       console.log(`插槽组件已经初始化 slotType ${cell.slotType}，ref= dynamicComponent_${cell.slotRef || cellIndex} ， serviceName = ${cell.serviceName}`)
       const shouldInit = cell.shouldInit == null ? true : cell.shouldInit
       if (shouldInit) {
-        if (cell.slotType === 'x-add-native-form' && shouldInit) {
-          // 建议表单需要主动调用初始化方法
+        if (cell.slotType === 'x-add-native-form') {
+          // 简易表单需要主动调用初始化方法
           getConfigByName(cell.slotConfig, cell.serviceName, async (res) => {
             // 如果配置了 表单初始化logic
             // 调用 logic 获取参数
@@ -533,6 +533,21 @@ export default {
               }
             })
           }, this.env === 'dev')
+        } else if (cell.soltType === 'x-form-group') {
+          // 简易表单需要主动调用初始化方法
+          getConfigByName(cell.slotConfig, cell.serviceName, (res) => {
+            // 如果配置了 表单初始化logic
+            // 调用 logic 获取参数
+            const param = { ...this.mixinData }
+            this.$refs[`dynamicComponent_${cell.slotRef || cellIndex}`][0].init({
+              ...res,
+              serviceName: cell.serviceName,
+              showSubmitBtn: !this.isInAModal,
+              businessType: param.businessType || '新增',
+              modifyModelData: param,
+              showLeftTab: true,
+            })
+          }, this.env === 'dev')
         }
       }
     },