cloud-web-corejs 1.0.214 → 1.0.215

package/package.json

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

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

@@ -65,7 +65,16 @@ export default {
   },
 
   methods: {
-
+    setHidden: function (e) {
+      this.field.options.hidden = e;
+      this.hidden = e;
+      this.$emit('hiddenChange' )
+    },
+    setDisabled: function (e) {
+      this.field.options.disabled = e;
+      this.disabled = e;
+      this.$emit('disabledChange')
+    },
   }
 
 }

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

@@ -0,0 +1,128 @@
+<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>
+      </el-button>
+      <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">
+            </dropdownItemWidget>
+          </el-dropdown-item>
+
+        </template>
+      </el-dropdown-menu>
+    </el-dropdown>
+  </static-content-wrapper>
+</template>
+
+<script>
+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';
+
+export default {
+  name: "dropdown-widget",
+  componentName: 'FieldWidget',  //必须固定为FieldWidget，用于接收父级组件的broadcast事件
+  mixins: [emitter, fieldMixin, i18n],
+  props: {
+    field: Object,
+    parentWidget: Object,
+    parentList: Array,
+    indexOfParentList: Number,
+    designer: Object,
+
+    designState: {
+      type: Boolean,
+      default: false
+    },
+
+    subFormRowIndex: { /* 子表单组件行索引，从0开始计数 */
+      type: Number,
+      default: -1
+    },
+    subFormColIndex: { /* 子表单组件列索引，从0开始计数 */
+      type: Number,
+      default: -1
+    },
+    subFormRowId: { /* 子表单组件行Id，唯一id且不可变 */
+      type: String,
+      default: ''
+    },
+
+  },
+  components: {
+    StaticContentWrapper,
+    dropdownItemWidget
+  },
+  computed: {
+
+  },
+  beforeCreate() {
+    /* 这里不能访问方法和属性！！ */
+  },
+
+  created() {
+    /* 注意：子组件mounted在父组件created之后、父组件mounted之前触发，故子组件mounted需要用到的prop
+       需要在父组件created中初始化！！ */
+    this.registerToRefList()
+    this.initEventHandler()
+    this.init()
+    this.handleOnCreated()
+  },
+
+  mounted() {
+    this.handleOnMounted()
+  },
+
+  beforeDestroy() {
+    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
+      }
+      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)
+    },
+    handleHidden() {
+      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)
+    },
+  }
+
+}
+</script>
+
+<style lang="scss" scoped>
+@import "~@/styles/global.scss"; //* static-content-wrapper已引入，还需要重复引入吗？ *//
+
+</style>

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

