vue2-client 1.8.220 → 1.8.222

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.8.220",
+  "version": "1.8.222",
   "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

@@ -13,7 +13,8 @@
           v-for="(item, index) in realJsonData"
           :key="index"
           :attr="item"
-          :disabled="itemDisabled(item) || readonly(item)"
+          :disabled="itemDisabled(item)"
+          :readonly="readonly(item)"
           :files="files"
           :style="layout ==='inline'?{marginTop:'5px'}:undefined"
           :form="form"
@@ -33,6 +34,7 @@
             :key="index"
             :attr="item"
             :disabled="itemDisabled(item)"
+            :readonly="readonly(item)"
             :files="files"
             :form="form[groupItem.model]"
             :images="images"
@@ -53,6 +55,7 @@
             :key="key + formItemIndex"
             :attr="formItem"
             :disabled="itemDisabled(formItem)"
+            :readonly="readonly(formItem)"
             :files="files"
             :form="form[groupItem.model]"
             :images="images"
@@ -631,6 +634,9 @@ export default {
         }
       }
     },
+    setForm (obj) {
+      this.form = Object.assign(this.form, obj)
+    },
     emitFunc (func, data) {
       this.$emit('x-form-item-emit-func', func, data)
     }

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

@@ -12,7 +12,8 @@
       <a-input-group v-if="attr.inputOnAfterName && attr.inputOnAfterFunc" compact>
         <a-input
           v-model="form[attr.model]"
-          :disabled="disabled"
+          :readonly="readonly"
+          :disabled="disabled && !readonly"
           style="width:90%"
           :placeholder="attr.placeholder ? attr.placeholder : '请输入'+attr.name.replace(/\s*/g, '')"/>
         <a-button style="width:10%" type="primary" @click="emitFunc(attr.inputOnAfterFunc,form[attr.model])">
@@ -22,7 +23,8 @@
       <a-input
         v-else
         v-model="form[attr.model]"
-        :disabled="disabled"
+        :readonly="readonly"
+        :disabled="disabled && !readonly"
         style="width:100%"
         :placeholder="attr.placeholder ? attr.placeholder : '请输入'+attr.name.replace(/\s*/g, '')"/>
 
@@ -479,6 +481,13 @@ export default {
           return false
         }
     },
