cloud-web-corejs 1.0.54-dev.202 → 1.0.54-dev.203

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.202",
+  "version": "1.0.54-dev.203",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

package/src/components/xform/form-designer/form-widget/field-widget/fieldMixin.js

@@ -762,38 +762,27 @@ modules = {
         e.value === t && (e.disabled = !1);
       });
     },
-    emitFieldDataChange(e, t) {
-      if (this.designState) return
-      this.$emit("field-value-changed", [e, t]),
-        this.field.options.keyNameEnabled
-          ? this.getFormRef().broadcast("FieldWidget", "sync-field-value", [
-            this.field.options.name,
-            this.field.options.keyName,
-            this.subFormName,
-            this.subFormRowId,
-            e,
-            this.getObjectName(),
-          ])
-          : this.getFormRef().broadcast("FieldWidget", "sync-field-value", [
-            this.field.options.name,
-            this.field.options.name,
-            this.subFormName,
-            this.subFormRowId,
-            e,
-            this.getObjectName(),
-          ]),
-      "number" === this.field.type &&
-      this.getFormRef().broadcast("FieldWidget", "calculate-formula", [
-        e,
-        this,
-      ]),
-        this.dispatch("VFormRender", "fieldChange", [
-          this.field.options.name,
-          e,
-          t,
-          this.subFormName,
-          this.subFormRowIndex,
-        ]);
+    emitFieldDataChange(newValue, oldValue) {
+      this.$emit('field-value-changed', [newValue, oldValue])
+
+      /* 同步更新keyName属性一致的字段组件值！！ */
+      if (this.field.options.keyNameEnabled) {
+        this.getFormRef().broadcast('FieldWidget', 'sync-field-value',
+            [this.field.options.name, this.field.options.keyName, this.subFormName, this.subFormRowId,
+              newValue, this.getObjectName()])
+      } else {
+        this.getFormRef().broadcast('FieldWidget', 'sync-field-value',
+            [this.field.options.name, this.field.options.name, this.subFormName, this.subFormRowId,
+              newValue, this.getObjectName()])
+      }
+
+      if (this.field.type === 'number') {
+        this.getFormRef().broadcast('FieldWidget', 'calculate-formula', [newValue, this])  //触发计算公式计算
+      }
+
+      /* 必须用dispatch向指定父组件派发消息！！ */
+      this.dispatch('VFormRender', 'fieldChange',
+          [this.field.options.name, newValue, oldValue, this.subFormName, this.subFormRowIndex])
     },
     syncUpdateFormModel: function (e) {
       if (!this.designState)

package/src/components/xform/form-designer/form-widget/field-widget/select-widget.vue

@@ -12,7 +12,7 @@
                :default-first-option="allowDefaultFirstOption"
                :automatic-dropdown="field.options.automaticDropdown"
                :multiple="field.options.multiple" :multiple-limit="field.options.multipleLimit"
-               :collapse-tags="!!field.options.multiple"
+               :collapse-tags="!field.options.flatCollapseTags"
                :placeholder="getI18nLabel(field.options.placeholder || '请选择')"
                :remote="field.options.remote" :remote-method="remoteQuery"
                @focus="handleFocusCustomEvent" @blur="handleBlurCustomEvent"

package/src/components/xform/form-designer/setting-panel/property-editor/multiple-editor.vue

@@ -1,7 +1,12 @@
 <template>
-  <el-form-item :label="i18nt('designer.setting.multiple')">
-    <el-switch v-model="optionModel.multiple" @change="onMultipleSelected"></el-switch>
-  </el-form-item>
+  <div>
+    <el-form-item :label="i18nt('designer.setting.multiple')">
+      <el-switch v-model="optionModel.multiple" @change="onMultipleSelected"></el-switch>
+    </el-form-item>
+    <el-form-item :label="i18nt('平铺选项')">
+      <el-switch v-model="optionModel.flatCollapseTags"></el-switch>
+    </el-form-item>
+  </div>
 </template>
 
 <script>

package/src/components/xform/form-designer/widget-panel/widgetsConfig.js

@@ -1339,6 +1339,8 @@ export const basicFields = [
       commonAttributeEnabled: false,
       commonAttributeCode: "",
 
+      showCollapseTags:false,
+
       showRuleFlag: 1,
       showRuleEnabled: 1,
       showRules: [],