@fecp/designer 5.4.82 → 5.4.83

package/lib/designer/src/packages/table/index.vue.js

@@ -4,23 +4,13 @@ require("../../../../node_modules/element-plus/es/index.js");
 ;/* empty css                                                          */
 ;/* empty css                                                            */
 ;/* empty css                                                                  */
-;/* empty css                                                               */
-;/* empty css                                                               */
-;/* empty css                                                                     */
-;/* empty css                                                                 */
-require("../../../../node_modules/element-plus/theme-chalk/el-dropdown-menu.css.js");
-;/* empty css                                                              */
-;/* empty css                                                                     */
-;/* empty css                                                               */
-;/* empty css                                                                     */
-;/* empty css                                                               */
 ;/* empty css                                                             */
 ;/* empty css                                                              */
 ;/* empty css                                                                 */
 const vue = require("vue");
 const _default = require("./default.js");
 const vueDraggablePlus = require("../../../../node_modules/vue-draggable-plus/dist/vue-draggable-plus.js");
-const index$7 = require("../../../../node_modules/@element-plus/icons-vue/dist/index.js");
+const index$6 = require("../../../../node_modules/@element-plus/icons-vue/dist/index.js");
 const TableSetting = require("./TableSetting.vue.js");
 const index = ;/* empty css                       */
 const tablePagination = require("./tablePagination.vue.js");
