cloud-web-corejs 1.0.54-dev.626 → 1.0.54-dev.628

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/setting-panel/property-editor/container-data-table/table-column-dialog.vue

@@ -104,7 +104,9 @@
               @change="changeFormatS(scope.row, false)"
               clearable
             >
-              <el-option-group :label="i18nt('designer.setting.customRenderGroup')">
+              <el-option-group
+                :label="i18nt('designer.setting.customRenderGroup')"
+              >
                 <el-option value="render" label="render"></el-option>
               </el-option-group>
               <el-option-group v-for="t in op" :key="t.label" :label="t.label">
@@ -172,7 +174,12 @@
             <el-switch v-model="scope.row.filterable"></el-switch>
           </template>
         </el-table-column>
-        <el-table-column label="编辑更多属性" width="100" align="center" fixed="right">
+        <el-table-column
+          label="编辑更多属性"
+          width="100"
+          align="center"
+          fixed="right"
+        >
           <template #default="scope">
             <el-button
               size="mini"
@@ -286,7 +293,11 @@
       top="7vh"
       :append-to-body="true"
     >
-      <el-alert type="info" :closable="!1" title="function customRender(params,h) {" />
+      <el-alert
+        type="info"
+        :closable="!1"
+        title="function customRender(params,h) {"
+      />
       <code-editor
         ref="dsResultEditor"
         mode="javascript"
@@ -455,7 +466,9 @@
               @change="changeFormatS(rowData, false)"
               clearable
             >
-              <el-option-group :label="i18nt('designer.setting.customRenderGroup')">
+              <el-option-group
+                :label="i18nt('designer.setting.customRenderGroup')"
+              >
                 <el-option value="render" label="render"></el-option>
               </el-option-group>
               <el-option-group v-for="t in op" :key="t.label" :label="t.label">
@@ -476,7 +489,8 @@
               icon="el-icon-edit"
               @click="openFormatConfigDialog(rowData, rowDataIndex)"
               :disabled="
-                !columnFormatMap[rowData.formatS] && 'widgetRender' !== rowData.formatS
+                !columnFormatMap[rowData.formatS] &&
+                'widgetRender' !== rowData.formatS
               "
             ></el-button>
           </el-form-item>
@@ -559,7 +573,9 @@
               plain=""
               round=""
               icon="el-icon-edit"
-              @click="editFormEventHandler(rowData, rowDataIndex, 'footerMethodConfg')"
+              @click="
+                editFormEventHandler(rowData, rowDataIndex, 'footerMethodConfg')
+              "
               :disabled="rowData.footerDataType !== '3'"
             ></el-button>
           </el-form-item>
@@ -575,7 +591,11 @@
         </el-form>
       </div>
       <div class="dialog-footer" slot="footer">
-        <el-button @click="closeRowEditDialog" class="button-sty" icon="el-icon-close">
+        <el-button
+          @click="closeRowEditDialog"
+          class="button-sty"
+          icon="el-icon-close"
+        >
           {{ i18nt("designer.hint.cancel") }}
         </el-button>
         <el-button
@@ -671,6 +691,10 @@ export default {
               value: "editDate",
               label: "日期输入框",
             },
