cloud-web-corejs 1.0.225 → 1.0.227

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

@@ -1,28 +1,64 @@
 <template>
-  <static-content-wrapper :designer="designer" :field="field" :design-state="designState"
-                          :display-style="field.options.displayStyle"
-                          :parent-widget="parentWidget" :parent-list="parentList"
-                          :index-of-parent-list="indexOfParentList"
-                          :sub-form-row-index="subFormRowIndex" :sub-form-col-index="subFormColIndex"
-                          :sub-form-row-id="subFormRowId">
-    <el-dropdown trigger="hover" :disabled="field.options.disabled">
-
-      <el-button type="primary" class="button-sty" size="mini">
-        <span>{{ getI18nLabel(field.options.label) }}</span><span class="line"></span> <i
-        class="el-icon-arrow-down el-icon--right"></i>
+  <static-content-wrapper
+    :designer="designer"
+    :field="field"
+    :design-state="designState"
+    :display-style="field.options.displayStyle"
+    :parent-widget="parentWidget"
+    :parent-list="parentList"
+    :index-of-parent-list="indexOfParentList"
+    :sub-form-row-index="subFormRowIndex"
+    :sub-form-col-index="subFormColIndex"
+    :sub-form-row-id="subFormRowId"
+  >
+    <el-dropdown
+      :trigger="field.options.dropdownTrigger"
+      :disabled="field.options.disabled"
+    >
+      <el-button
+        type="primary"
+        class="button-sty"
+        size="mini"
+        v-if="field.options.dropdownType === 'button'"
+      >
+        <span>{{ getI18nLabel(field.options.label) }}</span
+        ><span class="line"></span>
+        <i class="el-icon-arrow-down el-icon--right"></i>
       </el-button>
+      <span class="el-dropdown-link" v-else>
+        <a class="a-link">
+          <span>
+            <span>{{ getI18nLabel(field.options.label) }}</span>
+            <i class="el-icon-arrow-down el-icon--right"></i>
+          </span>
+        </a>
+      </span>
+      <!-- <span class="el-dropdown-link button-sty" v-else>
+        
+      </span> -->
       <el-dropdown-menu slot="dropdown">
-        <template v-for="(subWidget,index) in field.widgetList">
-          <el-dropdown-item v-show="!subWidget.options.hidden" :key="index" :icon="subWidget.options.icon"
-                            @click.native="(e) => handleSubButtonWidgetClick(e,index)" :disabled="subWidget.options.disabled">
-<!--            {{ getI18nLabel(subWidget.options.label) }}-->
-            <dropdownItemWidget :field="subWidget" :parent-list="field.widgetList"
-                                :index-of-parent-list="index" :parent-widget="field" :tableParam="tableParam"
-                                :formItemProp="formItemProp" :ref="'item'+index" @hiddenChange="handleHidden"
-                                @disabledChange="handleDisabled">
+        <template v-for="(subWidget, index) in field.widgetList">
+          <el-dropdown-item
+            v-show="!subWidget.options.hidden"
+            :key="index"
+            :icon="subWidget.options.icon"
+            @click.native="(e) => handleSubButtonWidgetClick(e, index)"
+            :disabled="subWidget.options.disabled"
+          >
+            <!--            {{ getI18nLabel(subWidget.options.label) }}-->
+            <dropdownItemWidget
+              :field="subWidget"
+              :parent-list="field.widgetList"
+              :index-of-parent-list="index"
+              :parent-widget="field"
+              :tableParam="tableParam"
+              :formItemProp="formItemProp"
+              :ref="'item' + index"
+              @hiddenChange="handleHidden"
+              @disabledChange="handleDisabled"
+            >
             </dropdownItemWidget>
           </el-dropdown-item>
-
         </template>
       </el-dropdown-menu>
     </el-dropdown>
@@ -30,15 +66,15 @@
 </template>
 
 <script>
-import StaticContentWrapper from './static-content-wrapper'
-import emitter from '../../../utils/emitter'
+import StaticContentWrapper from "./static-content-wrapper";
+import emitter from "../../../utils/emitter";
 import i18n from "../../../utils/i18n";
 import fieldMixin from "./fieldMixin";
