cloud-web-corejs 1.0.54-dev.589 → 1.0.54-dev.590

package/src/components/table/index.js

@@ -261,8 +261,12 @@ function columnDrop(t, tableName, tableRef) {
         const oldColumnIndex = $table.getColumnIndex(collectColumn[oldIndex]);
         const newColumnIndex = $table.getColumnIndex(collectColumn[newIndex]);
         // 移动到目标列
-        const currRow = collectColumn.splice(oldColumnIndex, 1)[0];
-        collectColumn.splice(newColumnIndex, 0, currRow);
+        let oldIndexFinal = oldColumnIndex;
+        let newIndexFinal = newColumnIndex;
+        // let oldIndexFinal = oldColumnIndex > newColumnIndex ? oldColumnIndex : newColumnIndex;
+        // let newIndexFinal = oldColumnIndex > newColumnIndex ? newColumnIndex : oldColumnIndex;
+        const currRow = collectColumn.splice(oldIndexFinal, 1)[0];
+        collectColumn.splice(newIndexFinal, 0, currRow);
         $table.loadColumn(collectColumn);
         addTableJson(that, $table, tableName, collectColumn);
       },

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-menu-widget.vue → dropdown-widget.vue}

@@ -5,7 +5,7 @@
                           :index-of-parent-list="indexOfParentList"
                           :sub-form-row-index="subFormRowIndex" :sub-form-col-index="subFormColIndex"
                           :sub-form-row-id="subFormRowId">
-    <el-dropdown trigger="hover">
+    <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
@@ -13,12 +13,13 @@
       </el-button>
       <el-dropdown-menu slot="dropdown">
         <template v-for="(subWidget,index) in field.widgetList">
-          <el-dropdown-item v-if="!subWidget.options.hidden" :key="index" :icon="subWidget.options.icon"
-                            @click.native="handleSubButtonWidgetClick(index)">
+          <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">
+                                :formItemProp="formItemProp" :ref="'item'+index" @hiddenChange="handleHidden"
+                                @disabledChange="handleDisabled">
             </dropdownItemWidget>
           </el-dropdown-item>
 
@@ -30,13 +31,13 @@
 
 <script>
 import StaticContentWrapper from './static-content-wrapper'
-import emitter from '../../../../../components/xform/utils/emitter'
-import i18n from "../../../../../components/xform/utils/i18n";
-import fieldMixin from "../../../../../components/xform/form-designer/form-widget/field-widget/fieldMixin";
-import dropdownItemWidget from '../../../../../components/xform/form-designer/form-widget/field-widget/dropdown-item-widget.vue';
+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-menu-widget",
+  name: "dropdown-widget",
   componentName: 'FieldWidget',  //必须固定为FieldWidget，用于接收父级组件的broadcast事件
   mixins: [emitter, fieldMixin, i18n],
   props: {
@@ -69,7 +70,9 @@ export default {
     StaticContentWrapper,
     dropdownItemWidget
   },
-  computed: {},
+  computed: {
+
+  },
   beforeCreate() {
     /* 这里不能访问方法和属性！！ */
   },
@@ -79,7 +82,7 @@ export default {
        需要在父组件created中初始化！！ */
     this.registerToRefList()
     this.initEventHandler()
-
+    this.init()
     this.handleOnCreated()
   },
 
@@ -92,9 +95,28 @@ export default {
   },
 
   methods: {
-    handleSubButtonWidgetClick(index) {
-      this.$refs["item"+index].handleButtonWidgetClick()
-    }
+    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)
+    },
   }
 
 }

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/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

@@ -901,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 = [
   {
@@ -3378,9 +3379,9 @@ export const advancedFields = [
     },
   },
   {
-    type: "dropdown-menu",
+    type: "dropdown",
     icon: "tab",
-    // commonFlag: !0,
+    commonFlag: !0,
     // columnFlag: true,
     widgetList: [],
     options: {
@@ -3388,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: "",
     },
@@ -3406,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: {
@@ -3421,6 +3421,9 @@ export const advancedFields = [
         tableRef: null,
         tableData: {},
       },
+
+      ...defaultWfConfig,
+      ...defaultWidgetShowRuleConfig,
     },
   },
   {
@@ -3484,7 +3487,7 @@ export const advancedFields = [
     },
   },
 
-  {
+  /* {
     type: "vue-page",
     icon: "html-text",
     commonFlag: !0,
@@ -3502,7 +3505,7 @@ export const advancedFields = [
       labelHidden: !1,
 
     },
-  },
+  }, */
 ];
 
 export const businessFields = [