vue2-client 1.8.222 → 1.8.225

package/package.json

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

@@ -6,8 +6,9 @@
     <a-form-model-item
       :ref="attr.model"
       :label="attr.name"
-      :labelCol="layout === 'inline' && attr.occupyCol?labelAndWrapperCol[attr.occupyCol].labelCol:undefined"
-      :wrapperCol="layout === 'inline'&& attr.occupyCol? labelAndWrapperCol[attr.occupyCol].wrapperCol:undefined"
+      :labelCol="layout === 'inline' && attr.occupyCol ? labelAndWrapperCol[attr.occupyCol].labelCol:undefined"
+      :wrapperCol="layout === 'inline'&& attr.occupyCol ? labelAndWrapperCol[attr.occupyCol].wrapperCol:undefined"
+      :style="layout === 'inline'&& attr.occupyCol && attr.occupyCol > 1? {width:`calc(100% - ${attr.occupyCol * 1.533}rem)`}:{}"
       :prop="attr.prop ? attr.prop : attr.model">
       <a-input-group v-if="attr.inputOnAfterName && attr.inputOnAfterFunc" compact>
         <a-input
@@ -538,6 +539,7 @@ export default {
   },
   created () {
     this.init()
+    this.debouncedUpdateOptions = debounce(this.updateOptions, 200)
   },
   computed: {
     ...mapState('account', { currUser: 'user' })
@@ -553,18 +555,18 @@ export default {
       handler (newVal) {
         // 如果是从函数获取 options
         if (this.attr.keyName && (this.attr.keyName.toString().indexOf('async ') !== -1 || this.attr.keyName.toString().indexOf('function') !== -1)) {
-          const updateOptions = async () => {
-            if (this.attr.keyName && (this.attr.keyName.indexOf('async ') !== -1 || this.attr.keyName.indexOf('function ') !== -1)) {
-              this.optionForFunc = await executeStrFunction(this.attr.keyName, [this.form, runLogic])
-            }
-          }
-          updateOptions()
+          this.debouncedUpdateOptions()
         }
       },
       deep: true
     }
   },
   methods: {
+    async updateOptions () {
+      if (this.attr.keyName && (this.attr.keyName.indexOf('async ') !== -1 || this.attr.keyName.indexOf('function ') !== -1)) {
+        this.optionForFunc = await executeStrFunction(this.attr.keyName, [this.form, runLogic])
+      }
+    },
     init () {
       if (this.mode === '新增/修改' && !this.attr.flex) {
         if (['horizontal', 'vertical'].includes(this.layout)) {
@@ -692,7 +694,10 @@ export default {
         if (this.getDataParams && this.getDataParams[this.attr.model]) {
           Object.assign(value, this.getDataParams[this.attr.model])
         }
-        runLogic(logic, value, this.serviceName, this.env === 'dev').then(res => {
+        runLogic(logic, Object.assign(value, {
+          orgId: this.currUser.orgid,
+          userId: this.currUser.id
+        }), this.serviceName, this.env === 'dev').then(res => {
           callbackFun(res)
         }).catch(e => {
           callbackFun([])

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

@@ -122,7 +122,8 @@ export default {
           formItems: res.formJson,
           showSubmitBtn: false,
           serviceName: this.serviceName,
-          modifyModelData: modifyModelData
+          modifyModelData: modifyModelData,
+          ...res
         }
         params.showSubmitBtn = false
         this.$nextTick(() => {