-import dropdownItemWidget from './dropdown-item-widget.vue';
+import dropdownItemWidget from "./dropdown-item-widget.vue";
 
 export default {
   name: "dropdown-widget",
-  componentName: 'FieldWidget',  //必须固定为FieldWidget，用于接收父级组件的broadcast事件
+  componentName: "FieldWidget", //必须固定为FieldWidget，用于接收父级组件的broadcast事件
   mixins: [emitter, fieldMixin, i18n],
   props: {
     field: Object,
@@ -49,30 +85,27 @@ export default {
 
     designState: {
       type: Boolean,
-      default: false
+      default: false,
     },
 
-    subFormRowIndex: { /* 子表单组件行索引，从0开始计数 */
-      type: Number,
-      default: -1
+    subFormRowIndex: {
+      /* 子表单组件行索引，从0开始计数 */ type: Number,
+      default: -1,
     },
-    subFormColIndex: { /* 子表单组件列索引，从0开始计数 */
-      type: Number,
-      default: -1
+    subFormColIndex: {
+      /* 子表单组件列索引，从0开始计数 */ type: Number,
+      default: -1,
     },
-    subFormRowId: { /* 子表单组件行Id，唯一id且不可变 */
-      type: String,
-      default: ''
+    subFormRowId: {
+      /* 子表单组件行Id，唯一id且不可变 */ type: String,
+      default: "",
     },
-
   },
   components: {
     StaticContentWrapper,
-    dropdownItemWidget
-  },
-  computed: {
-
+    dropdownItemWidget,
   },
+  computed: {},
   beforeCreate() {
     /* 这里不能访问方法和属性！！ */
   },
@@ -80,49 +113,58 @@ export default {
   created() {
     /* 注意：子组件mounted在父组件created之后、父组件mounted之前触发，故子组件mounted需要用到的prop
        需要在父组件created中初始化！！ */
-    this.registerToRefList()
-    this.initEventHandler()
-    this.init()
-    this.handleOnCreated()
+    this.registerToRefList();
+    this.initEventHandler();
+    this.init();
+    this.handleOnCreated();
   },
 
   mounted() {
-    this.handleOnMounted()
+    this.handleOnMounted();
   },
 
   beforeDestroy() {
-    this.unregisterFromRefList()
+    this.unregisterFromRefList();
   },
 
   methods: {
-    init(){
-      if(this.designState)return
-      let isShow = this.field.widgetList.some((item) => !item.options.hidden)
-      if(!isShow){
-        this.field.options.hidden = true
+    init() {
+      if (this.designState) return;
+      if (!this.field.options.dropdownType)
+        this.field.options.dropdownType = "button";
+      if (!this.field.options.dropdownTrigger)
+        this.field.options.dropdownTrigger = "hover";
+      let isShow = this.field.widgetList.some((item) => !item.options.hidden);
+      if (!isShow) {
+        this.field.options.hidden = true;
       }
-      let isEnabled = this.field.widgetList.some((item) => !item.options.disabled)
-      if(!isEnabled){
-        this.field.options.disabled = true
+      let isEnabled = this.field.widgetList.some(
+        (item) => !item.options.disabled
+      );
+      if (!isEnabled) {
+        this.field.options.disabled = true;
       }
     },
     handleSubButtonWidgetClick(e, index) {
-      this.$refs["item"+index][0].handleButtonWidgetClick(e)
+      this.$refs["item" + index][0].handleButtonWidgetClick(e);
     },
     handleHidden() {
-      let isShow = this.field.widgetList.some((item) => !item.options.hidden)
-      this.setHidden(!isShow)
+      let isShow = this.field.widgetList.some((item) => !item.options.hidden);
+      this.setHidden(!isShow);
     },
     handleDisabled() {
-      let isEnabled = this.field.widgetList.some((item) => !item.options.disabled)
-      this.setDisabled(!isEnabled)
+      let isEnabled = this.field.widgetList.some(
+        (item) => !item.options.disabled
+      );
+      this.setDisabled(!isEnabled);
     },
-  }
-
-}
+  },
+};
 </script>
 
 <style lang="scss" scoped>
 @import "~@/styles/global.scss"; //* static-content-wrapper已引入，还需要重复引入吗？ *//
-
+.el-dropdown-link[disabled] a.a-link {
+  cursor: not-allowed;
+}
 </style>

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

@@ -229,7 +229,7 @@ modules = {
     },
     findInArray: function (e, t) {
       if (!Array.isArray(e)) return -1;
-      var i = -1;
+      let i = -1;
       return (
         e.forEach(function (e, n) {
           e === t && (i = n);
@@ -253,14 +253,14 @@ modules = {
       }
     },
     initFieldModel: function (flag) {
-      var e = this;
+      let e = this;
       if (this.field.formItemFlag) {
         let currentData =
           this.tableParam && this.tableParam.row
             ? this.tableParam.row
             : this.formModel;
         /*if (this.subFormItemFlag && !this.designState) {
-          var t = currentData[this.subFormName];
+          let t = currentData[this.subFormName];
           return void 0 !== t && void 0 !== t[this.subFormRowIndex] && void 0 !== t[this.subFormRowIndex][
             this.fieldKeyName
             ] || void 0 === this.field.options.defaultValue ? void 0 === t[this.subFormRowIndex][this
@@ -281,11 +281,11 @@ modules = {
         let dataId = this.getFormRef()?.dataId ?? null;
         let nullValue = null;
         let widgetType = this.field.type;
-        if (widgetType == "number") {
+        if (widgetType === "number") {
           nullValue = undefined;
         } else if (widgetType === 'checkbox' || (widgetType === 'select' && this.field.options.multiple)) {
           nullValue = [];
-        } else if (widgetType == "time-range" || widgetType == "date-range" || (widgetType === 'date' && this.field.options.type == "dates")) {
+        } else if (widgetType === "time-range" || widgetType === "date-range" || (widgetType === 'date' && this.field.options.type === "dates")) {
           nullValue = [];
         }
         if (void 0 === currentData[this.fieldKeyName]) {
@@ -304,7 +304,7 @@ modules = {
                 let userInfo = this.getFormRef().getUserInfo();
                 let valueSourceField = "id";
                 let labelSourceField = "nick_name";
-                if (this.field.options.clickBindEvent == "1") {
+                if (this.field.options.clickBindEvent === "1") {
                   if (searchDialogConfig.valueSourceField) valueSourceField = searchDialogConfig.valueSourceField
                   if (searchDialogConfig.labelSourceField) labelSourceField = searchDialogConfig.labelSourceField
                 }
@@ -315,7 +315,7 @@ modules = {
                 if (saleOrgDTO) {
                   let valueSourceField = "id";
                   let labelSourceField = "name";
-                  if (this.field.options.clickBindEvent == "1") {
+                  if (this.field.options.clickBindEvent === "1") {
                     if (searchDialogConfig.valueSourceField) valueSourceField = searchDialogConfig.valueSourceField
                     if (searchDialogConfig.labelSourceField) labelSourceField = searchDialogConfig.labelSourceField
                   }
@@ -348,13 +348,13 @@ modules = {
           }
         }
 
-        /*if (this.fieldKeyName == "f_mobile" && !this.fieldModel) {
+        /*if (this.fieldKeyName === "f_mobile" && !this.fieldModel) {
         }*/
         /*void 0 === currentData[this.fieldKeyName] && void 0 !== this.field.options.defaultValue
           ? this.fieldModel = this.field.options.defaultValue :
           void 0 === currentData[this.fieldKeyName] ? currentData[this.fieldKeyName] = null : this.fieldModel = currentData[this.fieldKeyName];*/
         this.oldFieldValue = baseRefUtil.deepClone(this.fieldModel);
-        /*if (this.fieldKeyName == "f_contract" && !this.fieldModel) {
+        /*if (this.fieldKeyName === "f_contract" && !this.fieldModel) {
         }*/
         this.initFileList();
       }
@@ -403,7 +403,7 @@ modules = {
         }),
         /* this.$on("field-value-changed", function (e) {
           if (this.subFormItemFlag) {
-            var t = this.formModel[this.subFormName];
+            let t = this.formModel[this.subFormName];
             this.handleOnChangeForSubForm(e[0], e[1], t, this.subFormRowId);
           } else this.handleOnChange(e[0], e[1]);
         }), */
@@ -478,7 +478,7 @@ modules = {
     handleCustomEvent(funtionStr, eventParamNames = [], eventParamValues = []) {
       if (!this.designState && funtionStr) {
         let eventParam = this.getEventParam();
-        var e = new Function(
+        let e = new Function(
           ...eventParam.eventParamNames,
           ...eventParamNames,
           funtionStr
@@ -559,7 +559,7 @@ modules = {
     },
     unregisterFromRefList: function () {
       if (null !== this.refList && this.field.options.name) {
-        var e = this.field.options.name;
+        let e = this.field.options.name;
         this.tableParam && !this.designState
           ? delete this.refList[e + "@row" + this.tableParam.rowIndex]
           : delete this.refList[e];
@@ -577,7 +577,7 @@ modules = {
       this.initGloatOptionItems(true);
     },
     initGloatOptionItems(initFlag) {
-      var t = this;
+      let t = this;
       if (this.designState) {
         return;
       }
@@ -705,19 +705,19 @@ modules = {
           widget.options.optionItems = optionItems
         })
         if (tableParam.column.params.widget) {
-          if (tableParam.column.params.widget.options.name == widgetName) {
+          if (tableParam.column.params.widget.options.name === widgetName) {
             tableParam.column.params.widget.options.optionItems = optionItems
           }
 
         }
         if (tableParam.column.params.editWidget) {
-          if (tableParam.column.params.editWidget.options.name == widgetName) {
+          if (tableParam.column.params.editWidget.options.name === widgetName) {
             tableParam.column.params.editWidget.options.optionItems = optionItems
           }
         }
         if (tableParam.column.params.widgetList?.length) {
           this.loopHandleWidget(tableParam.column.params.widgetList, (item1) => {
-            if (item1.options.name == widgetName) {
+            if (item1.options.name === widgetName) {
               item1.options.optionItems = optionItems
             }
           });
@@ -727,7 +727,7 @@ modules = {
       }
     },
     async initOptionItems(gloatFlag) {
-      var t = this;
+      let t = this;
       if (this.designState) {
         return;
       }
@@ -979,19 +979,19 @@ modules = {
         if (this.tableRow) {
           this.tableRow[this.fieldKeyName] = e;
         } else if (this.subFormItemFlag) {
-          var t = this.formModel[this.subFormName] || [{}],
+          let t = this.formModel[this.subFormName] || [{}],
             i = t[this.subFormRowIndex];
           i[this.fieldKeyName] = e;
         } else this.formModel[this.fieldKeyName] = e;
     },
     handleChangeEvent: function (e) {
       let widgetType = this.field.type;
-      if(widgetType == "select"){
+      if(widgetType === "select"){
         if(e===""){
            e = this.field.options.multiple? [] : null;
            this.fieldModel = e;
         }
-      }else if(widgetType == "number"){
+      }else if(widgetType === "number"){
         if(e===undefined){
            e = null;
            this.fieldModel = e;
@@ -1008,13 +1008,13 @@ modules = {
         ((this.oldFieldValue = baseRefUtil.deepClone(this.fieldModel)),
           this.field.options.onFocus)
       ) {
-        var t = new Function("event", this.field.options.onFocus);
+        let t = new Function("event", this.field.options.onFocus);
         t.call(this, e);
       }
     },
     handleBlurCustomEvent: function (e) {
       if (this.field.options.onBlur) {
-        var t = new Function("event", this.field.options.onBlur);
+        let t = new Function("event", this.field.options.onBlur);
         t.call(this, e);
       }
     },
@@ -1024,7 +1024,7 @@ modules = {
           this.dispatch("VFormRender", "fieldValidation", [this.getPropName()]),
           this.field.options.onInput)
       ) {
-        var t = new Function("value", this.field.options.onInput);
+        let t = new Function("value", this.field.options.onInput);
         t.call(this, e);
       }
     },
@@ -1057,10 +1057,10 @@ modules = {
       let clickBindEvent = !flag ? this.field.options.clickBindEvent : this.field.options.widgetTextLinkConfig?.options?.clickBindEvent;
 
       const done = () => {
-        if (clickBindEvent == "1") {
+        if (clickBindEvent === "1") {
           //打开选择弹框
           this.openSearchDialog(tableParam, flag);
-        } else if (clickBindEvent == "2") {
+        } else if (clickBindEvent === "2") {
           //列表插入数据
           this.handleAddTableDataEvent(flag);
         }
@@ -1083,13 +1083,13 @@ modules = {
     },
     handleOnChange: function (e, t) {
       if (this.field.options.onChange) {
-        var i = new Function("value", "oldValue", this.field.options.onChange);
+        let i = new Function("value", "oldValue", this.field.options.onChange);
         i.call(this, e, t);
       }
     },
     handleOnChangeForSubForm: function (e, t, i, n) {
       if (this.field.options.onChange) {
-        var o = new Function(
+        let o = new Function(
           "value",
           "oldValue",
           "subFormData",
@@ -1172,7 +1172,7 @@ modules = {
     },
     handleClearSearchDialog() {
       let clickBindEvent = this.field.options.clickBindEvent;
-      if (clickBindEvent == "1") {
+      if (clickBindEvent === "1") {
         this.handleConfirmSearchDialog(null, true);
       }
     },
@@ -1181,7 +1181,7 @@ modules = {
       return multipleChoices;
     },
     hasVabsearchFlag() {
-      return this.field.type == "vabsearch" || this.field.type == "singerSearch" || this.field.type == "multiSearch"
+      return this.field.type === "vabsearch" || this.field.type === "singerSearch" || this.field.type === "multiSearch"
     },
     handleConfirmSearchDialog(rows, isClear, flag) {
       if (!isClear && !rows.length) return;
@@ -1335,7 +1335,7 @@ modules = {
     },
     remoteQuery: function (e) {
       if (this.field.options.onRemoteQuery) {
-        var t = new Function("keyword", this.field.options.onRemoteQuery);
+        let t = new Function("keyword", this.field.options.onRemoteQuery);
         t.call(this, e);
       }
     },
@@ -1343,7 +1343,7 @@ modules = {
       return this.refList ? this.refList["v_form_ref"] : null;
     },
     getWidgetRef: function (e, t) {
-      var i = this.refList[e];
+      let i = this.refList[e];
       return (
         !i &&
         t &&
@@ -1379,7 +1379,7 @@ modules = {
           this.$set(currentData, this.fieldKeyName, null);
         }
 
-        var t = baseRefUtil.deepClone(this.fieldModel);
+        let t = baseRefUtil.deepClone(this.fieldModel);
         (this.fieldModel = value),
           this.initFileList(),
           this.syncUpdateFormModel(value),
@@ -1391,7 +1391,7 @@ modules = {
     },
     resetField: function () {
       if (!this.subFormItemFlag) {
-        var e = this.field.options.defaultValue;
+        let e = this.field.options.defaultValue;
         this.setValue(e),
         ("picture-upload" !== this.field.type &&
           "file-upload" !== this.field.type) ||
@@ -1518,7 +1518,7 @@ modules = {
       return this.subFormItemFlag;
     },
     setReadMode: function () {
-      var e =
+      let e =
         !(arguments.length > 0 && void 0 !== arguments[0]) || arguments[0];
       this.fieldReadonlyFlag = e;
     },
@@ -1529,7 +1529,7 @@ modules = {
     },
     removeCssClass: function (e) {
       if (this.field.options.customClass) {
-        var t = -1;
+        let t = -1;
         this.field.options.customClass.map(function (i, n) {
           i === e && (t = n);
         }),
@@ -1556,10 +1556,10 @@ modules = {
             if (!dsModel.headers) dsModel.headers = [];
             if (!dsModel.params) dsModel.params = [];
             if (!dsModel.data) dsModel.data = [];
-            if (dsModel.dataHandlerCode == null) dsModel.dataHandlerCode = "";
-            if (dsModel.configHandlerCode == null)
+            if (dsModel.dataHandlerCode === null || dsModel.dataHandlerCode === undefined) dsModel.dataHandlerCode = "";
+            if (dsModel.configHandlerCode === null || dsModel.configHandlerCode === undefined)
               dsModel.configHandlerCode = "";
-            if (dsModel.errorHandlerCode == null) dsModel.errorHandlerCode = "";
+            if (dsModel.errorHandlerCode === null || dsModel.errorHandlerCode === undefined) dsModel.errorHandlerCode = "";
 
             requestAccess.dsModel = dsModel;
             this.requestAccess = requestAccess;