cloud-web-corejs 1.0.54-dev.686 → 1.0.54-dev.688

package/src/components/xform/form-designer/setting-panel/option-items-setting.vue

@@ -1,7 +1,10 @@
 <template>
   <div class="option-items-pane">
     <el-form-item label="选项值类型">
-      <el-radio-group v-model="optionModel.optionItemValueType" @change="changeValueType">
+      <el-radio-group
+        v-model="optionModel.optionItemValueType"
+        @change="changeValueType"
+      >
         <el-radio :label="0">文本</el-radio>
         <el-radio :label="1">数值</el-radio>
         <el-radio :label="2">布尔值</el-radio>
@@ -54,7 +57,9 @@
         type="text"
         v-model="optionModel.labelKey"
         placeholder="默认label"
-        :disabled="optionModel.commonAttributeEnabled || !optionModel.formScriptEnabled"
+        :disabled="
+          optionModel.commonAttributeEnabled || !optionModel.formScriptEnabled
+        "
       ></el-input>
     </el-form-item>
     <el-form-item :label="i18nt('关联字段')">
@@ -62,11 +67,21 @@
         type="text"
         v-model="optionModel.valueKey"
         placeholder="默认value"
-        :disabled="optionModel.commonAttributeEnabled || !optionModel.formScriptEnabled"
+        :disabled="
+          optionModel.commonAttributeEnabled || !optionModel.formScriptEnabled
+        "
       ></el-input>
     </el-form-item>
+    <el-form-item
+      v-if="hasConfig('childrenKey')"
+      :label="i18nt('designer.setting.childrenKeyName')"
+    >
+      <el-input v-model="optionModel.childrenKey"></el-input>
+    </el-form-item>
     <template
-      v-if="!optionModel.commonAttributeEnabled && !optionModel.formScriptEnabled"
+      v-if="
+        !optionModel.commonAttributeEnabled && !optionModel.formScriptEnabled
+      "
     >
       <el-radio-group
         v-if="
@@ -80,7 +95,11 @@
           tag="ul"
           class="draggable-box"
           :list="optionModel.optionItems"
-          v-bind="{ group: 'optionsGroup', ghostClass: 'ghost', handle: '.drag-option' }"
+          v-bind="{
+            group: 'optionsGroup',
+            ghostClass: 'ghost',
+            handle: '.drag-option',
+          }"
         >
           <li v-for="(option, idx) in optionModel.optionItems" :key="idx">
             <el-radio :label="option.value">
@@ -136,7 +155,11 @@
           tag="ul"
           class="draggable-box"
           :list="optionModel.optionItems"
-          v-bind="{ group: 'optionsGroup', ghostClass: 'ghost', handle: '.drag-option' }"
+          v-bind="{
+            group: 'optionsGroup',
+            ghostClass: 'ghost',
+            handle: '.drag-option',
+          }"
         >
           <li v-for="(option, idx) in optionModel.optionItems" :key="idx">
             <el-checkbox :label="option.value">
@@ -185,7 +208,8 @@
         @change="emitDefaultValueChange"
         :placeholder="i18nt('render.hint.selectPlaceholder')"
         style="width: 100%"