@@ -0,0 +1,89 @@
+<template>
+  <div>
+    <el-form-item label-width="0">
+      <el-divider class="custom-divider">下拉按钮设置</el-divider>
+    </el-form-item>
+    <el-form-item label="当前下拉按钮"></el-form-item>
+    <el-form-item label-width="0">
+      <draggable tag="ul" class="draggable-box" :list="selectedWidget.widgetList"
+                 v-bind="{ group: 'optionsGroup', ghostClass: 'ghost', handle: '.drag-option' }">
+        <li v-for="(colItem, colIdx) in selectedWidget.widgetList" :key="colIdx" class="col-item">
+          <i class="el-icon-s-operation drag-option"></i>
+          <el-input v-model="colItem.options.label" class="cell-span-input"></el-input>
+          <el-button circle plain size="mini" type="button"
+                     icon="el-icon-edit" class="col-delete-button" style="position: unset;" @click="openEditFormatConfigDialog(colItem, colIdx)"></el-button>
+          <el-button circle plain size="mini" type="danger" @click="deleteCol(selectedWidget, colIdx)"
+                     icon="el-icon-minus" class="col-delete-button" style="position: unset;"></el-button>
+        </li>
+      </draggable>
+      <div>
+        <el-button type="text" @click="addNewCol(selectedWidget)" icon="el-icon-circle-plus-outline" class="add-option">
+          增加
+        </el-button>
+      </div>
+    </el-form-item>
+  </div>
+</template>
+
+<script>
+import Draggable from 'vuedraggable';
+import i18n from "../../../utils/i18n"
+import {deepClone, generateId} from "../../../utils/util"
+
+export default {
+  name: "dropdownFlag-editor",
+  mixins: [i18n],
+  components: {
+    Draggable,
+  },
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+  },
+  inject: ['openWidgetPropertyDialog'],
+  methods: {
+    deleteCol(gridWidget, colIdx) {
+      if (!!gridWidget && !!gridWidget.widgetList) {
+        gridWidget.widgetList.splice(colIdx, 1);
+      }
+      this.designer.emitHistoryChange()
+    },
+
+    addNewCol(gridWidget) {
+      let newGridCol = deepClone(this.designer.getFieldWidgetByType('dropdown-item'));
+      let tmpId = generateId();
+      newGridCol.id = 'dropdown-item-' + tmpId;
+      newGridCol.options.name = 'dropdownItem' + tmpId;
+      newGridCol.options.label = 'dropdownItem' + tmpId;
+      gridWidget.widgetList.push(newGridCol);
+      this.designer.emitHistoryChange()
+    },
+    openEditFormatConfigDialog(fieldWidget, index) {
+      this.openWidgetPropertyDialog({
+        columnSelectedWidget: deepClone(fieldWidget),
+        callback: (columnOption) => {
+          fieldWidget.options = columnOption;
+        },
+      });
+    },
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+li.col-item {
+  list-style: none;
+
+  span.col-span-title {
+    display: inline-block;
+    font-size: 13px;
+    width: 120px;
+  }
+
+  .col-delete-button {
+    margin-left: 6px;
+  }
+}
+
+</style>

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

@@ -95,6 +95,8 @@ export default {
         "download-button",
         "copy_button",
         "tempStorage",
+        "dropdown",
+        "dropdown-item",
       ].includes(this.selectedWidget.type);
     },
     authCode() {

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

@@ -115,8 +115,8 @@ const COMMON_PROPERTIES = {
   'showRuleFlag': 'showRuleFlag-editor',
   'widgetShowRuleFlag': 'widgetShowRuleFlag-editor',
 
-  'dropdownMenuFlag': 'dropdown-menu-editor',
-  'dropdownItemFlag': 'dropdown-item-editor',
+  'dropdownFlag': 'dropdownFlag-editor',
+  // 'dropdownItemFlag': 'dropdown-item-editor',
 
   'oplogFlag': 'oplogFlag-editor',
   'ganttConfig': 'gantt-editor',

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

@@ -252,6 +252,7 @@ export const containers = [
       accessParam: null,
       accessCallback: null,*/
       isQueryTable: false,
+      searchOnSwitchTab: false,
       entityTableCode: null,
       entityTableDesc: null,
 
@@ -900,8 +901,9 @@ export const hiddenWidgetTypesOfWf = [
   "import-button",
   "import2-button",
   "print-button",
+  "dropdown-item",
 ];
-export const freeWidgetTypesOfWf = ["reset_button","copy_button", "a-link", "a-text"];
+export const freeWidgetTypesOfWf = ["reset_button","copy_button", "a-link", "a-text", 'dropdown'];
 
 export const basicFields = [
   {
@@ -3377,9 +3379,9 @@ export const advancedFields = [
     },
   },
   {
-    type: "dropdown-menu",
+    type: "dropdown",
     icon: "tab",
-    // commonFlag: !0,
+    commonFlag: !0,
     // columnFlag: true,
     widgetList: [],
     options: {
@@ -3387,12 +3389,9 @@ export const advancedFields = [
       label: "",
       hidden: !1,
       disabled: !1,
-      height: "",
-      // isFullscreen: false,
-      tabClass: "tab-boxCard tabCard-sty1",
       customClass: "",
-      dropdownMenuFlag: 1,
-      ...defaultWfConfig,
+      dropdownFlag: 1,
+      // ...defaultWfConfig,
       onCreated: "",
       onMounted: "",
     },
@@ -3405,12 +3404,14 @@ export const advancedFields = [
       name: "",
       label: "",
       hidden: !1,
-      active: !1,
       disabled: !1,
       customClass: "",
       dropdownItemFlag: 1,
 
       onClick: "",
+      onCreated: "",
+      onMounted: "",
+
       clickBindEvent: null,
       onBeforeClickButton: null,
       searchDialogConfig: {
@@ -3420,6 +3421,9 @@ export const advancedFields = [
         tableRef: null,
         tableData: {},
       },
+
+      ...defaultWfConfig,
+      ...defaultWidgetShowRuleConfig,
     },
   },
   {
@@ -3483,7 +3487,7 @@ export const advancedFields = [
     },
   },
 
-  {
+  /* {
     type: "vue-page",
     icon: "html-text",
     commonFlag: !0,
@@ -3501,7 +3505,7 @@ export const advancedFields = [
       labelHidden: !1,
 
     },
-  },
+  }, */
 ];
 
 export const businessFields = [

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

@@ -534,7 +534,7 @@ modules = {
       loopHandleWidget(this.formJson.widgetList, (widget, parentWidget) => {
         if (callback) {
           callback(widget);
-          if (widget.type == "data-table") {
+          if (widget.type === "data-table") {
             widget.options.tableColumns.forEach((item) => {
               columnLoopDo(item);
             });
@@ -545,7 +545,7 @@ modules = {
     handleAllTableColumnWidget() {
       traverseAllWidgetsNew(this.formJson.widgetList, (widget) => {
         //修复data-table旧数据表格列widget与editWidget为空的问题
-        if (widget.type == "data-table") {
+        if (widget.type === "data-table") {
           this.handleTableColumnWidget(widget);
         }
       });
@@ -554,7 +554,7 @@ modules = {
       //修复data-table旧数据表格列widget与editWidget为空的问题
       if (
         !widget
-        || widget.type != "data-table"
+        || widget.type !== "data-table"
         || !widget.options.tableColumns
       )
         return;
@@ -637,7 +637,7 @@ modules = {
             //有流程，且不匹配流程节点可编辑表单设置信息
             //设置组件的有流程可编辑，有流程隐藏
             this.hanldeWfWidgetNew1(widget);
-            if (wfInfo.taskStep == "9999") {
+            if (wfInfo.taskStep === "9999") {
               this.hanldeWfWidgetItemNew(widget);
             } else if (toModify) {
               //后台返回流程可以修改单据
@@ -686,8 +686,8 @@ modules = {
             let companyCodes = companyCodeStr
               ? companyCodeStr.split(",").filter((item) => !!item)
               : [];
-            let flag1 = !item.serveName || item.serveName == bdService;
-            // let flag2 = !item.modelKey || item.modelKey == modelKey;
+            let flag1 = !item.serveName || item.serveName === bdService;
+            // let flag2 = !item.modelKey || item.modelKey === modelKey;
             let flag2
               = item.modelOrders === undefined
               || item.modelOrders === null
@@ -728,8 +728,8 @@ modules = {
             let companyCodes = companyCodeStr
               ? companyCodeStr.split(",").filter((item) => !!item)
               : [];
-            let flag1 = !item.serveName || item.serveName == bdService;
-            // let flag2 = !item.modelKey || item.modelKey == modelKey;
+            let flag1 = !item.serveName || item.serveName === bdService;
+            // let flag2 = !item.modelKey || item.modelKey === modelKey;
             let flag2
               = item.modelOrders === undefined
               || item.modelOrders === null
@@ -752,7 +752,7 @@ modules = {
       let result
         = freeWidgetTypesOfWf.includes(widgetType)
         || (sourceType && freeWidgetTypesOfWf.includes(sourceType));
-      return widget.options.label == "重置" || result;
+      return widget.options.label === "重置" || result;
     },
     getIsHiddenWidgetTypesOfWf(widget) {
       if (!widget) return false;
@@ -817,7 +817,6 @@ modules = {
         if (!options || !options.wfEdit) return;
         let wfConfigData = options.wfConfigData || [];
         let flag = false;
-
         wfConfigData.forEach((item) => {
           let type = item.type;
           let taskStepList = item.taskSteps ? item.taskSteps.split(",") : [];
@@ -826,8 +825,8 @@ modules = {
             let companyCodes = companyCodeStr
               ? companyCodeStr.split(",").filter((item) => !!item)
               : [];
-            let flag1 = !item.serveName || item.serveName == bdService;
-            // let flag2 = !item.modelKey || item.modelKey == modelKey;
+            let flag1 = !item.serveName || item.serveName === bdService;
+            // let flag2 = !item.modelKey || item.modelKey === modelKey;
 
             let flag2
               = item.modelOrders === undefined
@@ -859,7 +858,7 @@ modules = {
             }
           }
         });
-        /*if (flag && e && widget.type == 'baseAttachment') {
+        /*if (flag && e && widget.type === 'baseAttachment') {
           e.initOption();
         }*/
       };
@@ -879,7 +878,7 @@ modules = {
         if (optionModel.widgetShowRuleEnabled) {
           let companyCode = this.$store.getters.companyCode;
           let bdService = this.bdService;
-          let userRoleDTOs = this.userRoleDTOs;
+          let userRoleDTOs = this.userRoleDTO2s;
           let userRoleCodes = userRoleDTOs.map((item) => item.roleCode);
 
           let widgetShowRuleConfig = optionModel.widgetShowRuleConfig || [];
@@ -925,10 +924,10 @@ modules = {
               let flag = userRoleCodes.some((roleCode) =>
                 roleCodes.includes(roleCode)
               );
-              if (showRuleItem.type == 1) {
+              if (showRuleItem.type === 1) {
                 //符合条件的角色显示，否则隐藏
                 optionModel.hidden = flag ? false : true;
-              } else if (showRuleItem.type == 2) {
+              } else if (showRuleItem.type === 2) {
                 //符合条件的角色隐藏，否则显示
                 optionModel.hidden = flag ? true : false;
               }
@@ -972,7 +971,7 @@ modules = {
               // setDisabled(target,false);
               disabled = false;
             }
-            if (widgetType == "reset_button" && enabledByWf === undefined) {
+            if (widgetType === "reset_button" && enabledByWf === undefined) {
               // setDisabled(target,false)
               disabled = false;
             }
@@ -993,7 +992,7 @@ modules = {
           }
           if (
             widget
-            && widgetType == "save_button"
+            && widgetType === "save_button"
             && hiddenByWf === undefined
           ) {
             // setHidden(target,true)
@@ -1009,7 +1008,7 @@ modules = {
           }
         }
 
-        if (widget?.type == "data-table") {
+        if (widget?.type === "data-table") {
           let loopDo = (t, e) => {
             if (t.children && t.children.length) {
               t.children.forEach((item) => {
@@ -1028,7 +1027,7 @@ modules = {
             });
           });
         }
-        /*if (target && widgetType == 'baseAttachment') {
+        /*if (target && widgetType === 'baseAttachment') {
           target.initOption();
         }*/
       };
@@ -1102,8 +1101,8 @@ modules = {
             let companyCodes = companyCodeStr
               ? companyCodeStr.split(",").filter((item) => !!item)
               : [];
-            let flag1 = !item.serveName || item.serveName == bdService;
-            let flag2 = !item.modelKey || item.modelKey == modelKey;
+            let flag1 = !item.serveName || item.serveName === bdService;
+            let flag2 = !item.modelKey || item.modelKey === modelKey;
             let flag3
               = !companyCodes.length || companyCodes.includes(companyCode);
             if (flag1 && flag2 && flag3) {
@@ -1130,12 +1129,12 @@ modules = {
             }
           }
         });
-        /*if (flag && e && widget.type == 'baseAttachment') {
+        /*if (flag && e && widget.type === 'baseAttachment') {
           e.initOption();
         }*/
       };
       handleWfConfigData(widget);
-      if (widget.type == "data-table") {
+      if (widget.type === "data-table") {
         let loopDo = (t) => {
           if (t.children && t.children.length) {
             t.children.forEach((item) => {
@@ -1380,13 +1379,13 @@ modules = {
             let valIds = value.map((item) => item.id);
             if (valIds.length) {
               let result = !widget.options.hidden;
-              if (ruleType == 1) {
+              if (ruleType === 1) {
                 result = valIds.includes(userId) ? isShow : !isShow;
-              } else if (ruleType == 2) {
+              } else if (ruleType === 2) {
                 result = saleOrgIds.find((item) => valIds.includes(item))
                   ? isShow
                   : !isShow;
-              } else if (ruleType == 3) {
+              } else if (ruleType === 3) {
                 result = roleIds.find((item) => valIds.includes(item))
                   ? isShow
                   : !isShow;
@@ -1637,7 +1636,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
@@ -1717,7 +1716,7 @@ modules = {
       if (!!subFormName) {
         let subFormRef = this.getWidgetRef(subFormName);
         if (!!subFormRef) {
-          if (subFormRef.widget.type == "data-table") {
+          if (subFormRef.widget.type === "data-table") {
             let rows = subFormRef.getValue();
             if (rows) {
               rows.forEach((row) => {
@@ -2135,7 +2134,7 @@ modules = {
           let widgetName = widget.options.name;
           let fieldKeyName = this.getFieldKeyName(widget);
           if (widget.tableField) {
-            if (flag == 1) {
+            if (flag === 1) {
               fieldMap[fieldKeyName] = widget;
             } else {
               fieldMap[fieldKeyName] = fieldKeyName;
@@ -2145,14 +2144,14 @@ modules = {
               }
             }
           } else {
-            if (widget.category == "container") {
+            if (widget.category === "container") {
               let itemField = itemFieldMap[widget.type];
               if (itemField) {
-                if ("table" == widget.type) {
+                if ("table" === widget.type) {
                   widget[itemField].forEach((item) => {
                     loopDo(item.cols);
                   });
-                } else if ("h5-table" == widget.type) {
+                } else if ("h5-table" === widget.type) {
                   widget[itemField].forEach((item) => {
                     loopDo(item.cols);
                   });
@@ -2174,7 +2173,7 @@ modules = {
     isVabsearchFlagWidget(widget) {
       let type = widget?.type;
       return (
-        type == "vabsearch" || type == "singerSearch" || type == "multiSearch"
+        type === "vabsearch" || type === "singerSearch" || type === "multiSearch"
       );
     },
     getFormTemplateTableDTOs() {
@@ -2204,7 +2203,7 @@ modules = {
         if (!widgetList) return;
         widgetList.forEach((widget) => {
           let submitFlag = widget.options.submitFlag || false;
-          if (widget.formItemFlag || widget.type == "data-table") {
+          if (widget.formItemFlag || widget.type === "data-table") {
             if (widget.options.submitFlag === void 0) {
               submitFlag = true;
             }
@@ -2213,7 +2212,7 @@ modules = {
           let uniqueName = widget.options.name;
           let widgetName = this.getFieldKeyName(widget);
           let entityTableCode = widget.options.entityTableCode;
-          if (widget.type == "data-table" || widget.type == "list-h5") {
+          if (widget.type === "data-table" || widget.type === "list-h5") {
             let isTreeTable = widget.options.isTreeTable || false;
             if (submitFlag) {
               let vailColumns = widget.options.tableColumns.filter(
@@ -2221,7 +2220,7 @@ modules = {
               );
               let itemFields = [];
               vailColumns.forEach((item) => {
-                if (item.formatS == "editSearch") {
+                if (item.formatS === "editSearch") {
                   itemFields.push({
                     fieldDesc: item.label + "ID",
                     fieldName: item.prop,
@@ -2255,7 +2254,7 @@ modules = {
                 formTemplateTableDTOs.push(formTemplateTable);
               }
             }
-          } else if (widget.type == "vabUpload") {
+          } else if (widget.type === "vabUpload") {
             if (submitFlag) {
               let formTemplateTable = {
                 tableAlias: widgetName,
@@ -2266,7 +2265,7 @@ modules = {
               };
               formTemplateTableDTOs.push(formTemplateTable);
             }
-          } else if (widget.type == "project-tag") {
+          } else if (widget.type === "project-tag") {
             if (submitFlag) {
               let formTemplateTable = {
                 tableAlias: widgetName,
@@ -2277,7 +2276,7 @@ modules = {
               };
               formTemplateTableDTOs.push(formTemplateTable);
             }
-          } else if (widget.type == "table2") {
+          } else if (widget.type === "table2") {
             if (submitFlag) {
               let formTemplateTable = {
                 tableAlias: widgetName,
@@ -2312,14 +2311,14 @@ modules = {
               });
             }
           } else {
-            if (widget.category == "container") {
+            if (widget.category === "container") {
               let itemField = itemFieldMap[widget.type];
               if (itemField) {
-                if ("table" == widget.type) {
+                if ("table" === widget.type) {
                   widget[itemField].forEach((item) => {
                     loopDo(item.cols);
                   });
-                } else if ("h5-table" == widget.type) {
+                } else if ("h5-table" === widget.type) {
                   widget[itemField].forEach((item) => {
                     loopDo(item.cols);
                   });
@@ -2364,10 +2363,10 @@ modules = {
             let newFormData = {};
             formTemplateTableDTOs.forEach((formTemplateTableDTO) => {
               let tableAlias
-                = formTemplateTableDTO.tableType == 0
+                = formTemplateTableDTO.tableType === 0
                   ? formCode
                   : formTemplateTableDTO.tableAlias;
-              if (formTemplateTableDTO.tableType == 0) {
+              if (formTemplateTableDTO.tableType === 0) {
                 let item = this.$baseLodash.cloneDeep(this.formData);
                 Object.keys(item).forEach((key) => {
                   if (Array.isArray(item[key])) {
@@ -2417,10 +2416,10 @@ modules = {
       let newFormData = {};
       formTemplateTableDTOs.forEach((formTemplateTableDTO) => {
         let tableAlias
-          = formTemplateTableDTO.tableType == 0
+          = formTemplateTableDTO.tableType === 0
             ? formCode
             : formTemplateTableDTO.tableAlias;
-        if (formTemplateTableDTO.tableType == 0) {
+        if (formTemplateTableDTO.tableType === 0) {
           let item = this.$baseLodash.cloneDeep(this.currentFormData);
           Object.keys(item).forEach((key) => {
             if (Array.isArray(item[key])) {
@@ -2488,7 +2487,7 @@ modules = {
       let formData = this.$baseLodash.cloneDeep(formData0[formCode]);
       if (formData) {
         Object.keys(formData0).forEach((key) => {
-          if (key != formCode) {
+          if (key !== formCode) {
             formData[key] = formData0[key];
           }
         });
@@ -2539,6 +2538,26 @@ modules = {
         target = this.getWidgetRef(this.formJsonObj.widgetList[0].options.name);
       }
       return target;
+
+      return this.getGridWidgetRef();
+
+    },
+    getGridWidgetRef() {
+      //获取表单的第一个data-table组件
+      return this.getFirstWidgetRefByType("data-table");
+
+    },
+    getFirstWidgetRefByType(type) {
+      //获取表单的第一个组件
+      let result = null;
+      traverseAllWidgetsNew(this.formJsonObj.widgetList, (widget) => {
+        if (!result && widget.type === type) {
+          result = widget;
+        }
+      });
+      let target = result? this.getWidgetRef(result.options.name):null;
+      return target;
+
     },
     switchToListTab(option) {
       //切换到列表页的tab
@@ -2549,12 +2568,12 @@ modules = {
       }
       if (handleType) {
         let listTabFormRef = this.getListTabFormRef();
-        if (handleType == "reload") {
+        if (handleType === "reload") {
           listTabFormRef.reloadForm();
-        } else if (handleType == "searchEvent") {
-          listTabFormRef.getFirstWidgetRef().searchEvent();
-        } else if (handleType == "resethEvent") {
-          listTabFormRef.getFirstWidgetRef().resethEvent();
+        } else if (handleType === "searchEvent") {
+          listTabFormRef.getGridWidgetRef().searchEvent();
+        } else if (handleType === "resethEvent") {
+          listTabFormRef.getGridWidgetRef().resethEvent();
         }
       }
     },
@@ -2745,42 +2764,42 @@ modules = {
           columnSelectedWidget.options.required = row.required || false;
         }
 
-        if ("editDelete" == formatS) {
+        if ("editDelete" === formatS) {
           columnSelectedWidget.options.prefixIcon = "el-icon-delete";
           columnSelectedWidget.options.label = "删除";
           columnSelectedWidget.options.labelHidden = true;
           columnSelectedWidget.options.hiddenByWf = true;
           columnSelectedWidget.options.onClick
             = "let tableParam = this.tableParam;\nlet tableRef = this.getWidgetRef(this.parentWidget.options.name);\ntableRef.deleteRow(tableParam.row,tableParam.rowIndex);";
-        } else if ("editButton" == formatS) {
+        } else if ("editButton" === formatS) {
           columnSelectedWidget.options.prefixIcon = "el-icon-edit";
           columnSelectedWidget.options.label = "查看";
           columnSelectedWidget.options.labelHidden = true;
           columnSelectedWidget.options.onClick
             = "let tableParam = this.tableParam;\nlet tableRef = this.getWidgetRef(this.parentWidget.options.name);\ntableRef.openEditDialog(tableParam.row)";
-        } else if ("addSiblingEditRow" == formatS) {
+        } else if ("addSiblingEditRow" === formatS) {
           columnSelectedWidget.options.prefixIcon = "el-icon-plus";
           columnSelectedWidget.options.label = "新增兄弟节点";
           columnSelectedWidget.options.labelHidden = false;
           columnSelectedWidget.options.onClick
             = "let tableParam = this.tableParam;\nthis.getParentTarget().addSiblingTreeRow(null,tableParam);";
-        } else if ("addChildTreeRow" == formatS) {
+        } else if ("addChildTreeRow" === formatS) {
           columnSelectedWidget.options.prefixIcon = "el-icon-plus";
           columnSelectedWidget.options.label = "新增子节点";
           columnSelectedWidget.options.labelHidden = false;
           columnSelectedWidget.options.onClick
             = "let tableParam = this.tableParam;\nthis.getParentTarget().addChildTreeRow(null,tableParam);";
-        } else if ("moveUpRow" == formatS) {
+        } else if ("moveUpRow" === formatS) {
           columnSelectedWidget.options.label = "↑上移";
           columnSelectedWidget.options.labelHidden = false;
           columnSelectedWidget.options.onClick
             = "let tableParam = this.tableParam;\nthis.getParentTarget().moveUpRow(tableParam);";
-        } else if ("moveDownRow" == formatS) {
+        } else if ("moveDownRow" === formatS) {
           columnSelectedWidget.options.label = "↓下移";
           columnSelectedWidget.options.labelHidden = false;
           columnSelectedWidget.options.onClick
             = "let tableParam = this.tableParam;\nthis.getParentTarget().moveDownRow(tableParam);";
-        } else if ("removeTreeRow" == formatS) {
+        } else if ("removeTreeRow" === formatS) {
           columnSelectedWidget.options.prefixIcon = "el-icon-delete";
           columnSelectedWidget.options.label = "删除";
           columnSelectedWidget.options.labelHidden = true;
@@ -2795,7 +2814,7 @@ modules = {
           columnSelectedWidget.options.name = row.prop;
         }
 
-        if (type != "button" && type != "a-link") {
+        if (type !== "button" && type !== "a-link") {
           columnSelectedWidget.options.label = row.label;
           columnSelectedWidget.options.labelHidden = true;
         }
@@ -2805,7 +2824,7 @@ modules = {
     doScriptAccess(scriptUuid, callback) {
       if (scriptUuid) {
         let scripts = this.formJson.formConfig.scriptList || [];
-        let item = scripts.find((item) => item.scriptUuid == scriptUuid);
+        let item = scripts.find((item) => item.scriptUuid === scriptUuid);
         if (item && item.enabled) {
           let path = "";
           let reportTemplate = this.getReportTemplate();

package/src/components/xform/lang/zh-CN.js

@@ -103,7 +103,7 @@ export default {
       "a-link": "超链接按钮",
       "a-text": "超链接文本",
       'project-tag': '标签',
-      'dropdown-menu': '下拉菜单',
+      'dropdown': '下拉按钮',
 
       "create_by-text": "创建人",
       "modify_by-text": "更新人",

package/src/components/xform/utils/formula-util.js

@@ -271,6 +271,9 @@ export function baseReplaceFieldsAndFunctionsOfFormula(VFR, formulaFieldRef, for
             }
           });
 
+          /* if(functionCalls.length){
+          } */
+
           if (isSameSubForm && !isInAggregationParam) {
             // 同一子表单且不在聚合函数参数中，使用当前行数据
             if(row){

package/src/components/xform/utils/util.js

@@ -281,31 +281,31 @@ export function traverseAllWidgetsNew(widgetList, callback) {
   if (!widgetList) {
     return;
   }
-  let columnLoopDo = (t, e) => {
+  let columnLoopDo = (t, parentWidget) => {
     if (t.children && t.children.length) {
       t.children.forEach((item) => {
-        columnLoopDo(item);
+        columnLoopDo(item, parentWidget);
       });
     } else {
       if (t.widget) {
-        callback && callback(t.widget);
+        callback && callback(t.widget, parentWidget);
       }
       if (t.editWidget) {
-        callback && callback(t.editWidget);
+        callback && callback(t.editWidget, parentWidget);
       }
       if (t.widgetList && t.widgetList.length) {
         loopHandleWidget(t.widgetList, (widget) => {
-          callback && callback(widget);
+          callback && callback(widget, parentWidget);
         });
       }
     }
   };
   loopHandleWidget(widgetList, (widget, parentWidget) => {
     if (callback) {
-      callback(widget);
+      callback(widget, parentWidget);
       if (widget.type == "data-table") {
         for (let item of widget.options.tableColumns) {
-          columnLoopDo(item);
+          columnLoopDo(item, parentWidget);
         }
       }
     }
@@ -317,8 +317,8 @@ export function traverseAllWidgets(widgetList, handler) {
     return;
   }
 
-  loopHandleWidget(widgetList, (w, parent) => {
-    handler(w);
+  loopHandleWidget(widgetList, (w, parentWidget) => {
+    handler(w, parentWidget);
   });
 
   /* widgetList.forEach((w) => {
@@ -1449,6 +1449,11 @@ function loopHandleWidgetItem(e, p, callback) {
     }
   } else {
     callback && callback(e);
+    if (e.widgetList) {
+      e.widgetList.forEach(function (childItem) {
+        loopHandleWidgetItem(childItem, e, callback);
+      });
+    }
   }
 }