+    readonly: {
+      type: Boolean,
+      default:
+        () => {
+          return false
+        }
+    },
     mode: {
       type: String,
       default:

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

@@ -21,11 +21,11 @@
             </a-col>
           </a-row>
           <template v-if="item.formGroupType === 'slot'">
-            <slot :name="item.slotName" :data="allFormData" :ref="`nativeForm-${index}`" >
+            <slot :name="item.slotName" :data="allFormData" :index="index">
               <a-empty :description="`[${item.describe}:${item.slotName}]插槽没有使用`"/>
             </slot>
           </template>
-          <x-add-native-form v-else :ref="`nativeForm-${index}`"/>
+          <x-add-native-form @x-form-item-emit-func="emitFunc" v-else :ref="`nativeForm-${index}`"/>
         </div>
       </a-col>
     </a-row>
@@ -61,9 +61,13 @@ export default {
   },
   props: {},
   watch: {},
-  computed: {
-  },
+  computed: {},
   methods: {
+    setRef (refName, refValue) {
+      if (!this.$refs[refName]) {
+        this.$refs[refName] = refValue
+      }
+    },
     /**
      * 初始化
      * @param groups 表单组诗句
@@ -72,7 +76,13 @@ export default {
      * @param env 环境
      * @param showLeftTab 是否展示左侧索引页
      */
-    init ({ groups, modifyModelData = {}, serviceName = process.env.VUE_APP_SYSTEM_NAME, env = 'prod', showLeftTab = false }) {
+    init ({
+           groups,
+           modifyModelData = {},
+           serviceName = process.env.VUE_APP_SYSTEM_NAME,
+           env = 'prod',
+           showLeftTab = false
+         }) {
       Object.assign(this, { groups, modifyModelData, serviceName, env, showLeftTab })
       this.initView()
     },
@@ -82,6 +92,15 @@ export default {
         this.initData(i)
       }
     },
+    getNativeFormRef (group) {
+      return this.groups.map((item, index) => {
+        if (item.group === group) {
+          return this.$refs[`nativeForm-${index}`][0]
+        } else {
+          return null
+        }
+      }).filter(ref => ref !== null)
+    },
     initData (index) {
       // 如果是插槽组件
       // 不做解析配置处理
@@ -91,7 +110,7 @@ export default {
         return
       }
       // 组织native表单存储的结果
-      this.allFormData[this.groups[index].groupName] = {}
+      this.allFormData[this.groups[index].group] = {}
       parseConfig(this.groups[index], 'SIMPLE_FORM', this.serviceName, this.env === 'dev').then(res => {
         this.formList.push(res)
         let modifyModelData = {}
@@ -120,26 +139,27 @@ export default {
     onClose () {
       this.$emit('update:visible', false)
     },
+    // xfromitem 一路传递上来的事件
+    emitFunc (func, data) {
+      this.$emit('x-form-item-emit-func', func, data)
+    },
     async onSubmit () {
       let pass = true
       const promises = this.groups.map((item, index) => {
-        const nativeFormRef = this.$refs[`nativeForm-${index}`][0]
-        if (item.group) {
+        const nativeFormRef = this.$refs[`nativeForm-${index}`] ? this.$refs[`nativeForm-${index}`][0] : undefined
+        if ((item.group || item.slotName) && nativeFormRef && typeof nativeFormRef.asyncSubmit === 'function') {
           // 如果 ref 存在 asyncSubmit 方法，则调用 asyncSubmit 方法
-          if (nativeFormRef && typeof nativeFormRef.asyncSubmit === 'function') {
-            return nativeFormRef.asyncSubmit().then(res => {
-              this.allFormData[item.groupName] = res.realForm
-            }).catch(_err => {
-              pass = false
-              this.scrollToGroup(index)
-            })
-          } else {
-            console.warn(item.groupName + '未找到组件，或者组件没有 asyncSubmit 方法')
-            // 如果 ref 不存在或没有 asyncSubmit 方法，则返回一个已解决的 Promise
-            return Promise.resolve()
-          }
+          return nativeFormRef.asyncSubmit().then(res => {
+            this.allFormData[item.slotName || item.group] = res.realForm
+          }).catch(_err => {
+            pass = false
+            this.scrollToGroup(index)
+          })
+        } else {
+          console.warn(item.groupName + '未找到组件，或者组件没有 asyncSubmit 方法')
+          // 如果 ref 不存在或没有 asyncSubmit 方法，则返回一个已解决的 Promise
+          return Promise.resolve()
         }
-        return Promise.resolve()
       })
 
       try {
@@ -161,12 +181,14 @@ export default {
 <style lang="less" scoped>
 .XFormGroupClass {
   height: 100%;
-  .xFormGroupTitle{
+
+  .xFormGroupTitle {
     font-size: 15px;
     font-weight: bold;
     color: @primary-color;
   }
-  .formGroupContext{
+
+  .formGroupContext {
     height: 100%;
     overflow-y: scroll;
   }

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

@@ -42,6 +42,7 @@
             :query-params-json="queryParamsJson"
             :show-pagination="showPagination"
             :customDelete="customDelete"
+            :extraHeight="extraHeight"
             @add="add"
             @edit="edit"
             @del="del"
@@ -227,6 +228,11 @@ export default {
       type: Boolean,
       default: false
     },
+    // 自适应底部边距
+    extraHeight: {
+      type: Number,
+      default: 80
+    }
   },
   watch: {
     logicParam: {

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

@@ -55,7 +55,7 @@
     </a-row>
     <s-table
       ref="table"
-      id="XTable"
+      :id="uniqueId"
       :alert="true"
       :columns="tableColumns"
       :data="loadData"
@@ -153,6 +153,7 @@ export default {
   },
   data () {
     return {
+      uniqueId: `x-table-${this._uid}`, // 使用 _uid 生成唯一 ID
       // 筛选列加载状态
       columnSelectLoaded: false,
       // 预览模式
@@ -247,6 +248,11 @@ export default {
     customDelete: {
       type: Boolean,
       default: false
+    },
+    // 自适应底部编剧
+    extraHeight: {
+      type: Number,
+      default: 80
     }
   },
   computed: {
@@ -380,7 +386,7 @@ export default {
         this.$refs.table.refresh(bool)
       })
     },
-    setScrollYHeight ({ extraHeight = 80, id = 'XTable', type = '' }) {
+    setScrollYHeight ({ extraHeight = this.extraHeight, id = this.uniqueId, type = '' }) {
       this.$nextTick(() => {
         if (typeof extraHeight == 'undefined') {
           //  默认底部分页32 + 边距48