-      ></el-cascader>
+      >
+      </el-cascader>
       <div v-if="selectedWidget.type === 'cascader'">
         <el-button type="text" @click="importCascaderOptions">{{
           i18nt("designer.setting.importOptions")
@@ -248,22 +272,29 @@
       v-if="showImportCascaderDialogFlag"
       :show-close="true"
       class="small-padding-dialog"
+      append-to-body
       :close-on-click-modal="false"
       :close-on-press-escape="false"
       :destroy-on-close="true"
-      :append-to-body="true"
-      :modal-append-to-body="true"
     >
-      <code-editor v-model="cascaderOptions" mode="json" :readonly="false"></code-editor>
+      <code-editor
+        v-model="cascaderOptions"
+        mode="json"
+        :readonly="false"
+      ></code-editor>
       <div slot="footer" class="dialog-footer">
         <el-button size="large" type="primary" @click="saveCascaderOptions">{{
           i18nt("designer.hint.confirm")
         }}</el-button>
-        <el-button size="large" type="" @click="showImportCascaderDialogFlag = false">{{
-          i18nt("designer.hint.cancel")
-        }}</el-button>
+        <el-button
+          size="large"
+          type=""
+          @click="showImportCascaderDialogFlag = false"
+          >{{ i18nt("designer.hint.cancel") }}</el-button
+        >
       </div>
     </el-dialog>
+
     <el-dialog
       v-if="dataDialogVisible"
       custom-class="dialog-style list-dialog"
@@ -297,7 +328,11 @@
           </el-button>
         </div>
       </template>
-      <code-editor mode="json" :readonly="!1" v-model="tableDataOptions"></code-editor>
+      <code-editor
+        mode="json"
+        :readonly="!1"
+        v-model="tableDataOptions"
+      ></code-editor>
     </el-dialog>
   </div>
 </template>
@@ -305,11 +340,12 @@
 <script>
 import Draggable from "vuedraggable";
 import i18n from "../../../../components/xform/utils/i18n";
+import propertyMixin from "../../../../components/xform/form-designer/setting-panel/property-editor/propertyMixin";
 
 export default {
   name: "OptionItemsSetting",
   componentName: "PropertyEditor",
-  mixins: [i18n],
+  mixins: [i18n, propertyMixin],
   components: {
     Draggable,
   },
@@ -406,13 +442,16 @@ export default {
       let lineArray = this.optionLines.split("\n");
       //console.log('test', lineArray)
       if (lineArray.length > 0) {
-        let isNumericOptionItemValue = this.optionModel.optionItemValueType === 1;
+        let isNumericOptionItemValue =
+          this.optionModel.optionItemValueType === 1;
         this.optionModel.optionItems = [];
         lineArray.forEach((optLine) => {
           if (!!optLine && !!optLine.trim()) {
             if (optLine.indexOf(this.separator) !== -1) {
               let valueStr = optLine.split(this.separator)[0];
-              let value = isNumericOptionItemValue ? Number(valueStr) : valueStr;
+              let value = isNumericOptionItemValue
+                ? Number(valueStr)
+                : valueStr;
               this.optionModel.optionItems.push({
                 value: value,
                 label: optLine.split(this.separator)[1],
@@ -436,7 +475,8 @@ export default {
     resetDefault() {
       if (
         this.selectedWidget.type === "checkbox" ||
-        (this.selectedWidget.type === "select" && this.selectedWidget.options.multiple)
+        (this.selectedWidget.type === "select" &&
+          this.selectedWidget.options.multiple)
       ) {
         this.optionModel.defaultValue = [];
       } else {
@@ -447,7 +487,11 @@ export default {
     },
 
     importCascaderOptions() {
-      this.cascaderOptions = JSON.stringify(this.optionModel.optionItems, null, "  ");
+      this.cascaderOptions = JSON.stringify(
+        this.optionModel.optionItems,
+        null,
+        "  "
+      );
       this.showImportCascaderDialogFlag = true;
     },
 
@@ -459,7 +503,9 @@ export default {
 
         this.showImportCascaderDialogFlag = false;
       } catch (ex) {
-        this.$message.error(this.i18nt("designer.hint.invalidOptionsData") + ex.message);
+        this.$message.error(
+          this.i18nt("designer.hint.invalidOptionsData") + ex.message
+        );
       }
     },
     changeValueType(val) {
@@ -496,7 +542,9 @@ export default {
         (this.optionModel.defaultValue = JSON.parse(this.tableDataOptions)),
           (this.dataDialogVisible = !1);
       } catch (e) {
-        this.$message.error(this.i18nt("designer.hint.invalidOptionsData") + e.message);
+        this.$message.error(
+          this.i18nt("designer.hint.invalidOptionsData") + e.message
+        );
       }
     },
     getDefaultValue() {

package/src/components/xform/form-designer/setting-panel/property-editor/field-cascader/checkStrictly-editor.vue

@@ -5,19 +5,17 @@
 </template>
 
 <script>
-  import i18n from "../../../../../../components/xform/utils/i18n"
+import i18n from "../../../../../../components/xform/utils/i18n";
 
-  export default {
-    name: "checkStrictly-editor",
-    mixins: [i18n],
-    props: {
-      designer: Object,
-      selectedWidget: Object,
-      optionModel: Object,
-    },
-  }
+export default {
+  name: "checkStrictly-editor",
+  mixins: [i18n],
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+  },
+};
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>

package/src/components/xform/form-designer/setting-panel/property-editor/field-cascader/showAllLevels-editor.vue

@@ -0,0 +1,21 @@
+<template>
+  <el-form-item :label="i18nt('designer.setting.showAllLevels')">
+    <el-switch v-model="optionModel.showAllLevels"></el-switch>
+  </el-form-item>
+</template>
+
+<script>
+import i18n from "../../../../../../components/xform/utils/i18n";
+
+export default {
+  name: "showAllLevels-editor",
+  mixins: [i18n],
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+  },
+};
+</script>
+
+<style scoped></style>

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

@@ -21,7 +21,9 @@
       </el-form-item>
       <el-form-item
         label="查询参数"
-        v-if="optionModel.formScriptEnabled || optionModel.commonAttributeEnabled"
+        v-if="
+          optionModel.formScriptEnabled || optionModel.commonAttributeEnabled
+        "
       >
         <a
           href="javascript:void(0);"
@@ -40,8 +42,14 @@
           @change="changeCommonAttributeEnabled"
         ></el-switch>
       </el-form-item>
-      <el-form-item :label="i18nt('词汇编码')" v-if="optionModel.commonAttributeEnabled">
-        <el-input type="text" v-model="optionModel.commonAttributeCode"></el-input>
+      <el-form-item
+        :label="i18nt('词汇编码')"
+        v-if="optionModel.commonAttributeEnabled"
+      >
+        <el-input
+          type="text"
+          v-model="optionModel.commonAttributeCode"
+        ></el-input>
       </el-form-item>
       <!-- <el-form-item :label="i18nt('显示字段')" v-if="optionModel.formScriptEnabled || optionModel.commonAttributeEnabled">
         <el-input type="text" v-model="optionModel.labelKey" :disabled="optionModel.commonAttributeEnabled"></el-input>
@@ -57,7 +65,9 @@
       <a
         href="javascript:void(0);"
         class="a-link link-oneLind"
-        @click="editEventHandler('formScriptSuccess', ['dataId', 'formCode', 'res'])"
+        @click="
+          editEventHandler('formScriptSuccess', ['dataId', 'formCode', 'res'])
+        "
       >
         <span>{{ optionModel.formScriptSuccess }}</span>
         <i class="el-icon-edit"></i>
@@ -87,6 +97,7 @@ export default {
         "census",
         "status",
         "gantt",
+        "cascader",
       ],
     };
   },

package/src/components/xform/form-designer/setting-panel/propertyRegister.js

@@ -51,6 +51,7 @@ const COMMON_PROPERTIES = {
   remote: "remote-editor",
   automaticDropdown: "automaticDropdown-editor",
   checkStrictly: "checkStrictly-editor",
+  showAllLevels: "showAllLevels-editor",
   multiple: "multiple-editor",
   multipleLimit: "multipleLimit-editor",
   contentPosition: "contentPosition-editor",

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

@@ -2981,7 +2981,7 @@ export const advancedFields = [
     formItemFlag: !1,
     options: {
       name: "",
-      label: "重置",
+      label: "刷新",
       columnWidth: "200px",
       size: "",
       displayStyle: "block",
@@ -3611,6 +3611,66 @@ export const advancedFields = [
       showRules: [],
     },
   },
+  {
+    type: "cascader",
+    icon: "cascader-field",
+    commonFlag: !0,
+    formItemFlag: true,
+    options: {
+      name: "",
+      keyNameEnabled: false,
+      keyName: "", //数据键值名称
+      label: "",
+      labelAlign: "",
+      defaultValue: "",
+      placeholder: "",
+      size: "",
+      labelWidth: null,
+      labelHidden: false,
+      columnWidth: "200px",
+      disabled: false,
+      hidden: false,
+      clearable: true,
+      filterable: false,
+      multiple: false,
+      checkStrictly: false, //可选择任意一级选项，默认不开启
+      showAllLevels: true, //显示完整路径
+      dsEnabled: false, // 是否使用数据源数据
+      dsName: "", // 数据源名称
+      dataSetName: "", //数据集名称
+      labelKey: "label",
+      valueKey: "value",
+      childrenKey: "children",
+      optionItems: [
+        {
+          label: "select 1",
+          value: 1,
+          children: [{ label: "child 1", value: 11 }],
+        },
+        { label: "select 2", value: 2 },
+        { label: "select 3", value: 3 },
+      ],
+      required: false,
+      requiredHint: "",
+      customRule: "",
+      customRuleHint: "",
+      //-------------------
+      customClass: "", //自定义css类名
+      labelIconClass: null,
+      labelIconPosition: "rear",
+      labelTooltip: null,
+
+      ...httpConfig,
+      ...defaultWfConfig,
+      //-------------------
+      onCreated: "",
+      onMounted: "",
+      onChange: "",
+      onFocus: "",
+      onBlur: "",
+      onValidate: "",
+    },
+  },
 ];
 
 export const businessFields = [

package/src/components/xform/form-render/container-item/dynamicFieldMixin.js

@@ -180,6 +180,21 @@ const dynamicFieldMixin = {
         this.widget.rows.push(...rows);
       }
       this._generatedRowIds = rows.map((r) => r.id);
+      this.afterDynamicSchemaBuilt(widgets, formRef);
+    },
+
+    afterDynamicSchemaBuilt(widgets, formRef) {
+      if (!formRef || !widgets || !widgets.length) return;
+      widgets.forEach(({ widget }) => {
+        if (widget && widget.formItemFlag && formRef.buildDataFromWidget) {
+          formRef.buildDataFromWidget(widget);
+        }
+      });
+      this.$nextTick(() => {
+        if (formRef.hanldeCommonWidget2) {
+          formRef.hanldeCommonWidget2();
+        }
+      });
     },
 
     layoutByColumns(widgets, colCount) {
@@ -279,6 +294,17 @@ const dynamicFieldMixin = {
           widget.options[k] = def.options[k];
         });
       }
+      if (def.tableField !== undefined) {
+        widget.tableField = def.tableField;
+      } else if (
+        widget.hasOwnProperty("tableField") &&
+        !widget.tableField
+      ) {
+        widget.tableField = widget.id;
+      }
+      if (def.submitFlag !== undefined) {
+        widget.options.submitFlag = !!def.submitFlag;
+      }
       return widget;
     },
 

package/src/components/xform/form-render/indexMixin.js

@@ -170,6 +170,12 @@ modules = {
       getObjectName: () => "",
       getHasWf: () => this.hasWf,
       hasConfig: this.hasConfig,
+      setCETriggerFlag: () => {
+        this.changeEventTriggerFlag = true;
+      },
+      clearCETriggerFlag: () => {
+        this.changeEventTriggerFlag = false;
+      },
     };
   },
   data() {
@@ -224,6 +230,7 @@ modules = {
       // 表格设计器-打开表格设计器弹窗
       univerDialogOption: null,
       showUniverDialog: false,
+      changeEventTriggerFlag: false, //记录onChange事件是否由用户操作触发
     };
   },
   computed: {
@@ -737,7 +744,11 @@ modules = {
       let result =
         freeWidgetTypesOfWf.includes(widgetType) ||
         (sourceType && freeWidgetTypesOfWf.includes(sourceType));
-      return widget.options.label === "重置" || result;
+      return (
+        widget.options.label === "重置" ||
+        widget.options.label === "刷新" ||
+        result
+      );
     },
     getIsHiddenWidgetTypesOfWf(widget) {
       if (!widget) return false;
@@ -1574,11 +1585,7 @@ modules = {
         let areaName = e.options.areaName;
         if (areaName) {
           let val = currentFormData[areaName] ?? null;
-          this.$set(
-            this.formDataModel,
-            areaName,
-            baseRefUtil.deepClone(val)
-          );
+          this.$set(this.formDataModel, areaName, baseRefUtil.deepClone(val));
         }
       } else if ("table2-item" === e.type) {
         this.$set(this.formDataModel, fieldKeyName, []);
@@ -2738,6 +2745,9 @@ modules = {
       newWidget.type = newWidget.targetType || newWidget.type;
       let tempId = generateId();
       newWidget.id = newWidget.type.replace(/-/g, "") + tempId;
+      if (newWidget.hasOwnProperty("tableField")) {
+        newWidget.tableField = newWidget.id;
+      }
       return newWidget;
     },
     getColumnWidget(row, isEdit) {
@@ -3784,6 +3794,12 @@ modules = {
     openLuckysheetDialog(option) {
       openLuckysheetDialog(option);
     },
+    /**
+     * 获取onChange事件是否由用户操作触发标志
+     */
+    getCETriggerFlag() {
+      return this.changeEventTriggerFlag;
+    },
   },
 };