+            {
+              value: "textarea",
+              label: "多行文本输入框",
+            },
             {
               value: "editSelect",
               label: "下拉框",
@@ -699,6 +723,23 @@ export default {
               value: "text",
               label: "文本",
             },
+            {
+              value: "aText",
+              label: "超链接文本",
+            },
+            {
+              value: "widgetRender",
+              label: "自定义组件",
+            },
+          ],
+        },
+        {
+          label: "按钮控件",
+          options: [
+            {
+              value: "dropdown",
+              label: "下拉按钮",
+            },
             {
               value: "editDelete",
               label: "删除按钮",
@@ -707,10 +748,6 @@ export default {
               value: "editButton",
               label: "查看按钮",
             },
-            {
-              value: "aText",
-              label: "超链接文本",
-            },
             {
               value: "aLink",
               label: "超链接按钮",
@@ -723,10 +760,6 @@ export default {
               value: "editTreeButtonGroup",
               label: "编辑行按钮组",
             },
-            {
-              value: "widgetRender",
-              label: "自定义组件",
-            },
           ],
         },
         {
@@ -760,7 +793,7 @@ export default {
           options: businessOptions,
         },
         {
-          label: "Date Format",
+          label: "日期格式化",
           options: [
             {
               value: "d1",
@@ -785,7 +818,7 @@ export default {
           ],
         },
         {
-          label: "Number Format",
+          label: "数字格式化",
           options: [
             {
               value: "n1",
@@ -900,7 +933,9 @@ export default {
         });
 
         if (syntaxErrorFlag) {
-          this.$message.error(this.i18nt("designer.setting.syntaxCheckWarning"));
+          this.$message.error(
+            this.i18nt("designer.setting.syntaxCheckWarning")
+          );
           return;
         }
       }
@@ -909,7 +944,9 @@ export default {
     },
     init() {
       setTimeout(() => {
-        this.tableData = this.$baseLodash.cloneDeep(this.optionModel.tableColumns);
+        this.tableData = this.$baseLodash.cloneDeep(
+          this.optionModel.tableColumns
+        );
         this.$nextTick(() => {
           this.rowDrop();
           setTimeout(() => {
@@ -1009,7 +1046,8 @@ export default {
       let newRow = this.generateRow(generateParentId);
       if (children) {
         if (type === "SIBLING") {
-          let addIndex = children.findIndex((item) => item.columnId == row.columnId) + 1;
+          let addIndex =
+            children.findIndex((item) => item.columnId == row.columnId) + 1;
           children.splice(addIndex, 0, newRow);
         } else {
           children.push(newRow);
@@ -1057,7 +1095,9 @@ export default {
       const { parentId, columnId } = row;
       // 根节点直接删除
       if (!parentId) {
-        const delIndex = this.tableData.findIndex((item) => item.columnId === columnId);
+        const delIndex = this.tableData.findIndex(
+          (item) => item.columnId === columnId
+        );
         this.tableData.splice(delIndex, 1);
       } else {
         // 找到父节点，通过父节点删除
@@ -1076,7 +1116,9 @@ export default {
 
         const { children } = parentRow;
 
-        const delIndex = children.findIndex((item) => item.columnId === columnId);
+        const delIndex = children.findIndex(
+          (item) => item.columnId === columnId
+        );
 
         children.splice(delIndex, 1);
       }
@@ -1140,7 +1182,9 @@ export default {
     //数组转树
     arrToTree(arr, parentId) {
       return arr
-        .filter((item) => (!parentId ? !item.parentId : item.parentId === parentId))
+        .filter((item) =>
+          !parentId ? !item.parentId : item.parentId === parentId
+        )
         .map((item) => {
           item.children = this.arrToTree(arr, item.columnId);
           return item;
@@ -1224,7 +1268,10 @@ export default {
       let isButtontCell = false;
       let widgetType = this.columnFormatMap[formatS];
       if (widgetType) {
-        isButtontCell = widgetType === "a-link" || widgetType === "button";
+        isButtontCell =
+          widgetType === "a-link" ||
+          widgetType === "button" ||
+          widgetType === "dropdown";
       }
       return isButtontCell;
     },
@@ -1268,7 +1315,9 @@ export default {
           row.sortable = false;
           row.width = 150;
         } else if (isButtontCell) {
-          if (row.formatS == "aLink" || row.formatS == "button") {
+          if (row.formatS == "dropdown") {
+            row.width = 100;
+          } else if (row.formatS == "aLink" || row.formatS == "button") {
             if (!row.width || row.width == 47) row.width = 150;
           } else {
             row.width = 47;
@@ -1283,7 +1332,9 @@ export default {
           if (!row.label) row.label = tmpId;
 
           if (this.userFields.includes(row.formatS)) {
-            let item = this.businessOptions.find((item) => item.value == row.formatS);
+            let item = this.businessOptions.find(
+              (item) => item.value == row.formatS
+            );
             if (item) {
               row.prop = item.value;
               row.label = item.label;
@@ -1413,15 +1464,18 @@ export default {
     findColumnByColumnId(columnList, columnId) {
       let result = null;
       if (columnList) {
-        /* let column = columnList.find((item) => item.columnId == columnId);
+        let column = columnList.find((item) => item.columnId == columnId);
         if (!column) {
-        } */
+        }
         for (let column of columnList) {
           if (column.columnId == columnId) {
             result = column;
             break;
           } else if (column.children && column.children.length) {
-            let subColumn = this.findColumnByColumnId(column.children, columnId);
+            let subColumn = this.findColumnByColumnId(
+              column.children,
+              children
+            );
             if (subColumn) {
               result = subColumn;
               break;
@@ -1452,7 +1506,10 @@ export default {
         loopHandleWidget(formWidgetList, (item) => {
           if (item.options.name == dataTableName) {
             item.options.tableColumns = tableData;
-            targetColumn = this.findColumnByColumnId(item.options.tableColumns, columnId);
+            targetColumn = this.findColumnByColumnId(
+              item.options.tableColumns,
+              columnId
+            );
           }
         });
         let getWidgetList = (subWidgetList = []) => {
@@ -1587,7 +1644,9 @@ export default {
         });
 
         if (syntaxErrorFlag) {
-          this.$message.error(this.i18nt("designer.setting.syntaxCheckWarning"));
+          this.$message.error(
+            this.i18nt("designer.setting.syntaxCheckWarning")
+          );
           return;
         }
       }
@@ -1611,19 +1670,25 @@ export default {
       let type1 = this.columnFormatMap[row.formatS];
       let type2 = this.columnFormatMap[row.editFormatS];
       let newWidget = type1
-        ? this.designer.copyNewFieldWidget(this.designer.getFieldWidgetByType(type1))
+        ? this.designer.copyNewFieldWidget(
+            this.designer.getFieldWidgetByType(type1)
+          )
         : null;
 
       let newEditWidget = type2
-        ? this.designer.copyNewFieldWidget(this.designer.getFieldWidgetByType(type2))
+        ? this.designer.copyNewFieldWidget(
+            this.designer.getFieldWidgetByType(type2)
+          )
         : null;
 
       if (newWidget.formItemFlag) {
         if (row.widget) {
-          if (row.widget.options[key] !== undefined) row.widget.options[key] = value;
+          if (row.widget.options[key] !== undefined)
+            row.widget.options[key] = value;
         }
         if (row.columnOption) {
-          if (row.columnOption[key] !== undefined) row.columnOption[key] = value;
+          if (row.columnOption[key] !== undefined)
+            row.columnOption[key] = value;
         }
       }
 
@@ -1633,7 +1698,8 @@ export default {
             row.editWidget.options[key] = value;
         }
         if (row.editColumnOption) {
-          if (row.editColumnOption[key] !== undefined) row.editColumnOption[key] = value;
+          if (row.editColumnOption[key] !== undefined)
+            row.editColumnOption[key] = value;
         }
       }
     },

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

@@ -1,11 +1,11 @@
 <template>
   <div>
-<!--    <el-form-item :label="i18nt('启用流程')">
-      <el-switch v-model="optionModel.wfEnabled"></el-switch>
-    </el-form-item>-->
     <el-form-item label-width="0">
       <el-divider class="custom-divider">{{ i18nt('designer.setting.columnSetting') }}</el-divider>
     </el-form-item>
+    <el-form-item :label="i18nt('隐藏导航')">
+      <el-switch v-model="optionModel.hideNav"></el-switch>
+    </el-form-item>
     <el-form-item :label="i18nt('designer.setting.colsOfGrid')"></el-form-item>
     <el-form-item label-width="0">
       <draggable tag="ul" class="draggable-box" :list="selectedWidget.panes"