@@ -35,11 +25,8 @@ const index$2 = require("../../../../node_modules/element-plus/es/components/rad
 const index$3 = require("../../../../node_modules/element-plus/es/components/scrollbar/index.js");
 const index$4 = require("../../../../node_modules/element-plus/es/components/icon/index.js");
 const index$5 = require("../../../../node_modules/element-plus/es/components/link/index.js");
-const index$6 = require("../../../../node_modules/element-plus/es/components/dropdown/index.js");
-const index$8 = require("../../../../node_modules/element-plus/es/components/select/index.js");
-const index$9 = require("../../../../node_modules/element-plus/es/components/input-number/index.js");
-const index$a = require("../../../../node_modules/element-plus/es/components/tag/index.js");
-const index$b = require("../../../../node_modules/element-plus/es/components/message/index.js");
+const index$7 = require("../../../../node_modules/element-plus/es/components/tag/index.js");
+const index$8 = require("../../../../node_modules/element-plus/es/components/message/index.js");
 const _hoisted_1 = { class: "table-work-area" };
 const _hoisted_2 = {
   key: 0,
@@ -56,19 +43,7 @@ const _hoisted_7 = { class: "widgets" };
 const _hoisted_8 = { class: "field-label" };
 const _hoisted_9 = { key: 1 };
 const _hoisted_10 = { class: "quick-operation" };
-const _hoisted_11 = { class: "quick-setting-panel" };
-const _hoisted_12 = { class: "setting-row" };
-const _hoisted_13 = { class: "setting-row" };
-const _hoisted_14 = {
-  key: 0,
-  class: "setting-row"
-};
-const _hoisted_15 = {
-  key: 1,
-  class: "setting-row"
-};
-const _hoisted_16 = { class: "setting-row" };
-const _hoisted_17 = { class: "widgets" };
+const _hoisted_11 = { class: "widgets" };
 const _sfc_main = {
   __name: "index",
   setup(__props) {
@@ -98,13 +73,7 @@ const _sfc_main = {
     const tableOptions = vue.computed(() => {
       return common.getEditConfigData();
     });
-    const dropdownVisibleMap = vue.ref(/* @__PURE__ */ new Map());
-    function getDropdownVisible(itemId) {
-      return dropdownVisibleMap.value.get(itemId) || false;
-    }
-    function setDropdownVisible(itemId, visible) {
-      dropdownVisibleMap.value.set(itemId, visible);
-    }
+    vue.ref(/* @__PURE__ */ new Map());
     function addOptBtns() {
       tableOptions.value.optBtns.push({
         id: Date.now(),
@@ -145,7 +114,7 @@ const _sfc_main = {
         if (filterIndex !== -1) {
           tableOptions.value.queryConfig.filterFields.splice(filterIndex, 1);
         }
-        index$b.ElMessage.success("字段已移至回收站");
+        index$8.ElMessage.success("字段已移至回收站");
       }
       common.setSelectedItem();
     }
@@ -173,13 +142,8 @@ const _sfc_main = {
       const _component_el_icon = index$4.ElIcon;
       const _component_el_link = index$5.ElLink;
       const _component_CopyDocument = vue.resolveComponent("CopyDocument");
-      const _component_el_option = index$8.ElOption;
-      const _component_el_select = index$8.ElSelect;
-      const _component_el_input_number = index$9.ElInputNumber;
-      const _component_el_dropdown_menu = index$6.ElDropdownMenu;
-      const _component_el_dropdown = index$6.ElDropdown;
       const _component_el_scrollbar = index$3.ElScrollbar;
-      const _component_el_tag = index$a.ElTag;
+      const _component_el_tag = index$7.ElTag;
       return vue.openBlock(), vue.createElementBlock(vue.Fragment, null, [
         vue.createVNode(vue.unref(index.default)),
         vue.createVNode(TableSetting.default),
@@ -235,7 +199,15 @@ const _sfc_main = {
                     }, [
                       vue.createElementVNode("div", _hoisted_7, [
                         vue.createTextVNode(vue.toDisplayString(item.label) + " ", 1),
-                        item.canSort ? (vue.openBlock(), vue.createBlock(_component_el_icon, { key: 0 }, {
+                        item.sortRule == "static" ? (vue.openBlock(), vue.createBlock(_component_el_icon, { key: 0 }, {
+                          default: vue.withCtx(() => [
+                            vue.createVNode(_component_DCaret)
+                          ]),
+                          _: 1
+                        })) : item.sortRule == "server" ? (vue.openBlock(), vue.createBlock(_component_el_icon, {
+                          key: 1,
+                          style: { "color": "#8dd0f0" }
+                        }, {
                           default: vue.withCtx(() => [
                             vue.createVNode(_component_DCaret)
                           ]),
@@ -262,134 +234,13 @@ const _sfc_main = {
                         })) : vue.createCommentVNode("", true)
                       ]),
                       vue.createElementVNode("div", _hoisted_10, [
-                        vue.createVNode(_component_el_dropdown, {
-                          "max-height": 500,
-                          "popper-class": `quick-operation-dropdown-${item.id}`,
-                          trigger: "click",
-                          placement: "bottom",
-                          "hide-on-click": false,
-                          onVisibleChange: (visible) => setDropdownVisible(item.id, visible)
-                        }, {
-                          dropdown: vue.withCtx(() => [
-                            getDropdownVisible(item.id) ? (vue.openBlock(), vue.createBlock(_component_el_dropdown_menu, { key: 0 }, {
-                              default: vue.withCtx(() => [
-                                vue.createElementVNode("div", _hoisted_11, [
-                                  vue.createElementVNode("div", _hoisted_12, [
-                                    _cache[6] || (_cache[6] = vue.createElementVNode("span", { class: "setting-label" }, "对齐:", -1)),
-                                    vue.createVNode(_component_el_select, {
-                                      modelValue: item.align,
-                                      "onUpdate:modelValue": ($event) => item.align = $event,
-                                      size: "small",
-                                      class: "setting-select",
-                                      "append-to": `.quick-operation-dropdown-${item.id}`
-                                    }, {
-                                      default: vue.withCtx(() => [
-                                        vue.createVNode(_component_el_option, {
-                                          label: "左对齐",
-                                          value: "left"
-                                        }),
-                                        vue.createVNode(_component_el_option, {
-                                          label: "居中",
-                                          value: "center"
-                                        }),
-                                        vue.createVNode(_component_el_option, {
-                                          label: "右对齐",
-                                          value: "right"
-                                        })
-                                      ]),
-                                      _: 2
-                                    }, 1032, ["modelValue", "onUpdate:modelValue", "append-to"])
-                                  ]),
-                                  vue.createElementVNode("div", _hoisted_13, [
-                                    _cache[7] || (_cache[7] = vue.createElementVNode("span", { class: "setting-label" }, "宽度:", -1)),
-                                    vue.createVNode(_component_el_select, {
-                                      modelValue: item.widthMode,
-                                      "onUpdate:modelValue": ($event) => item.widthMode = $event,
-                                      size: "small",
-                                      class: "setting-select",
-                                      "append-to": `.quick-operation-dropdown-${item.id}`
-                                    }, {
-                                      default: vue.withCtx(() => [
-                                        vue.createVNode(_component_el_option, {
-                                          label: "自适应",
-                                          value: "auto"
-                                        }),
-                                        vue.createVNode(_component_el_option, {
-                                          label: "固定",
-                                          value: "fixed"
-                                        })
-                                      ]),
-                                      _: 2
-                                    }, 1032, ["modelValue", "onUpdate:modelValue", "append-to"])
-                                  ]),
-                                  item.widthMode === "fixed" ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_14, [
-                                    _cache[8] || (_cache[8] = vue.createElementVNode("span", { class: "setting-label" }, "固定:", -1)),
-                                    vue.createVNode(_component_el_input_number, {
-                                      modelValue: item.width,
-                                      "onUpdate:modelValue": ($event) => item.width = $event,
-                                      size: "small",
-                                      min: 50,
-                                      max: 500,
-                                      "controls-position": "right",
-                                      class: "setting-input"
-                                    }, null, 8, ["modelValue", "onUpdate:modelValue"])
-                                  ])) : vue.createCommentVNode("", true),
-                                  item.widthMode === "auto" ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_15, [
-                                    _cache[9] || (_cache[9] = vue.createElementVNode("span", { class: "setting-label" }, "最小:", -1)),
-                                    vue.createVNode(_component_el_input_number, {
-                                      modelValue: item.minWidth,
-                                      "onUpdate:modelValue": ($event) => item.minWidth = $event,
-                                      size: "small",
-                                      min: 80,
-                                      max: 500,
-                                      "controls-position": "right",
-                                      class: "setting-input"
-                                    }, null, 8, ["modelValue", "onUpdate:modelValue"])
-                                  ])) : vue.createCommentVNode("", true),
-                                  vue.createElementVNode("div", _hoisted_16, [
-                                    vue.createVNode(_component_el_checkbox, {
-                                      modelValue: item.canSort,
-                                      "onUpdate:modelValue": ($event) => item.canSort = $event,
-                                      label: "排序",
-                                      size: "small"
-                                    }, null, 8, ["modelValue", "onUpdate:modelValue"]),
-                                    vue.createVNode(_component_el_checkbox, {
-                                      modelValue: item.isFixed,
-                                      "onUpdate:modelValue": ($event) => item.isFixed = $event,
-                                      label: "固定",
-                                      size: "small"
-                                    }, null, 8, ["modelValue", "onUpdate:modelValue"]),
-                                    vue.createVNode(_component_el_checkbox, {
-                                      modelValue: item.canCopy,
-                                      "onUpdate:modelValue": ($event) => item.canCopy = $event,
-                                      label: "复制",
-                                      size: "small"
-                                    }, null, 8, ["modelValue", "onUpdate:modelValue"])
-                                  ])
-                                ])
-                              ]),
-                              _: 2
-                            }, 1024)) : vue.createCommentVNode("", true)
-                          ]),
-                          default: vue.withCtx(() => [
-                            vue.createVNode(_component_el_icon, {
-                              class: vue.normalizeClass(["setting-icon", { "is-active": getDropdownVisible(item.id) }])
-                            }, {
-                              default: vue.withCtx(() => [
-                                vue.createVNode(vue.unref(index$7.Setting))
-                              ]),
-                              _: 2
-                            }, 1032, ["class"])
-                          ]),
-                          _: 2
-                        }, 1032, ["popper-class", "onVisibleChange"]),
                         getVisibleColCount() > 1 ? (vue.openBlock(), vue.createBlock(_component_el_icon, {
                           key: 0,
                           class: "icon-action setting-icon",
                           onClick: vue.withModifiers(($event) => handleHide(item), ["stop"])
                         }, {
                           default: vue.withCtx(() => [
-                            vue.createVNode(vue.unref(index$7.Hide))
+                            vue.createVNode(vue.unref(index$6.Hide))
                           ]),
                           _: 2
                         }, 1032, ["onClick"])) : vue.createCommentVNode("", true),
@@ -399,7 +250,7 @@ const _sfc_main = {
                           onClick: vue.withModifiers(($event) => deleteWidgets(item), ["stop"])
                         }, {
                           default: vue.withCtx(() => [
-                            vue.createVNode(vue.unref(index$7.Delete))
+                            vue.createVNode(vue.unref(index$6.Delete))
                           ]),
                           _: 2
                         }, 1032, ["onClick"])) : vue.createCommentVNode("", true)
@@ -411,28 +262,28 @@ const _sfc_main = {
                 ]),
                 _: 1
               }, 8, ["modelValue"]),
-              _cache[10] || (_cache[10] = vue.createElementVNode("div", { class: "widgets-opt-tools" }, null, -1))
+              _cache[6] || (_cache[6] = vue.createElementVNode("div", { class: "widgets-opt-tools" }, null, -1))
             ]),
             _: 1
           }),
           vue.createElementVNode("div", {
             class: vue.normalizeClass(["table-item table-btn", { close: !vue.unref(tableOptions).isOptBtns }])
           }, [
-            vue.createElementVNode("div", _hoisted_17, [
+            vue.createElementVNode("div", _hoisted_11, [
               vue.createVNode(_component_el_checkbox, {
                 class: "isOptBtns",
                 modelValue: vue.unref(tableOptions).isOptBtns,
                 "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => vue.unref(tableOptions).isOptBtns = $event)
               }, null, 8, ["modelValue"]),
-              _cache[12] || (_cache[12] = vue.createElementVNode("span", { class: "widgets-label" }, "操作", -1)),
+              _cache[8] || (_cache[8] = vue.createElementVNode("span", { class: "widgets-label" }, "操作", -1)),
               vue.createVNode(_component_el_link, {
                 class: "addLink",
                 underline: "never",
                 type: "primary",
-                icon: vue.unref(index$7.Plus),
+                icon: vue.unref(index$6.Plus),
                 onClick: vue.withModifiers(addOptBtns, ["stop"])
               }, {
-                default: vue.withCtx(() => _cache[11] || (_cache[11] = [
+                default: vue.withCtx(() => _cache[7] || (_cache[7] = [
                   vue.createTextVNode("按钮")
                 ])),
                 _: 1
@@ -474,5 +325,5 @@ const _sfc_main = {
     };
   }
 };
-const tableWorkArea = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-55479df2"]]);
+const tableWorkArea = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-4248fdc3"]]);
 exports.default = tableWorkArea;

package/lib/designer/src/packages/table/property/widgets.vue.js

@@ -458,22 +458,49 @@ const _sfc_main = {
                     ]),
                     _: 1
                   }),
+                  vue.createVNode(_component_el_form_item, { label: "字段排序" }, {
+                    default: vue.withCtx(() => [
+                      vue.createVNode(_component_el_radio_group, {
+                        modelValue: vue.unref(currentItem).sortRule,
+                        "onUpdate:modelValue": _cache[19] || (_cache[19] = ($event) => vue.unref(currentItem).sortRule = $event),
+                        size: "small"
+                      }, {
+                        default: vue.withCtx(() => [
+                          vue.createVNode(_component_el_radio_button, { value: "none" }, {
+                            default: vue.withCtx(() => _cache[27] || (_cache[27] = [
+                              vue.createTextVNode("无")
+                            ])),
+                            _: 1
+                          }),
+                          vue.createVNode(_component_el_radio_button, { value: "static" }, {
+                            default: vue.withCtx(() => _cache[28] || (_cache[28] = [
+                              vue.createTextVNode("前台排序")
+                            ])),
+                            _: 1
+                          }),
+                          vue.createVNode(_component_el_radio_button, { value: "server" }, {
+                            default: vue.withCtx(() => _cache[29] || (_cache[29] = [
+                              vue.createTextVNode("后台排序")
+                            ])),
+                            _: 1
+                          })
+                        ]),
+                        _: 1
+                      }, 8, ["modelValue"])
+                    ]),
+                    _: 1
+                  }),
                   vue.createVNode(_component_el_form_item, { label: "其他" }, {
                     default: vue.withCtx(() => [
                       vue.createVNode(_component_el_checkbox, {
-                        modelValue: vue.unref(currentItem).canSort,
-                        "onUpdate:modelValue": _cache[19] || (_cache[19] = ($event) => vue.unref(currentItem).canSort = $event),
-                        label: "排序"
+                        modelValue: vue.unref(currentItem).isFixed,
+                        "onUpdate:modelValue": _cache[20] || (_cache[20] = ($event) => vue.unref(currentItem).isFixed = $event),
+                        label: "左侧固定"
                       }, null, 8, ["modelValue"]),
                       vue.createVNode(_component_el_checkbox, {
                         modelValue: vue.unref(currentItem).canCopy,
-                        "onUpdate:modelValue": _cache[20] || (_cache[20] = ($event) => vue.unref(currentItem).canCopy = $event),
+                        "onUpdate:modelValue": _cache[21] || (_cache[21] = ($event) => vue.unref(currentItem).canCopy = $event),
                         label: "复制"
-                      }, null, 8, ["modelValue"]),
-                      vue.createVNode(_component_el_checkbox, {
-                        modelValue: vue.unref(currentItem).isFixed,
-                        "onUpdate:modelValue": _cache[21] || (_cache[21] = ($event) => vue.unref(currentItem).isFixed = $event),
-                        label: "左侧固定"
                       }, null, 8, ["modelValue"])
                     ]),
                     _: 1
@@ -490,5 +517,5 @@ const _sfc_main = {
     };
   }
 };
-const widgets = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-1b079e6c"]]);
+const widgets = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-ee9264c8"]]);
 exports.default = widgets;

package/lib/designer/src/packages/table/queryModule/DynamicModeConfig.vue.js

@@ -303,10 +303,22 @@ const _sfc_main = {
           vue.createElementVNode("div", _hoisted_6, [
             __props.enabled ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_7, [
               vue.createVNode(_component_el_input, {
-                placeholder: "请输入关键词搜索...",
-                class: "search-input",
-                "prefix-icon": vue.unref(index$1.Search)
-              }, vue.createSlots({ _: 2 }, [
+                placeholder: "请输入查询条件",
+                class: "search-input"
+              }, vue.createSlots({
+                suffix: vue.withCtx(() => [
+                  vue.createVNode(_component_el_icon, {
+                    class: "el-input__icon",
+                    style: { "cursor": "pointer" }
+                  }, {
+                    default: vue.withCtx(() => [
+                      vue.createVNode(vue.unref(index$1.Search))
+                    ]),
+                    _: 1
+                  })
+                ]),
+                _: 2
+              }, [
                 dynamicConfig.value.advancedSearch ? {
                   name: "append",
                   fn: vue.withCtx(() => [
@@ -319,7 +331,7 @@ const _sfc_main = {
                   ]),
                   key: "0"
                 } : void 0
-              ]), 1032, ["prefix-icon"])
+              ]), 1024)
             ])) : vue.createCommentVNode("", true),
             vue.createVNode(vue.unref(vueDraggablePlus.VueDraggable), {
               modelValue: editConfigData.value.customBtns.right,
@@ -496,5 +508,5 @@ const _sfc_main = {
     };
   }
 };
-const DynamicModeConfig = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-69373462"]]);
+const DynamicModeConfig = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-f2c50fdc"]]);
 exports.default = DynamicModeConfig;

package/lib/designer/src/packages/utils/datasource.js

@@ -221,10 +221,9 @@ class DataSourceManager {
       }
     } else {
       if (existingIndex > -1) {
-        this.sortRules[existingIndex].order = order;
-      } else {
-        this.sortRules.push({ field, order });
+        this.sortRules.splice(existingIndex, 1);
       }
+      this.sortRules.unshift({ field, order });
     }
   }
   /**