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

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

@@ -3,21 +3,64 @@
     <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">
+    <el-form-item label="按钮样式">
+      <el-select
+        v-model="optionModel.dropdownType"
+        placeholder="请选择按钮样式"
+      >
+        <el-option label="按钮" value="button"></el-option>
+        <el-option label="链接" value="link"></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="下拉触发方式">
+      <el-select
+        v-model="optionModel.dropdownTrigger"
+        placeholder="请选择下拉触发方式"
+      >
+        <el-option label="点击" value="click"></el-option>
+        <el-option label="悬停" value="hover"></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="下拉按钮选项"></el-form-item>
+        <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>
+          <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
+          type="text"
+          @click="addNewCol(selectedWidget)"
+          icon="el-icon-circle-plus-outline"
+          class="add-option"
+        >
           增加
         </el-button>
       </div>
@@ -26,9 +69,9 @@
 </template>
 
 <script>
-import Draggable from 'vuedraggable';
-import i18n from "../../../utils/i18n"
-import {deepClone, generateId} from "../../../utils/util"
+import Draggable from "vuedraggable";
+import i18n from "../../../utils/i18n";
+import { deepClone, generateId } from "../../../utils/util";
 
 export default {
   name: "dropdownFlag-editor",
@@ -41,23 +84,25 @@ export default {
     selectedWidget: Object,
     optionModel: Object,
   },
-  inject: ['openWidgetPropertyDialog'],
+  inject: ["openWidgetPropertyDialog"],
   methods: {
     deleteCol(gridWidget, colIdx) {
       if (!!gridWidget && !!gridWidget.widgetList) {
         gridWidget.widgetList.splice(colIdx, 1);
       }
-      this.designer.emitHistoryChange()
+      this.designer.emitHistoryChange();
     },
 
     addNewCol(gridWidget) {
-      let newGridCol = deepClone(this.designer.getFieldWidgetByType('dropdown-item'));
+      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;
+      newGridCol.id = "dropdown-item-" + tmpId;
+      newGridCol.options.name = "dropdownItem" + tmpId;
+      newGridCol.options.label = "dropdownItem" + tmpId;
       gridWidget.widgetList.push(newGridCol);
-      this.designer.emitHistoryChange()
+      this.designer.emitHistoryChange();
     },
     openEditFormatConfigDialog(fieldWidget, index) {
       this.openWidgetPropertyDialog({
@@ -67,8 +112,8 @@ export default {
         },
       });
     },
-  }
-}
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -85,5 +130,4 @@ li.col-item {
     margin-left: 6px;
   }
 }
-
 </style>

package/src/components/xform/form-designer/setting-panel/property-editor/event-handler/onClick-editor.vue

@@ -3,7 +3,7 @@
     <a
       href="javascript:void(0);"
       class="a-link link-oneLind"
-      @click="editEventHandler('onClick', eventParams)"
+      @click="openEventHandlerDialog"
     >
       <span>{{ optionModel.onClick }}</span>
       <i class="el-icon-edit"></i>
@@ -22,23 +22,31 @@ export default {
     designer: Object,
     selectedWidget: Object,
     optionModel: Object,
+    tableColumns: Array,
   },
   data() {
     return {
       // eventParams: ["id", "formCode"],
     };
   },
-  computed: {
-    eventParams() {
-      let eventParams = ["dataId", "formCode", "event"];
-      if (this.optionModel.rowFlag) {
-        eventParams.push("row", "index", "event");
+
+  methods: {
+    getEventParams() {
+      let eventParams = ["dataId", "formCode"];
+      if (this.tableColumns && this.tableColumns.length > 0) {
+        eventParams.push("row", "rowIndex", "event");
+      } else {
+        eventParams.push("event");
       }
       if (this.selectedWidget.type == "census") {
         eventParams.push("param");
       }
       return eventParams;
     },
+    openEventHandlerDialog() {
+      let eventParams = this.getEventParams();
+      this.editEventHandler("onClick", eventParams);
+    },
   },
 };
 </script>

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

@@ -398,6 +398,7 @@ export const containers = [
       hidden: !1,
       label: "单据详情",
       detailContainer: true,
+      hideNav: false,
       // colHeight: null,
       customClass: "",
       wfEnabled: false,
@@ -3391,6 +3392,8 @@ export const advancedFields = [
       disabled: !1,
       customClass: "",
       dropdownFlag: 1,
+      dropdownType: "button",
+      dropdownTrigger: "hover",
       // ...defaultWfConfig,
       onCreated: "",
       onMounted: "",