@fecp/vue 1.2.2 → 5.2.3

package/lib/packages/vue/src/components/forms/formItem/FormItem.vue.js

@@ -6,15 +6,17 @@ require("../../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typ
 ;/* empty css                                                                                                                                         */
 const vue = require("vue");
 const debounce = require("../form/debounce.js");
-const index$2 = require("../divider/index.js");
-const index$1 = require("../h2/index.js");
-const index$3 = require("../subForm/index.js");
-const index$4 = require("../subTable/index.js");
-const index = require("../index.js");
+const index$3 = require("../divider/index.js");
+const index$2 = require("../h2/index.js");
+const index$4 = require("../subForm/index.js");
+const index$5 = require("../subTable/index.js");
+const index$6 = require("../../bus/approvalHistory/index.js");
+const index$1 = require("../index.js");
+const index = require("../../bus/index.js");
 ;/* empty css               */
 const _pluginVue_exportHelper = require("../../../../../../_virtual/_plugin-vue_export-helper.js");
-const index$5 = require("../../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/form/index.js");
-const index$6 = require("../../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/tooltip/index.js");
+const index$7 = require("../../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/form/index.js");
+const index$8 = require("../../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/tooltip/index.js");
 const _hoisted_1 = {
   key: 0,
   class: "iconfont icon-iconZheng credit-icon"
@@ -62,7 +64,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     }
     const componentType = vue.computed(() => {
       const key = props.config.fieldType.charAt(0).toUpperCase() + props.config.fieldType.slice(1);
-      return index[key];
+      return { ...index$1, ...index }[key];
     });
     const componentProps = vue.computed(() => {
       const fieldProps = { ...props.config };
@@ -98,25 +100,29 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       }
     });
     return (_ctx, _cache) => {
-      const _component_el_tooltip = index$6.ElTooltip;
-      const _component_el_form_item = index$5.ElFormItem;
-      return __props.config.fieldType == "h2" ? (vue.openBlock(), vue.createBlock(vue.unref(index$1.H2), {
+      const _component_el_tooltip = index$8.ElTooltip;
+      const _component_el_form_item = index$7.ElFormItem;
+      return __props.config.fieldType == "h2" ? (vue.openBlock(), vue.createBlock(vue.unref(index$2.H2), {
         key: 0,
         config: __props.config
-      }, null, 8, ["config"])) : __props.config.fieldType == "divider" ? (vue.openBlock(), vue.createBlock(vue.unref(index$2.Divider), {
+      }, null, 8, ["config"])) : __props.config.fieldType == "divider" ? (vue.openBlock(), vue.createBlock(vue.unref(index$3.Divider), {
         key: 1,
         config: __props.config
-      }, null, 8, ["config"])) : __props.config.fieldType == "subForm" ? (vue.openBlock(), vue.createBlock(vue.unref(index$3.SubForm), {
+      }, null, 8, ["config"])) : __props.config.fieldType == "subForm" ? (vue.openBlock(), vue.createBlock(vue.unref(index$4.SubForm), {
         key: 2,
         config: __props.config,
         localConfig: __props.localConfig,
         formMode: __props.formMode
-      }, null, 8, ["config", "localConfig", "formMode"])) : __props.config.fieldType == "subTable" ? (vue.openBlock(), vue.createBlock(vue.unref(index$4.SubTable), {
+      }, null, 8, ["config", "localConfig", "formMode"])) : __props.config.fieldType == "subTable" ? (vue.openBlock(), vue.createBlock(vue.unref(index$5.SubTable), {
         key: 3,
         config: __props.config,
         localConfig: __props.localConfig
-      }, null, 8, ["config", "localConfig"])) : (vue.openBlock(), vue.createBlock(_component_el_form_item, {
+      }, null, 8, ["config", "localConfig"])) : __props.config.fieldType == "approvalHistory" ? (vue.openBlock(), vue.createBlock(vue.unref(index$6.ApprovalHistory), {
         key: 4,
+        config: __props.config,
+        localConfig: __props.localConfig
+      }, null, 8, ["config", "localConfig"])) : (vue.openBlock(), vue.createBlock(_component_el_form_item, {
+        key: 5,
         prop: __props.config.fieldName,
         required: __props.config.required,
         error: __props.error,
@@ -163,5 +169,5 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _FormItem = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-1f0d0846"]]);
+const _FormItem = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-c5d2ed41"]]);
 exports.default = _FormItem;

package/lib/packages/vue/src/components/forms/h2/H2.vue.js

@@ -7,6 +7,7 @@ const _hoisted_1 = { class: "fec-h2" };
 const _hoisted_2 = { class: "fec-label" };
 const _hoisted_3 = { class: "fec-label-title" };
 const _hoisted_4 = { class: "fec-label-sub-title" };
+const _hoisted_5 = { class: "fec-buttons" };
 const _sfc_main = {
   __name: "H2",
   props: {
@@ -22,10 +23,13 @@ const _sfc_main = {
         vue.createElementVNode("div", _hoisted_2, [
           vue.createElementVNode("div", _hoisted_3, vue.toDisplayString(__props.config.label), 1),
           vue.createElementVNode("div", _hoisted_4, vue.toDisplayString(__props.config.subLabel), 1)
+        ]),
+        vue.createElementVNode("div", _hoisted_5, [
+          vue.renderSlot(_ctx.$slots, "default", {}, void 0, true)
         ])
       ]);
     };
   }
 };
-const _H2 = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-dd9219b7"]]);
+const _H2 = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-122bb3c7"]]);
 exports.default = _H2;

package/lib/packages/vue/src/components/forms/index.js

@@ -18,6 +18,8 @@ const index$e = require("./subTable/index.js");
 const index$f = require("./cascader/index.js");
 const index$g = require("./area/index.js");
 const index$h = require("./industry/index.js");
+const index$i = require("./userSelect/index.js");
+const index$j = require("./roleSelect/index.js");
 exports.Form = index.Form;
 exports.Text = index$1.Text;
 exports.Textarea = index$2.Textarea;
@@ -36,3 +38,5 @@ exports.SubTable = index$e.SubTable;
 exports.Cascader = index$f.Cascader;
 exports.Area = index$g.Area;
 exports.Industry = index$h.Industry;
+exports.UserSelect = index$i.UserSelect;
+exports.RoleSelect = index$j.RoleSelect;

package/lib/packages/vue/src/components/forms/roleSelect/RoleSelect.vue.js

@@ -0,0 +1,125 @@
+"use strict";
+Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
+;/* empty css                                                                                                                                    */
+;/* empty css                                                                                                                                        */
+;/* empty css                                                                                                                                         */
+const vue = require("vue");
+const index$2 = require("../../dialog/index.js");
+;/* empty css                 */
+const _pluginVue_exportHelper = require("../../../../../../_virtual/_plugin-vue_export-helper.js");
+const index = require("../../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/input/index.js");
+const index$1 = require("../../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/button/index.js");
+const _hoisted_1 = { class: "text-field-wrapper" };
+const _sfc_main = /* @__PURE__ */ Object.assign({
+  inheritAttrs: false
+}, {
+  __name: "RoleSelect",
+  props: {
+    config: {
+      type: Object,
+      required: true
+    },
+    modelValue: {
+      type: [String, Number],
+      default: ""
+    },
+    placeholder: {
+      type: String,
+      default: ""
+    },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
+    formMode: {
+      type: String,
+      default: ""
+    },
+    dialogConfig: {
+      type: Object,
+      default: {}
+    }
+  },
+  emits: ["update:modelValue", "change"],
+  setup(__props, { emit: __emit }) {
+    const props = __props;
+    const emit = __emit;
+    function handleChange(val) {
+      emit("change", val);
+    }
+    const instance = vue.getCurrentInstance();
+    const formData = vue.inject("formData", null);
+    vue.inject("localConfig", null);
+    const fieldsData = vue.inject("fieldsData", null);
+    const hiddenFields = vue.inject("hiddenFields", null);
+    const formCtx = vue.inject("formCtx", null);
+    const inputValue = vue.computed(
+      () => formData.value[props.config.displayFieldName]
+    );
+    const fieldsList = [
+      ...(fieldsData == null ? void 0 : fieldsData.value) || [],
+      ...(hiddenFields == null ? void 0 : hiddenFields.value) || []
+    ];
+    const dialog = props.dialogConfig;
+    const customTableConfig = dialog.customTableConfig;
+    customTableConfig.dataSources.push({
+      id: "roleSelectDataSourceId",
+      name: "角色选择数据源",
+      serverName: "base-server",
+      url: "/sysRole/findByPageV5",
+      method: "post",
+      contentType: "json",
+      params: []
+    });
+    function openSuffixDialog() {
+      index$2.openDialog(
+        props.config.displayFieldName,
+        dialog,
+        instance,
+        formCtx,
+        fieldsList,
+        formData.value
+      ).then((result) => {
+        const values = result.map((row) => row.roleNo);
+        formData.value[props.config.fieldName] = values.join("|");
+        console.log("确定", result);
+      }).catch(() => {
+        console.log("取消");
+      });
+    }
+    return (_ctx, _cache) => {
+      const _component_el_button = index$1.ElButton;
+      const _component_el_input = index.ElInput;
+      return vue.openBlock(), vue.createElementBlock("div", _hoisted_1, [
+        vue.createVNode(_component_el_input, vue.mergeProps({
+          modelValue: inputValue.value,
+          "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => inputValue.value = $event)
+        }, vue.toHandlers(__props.config.eventHandlers), {
+          placeholder: __props.placeholder,
+          disabled: __props.disabled,
+          readonly: true,
+          onChange: handleChange,
+          clearable: ""
+        }), vue.createSlots({ _: 2 }, [
+          __props.formMode != "query" ? {
+            name: "append",
+            fn: vue.withCtx(() => [
+              vue.createVNode(_component_el_button, {
+                class: "suffixButton",
+                onClick: openSuffixDialog
+              }, {
+                default: vue.withCtx(() => _cache[1] || (_cache[1] = [
+                  vue.createTextVNode("选择")
+                ])),
+                _: 1
+              })
+            ]),
+            key: "0"
+          } : void 0
+        ]), 1040, ["modelValue", "placeholder", "disabled"])
+      ]);
+    };
+  }
+});
+const _RoleSelect = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-9e7a0b1c"]]);
+exports.default = _RoleSelect;

package/lib/packages/vue/src/components/forms/roleSelect/index.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
+const RoleSelect$1 = require("./RoleSelect.vue.js");
+const install = require("../../../utils/install.js");
+const RoleSelect = install.default.withInstall("RoleSelect", RoleSelect$1.default);
+exports.RoleSelect = RoleSelect;
+exports.default = RoleSelect;

package/lib/packages/vue/src/components/forms/subTable/SubTable.vue.js

@@ -75,7 +75,6 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       if (foundItem) {
         foundItem.fixedH = true;
         foundItem.h = props.config.subTableHeight + titleHeight;
-        foundItem.y = foundItem.y * foundItem.h;
         gridLayout.value.resizeEvent();
       }
     }

package/lib/packages/vue/src/components/forms/userSelect/UserSelect.vue.js

@@ -0,0 +1,125 @@
+"use strict";
+Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
+;/* empty css                                                                                                                                    */
+;/* empty css                                                                                                                                        */
+;/* empty css                                                                                                                                         */
+const vue = require("vue");
+const index$2 = require("../../dialog/index.js");
+;/* empty css                 */
+const _pluginVue_exportHelper = require("../../../../../../_virtual/_plugin-vue_export-helper.js");
+const index = require("../../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/input/index.js");
+const index$1 = require("../../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/button/index.js");
+const _hoisted_1 = { class: "text-field-wrapper" };
+const _sfc_main = /* @__PURE__ */ Object.assign({
+  inheritAttrs: false
+}, {
+  __name: "UserSelect",
+  props: {
+    config: {
+      type: Object,
+      required: true
+    },
+    modelValue: {
+      type: [String, Number],
+      default: ""
+    },
+    placeholder: {
+      type: String,
+      default: ""
+    },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
+    formMode: {
+      type: String,
+      default: ""
+    },
+    dialogConfig: {
+      type: Object,
+      default: {}
+    }
+  },
+  emits: ["update:modelValue", "change"],
+  setup(__props, { emit: __emit }) {
+    const props = __props;
+    const emit = __emit;
+    function handleChange(val) {
+      emit("change", val);
+    }
+    const instance = vue.getCurrentInstance();
+    const formData = vue.inject("formData", null);
+    vue.inject("localConfig", null);
+    const fieldsData = vue.inject("fieldsData", null);
+    const hiddenFields = vue.inject("hiddenFields", null);
+    const formCtx = vue.inject("formCtx", null);
+    const inputValue = vue.computed(
+      () => formData.value[props.config.displayFieldName]
+    );
+    const fieldsList = [
+      ...(fieldsData == null ? void 0 : fieldsData.value) || [],
+      ...(hiddenFields == null ? void 0 : hiddenFields.value) || []
+    ];
+    const dialog = props.dialogConfig;
+    const customTableConfig = dialog.customTableConfig;
+    customTableConfig.dataSources.push({
+      id: "userSelectDataSourceId",
+      name: "用户选择数据源",
+      serverName: "base-server",
+      url: "/user/sysUser/findByPageV5",
+      method: "post",
+      contentType: "json",
+      params: []
+    });
+    function openSuffixDialog() {
+      index$2.openDialog(
+        props.config.displayFieldName,
+        dialog,
+        instance,
+        formCtx,
+        fieldsList,
+        formData.value
+      ).then((result) => {
+        const values = result.map((row) => row.opNo);
+        formData.value[props.config.fieldName] = values.join("|");
+        console.log("确定", result);
+      }).catch(() => {
+        console.log("取消");
+      });
+    }
+    return (_ctx, _cache) => {
+      const _component_el_button = index$1.ElButton;
+      const _component_el_input = index.ElInput;
+      return vue.openBlock(), vue.createElementBlock("div", _hoisted_1, [
+        vue.createVNode(_component_el_input, vue.mergeProps({
+          modelValue: inputValue.value,
+          "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => inputValue.value = $event)
+        }, vue.toHandlers(__props.config.eventHandlers), {
+          placeholder: __props.placeholder,
+          disabled: __props.disabled,
+          readonly: true,
+          onChange: handleChange,
+          clearable: ""
+        }), vue.createSlots({ _: 2 }, [
+          __props.formMode != "query" ? {
+            name: "append",
+            fn: vue.withCtx(() => [
+              vue.createVNode(_component_el_button, {
+                class: "suffixButton",
+                onClick: openSuffixDialog
+              }, {
+                default: vue.withCtx(() => _cache[1] || (_cache[1] = [
+                  vue.createTextVNode("选择")
+                ])),
+                _: 1
+              })
+            ]),
+            key: "0"
+          } : void 0
+        ]), 1040, ["modelValue", "placeholder", "disabled"])
+      ]);
+    };
+  }
+});
+const _UserSelect = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-d91f3c86"]]);
+exports.default = _UserSelect;

package/lib/packages/vue/src/components/forms/userSelect/index.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
+const UserSelect$1 = require("./UserSelect.vue.js");
+const install = require("../../../utils/install.js");
+const UserSelect = install.default.withInstall("UserSelect", UserSelect$1.default);
+exports.UserSelect = UserSelect;
+exports.default = UserSelect;

package/lib/packages/vue/src/components/table/Table.vue.js

@@ -335,12 +335,14 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       if (dataSourceManager.value) {
         dataSourceManager.value.updateParams(filters);
         dataSourceManager.value.fetch();
+        clearSelection();
       }
     };
     const handleFilterReset = () => {
       if (dataSourceManager.value) {
         dataSourceManager.value.clearParams();
         dataSourceManager.value.fetch();
+        clearSelection();
       }
     };
     const refresh = (options = {}) => {
@@ -445,6 +447,11 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     );
     const loadConfig = async () => {
       if (!props.templateKey) {
+        if (props.initOption) {
+          localConfig.value = Object.assign({}, props.initOption);
+        }
+        emit("loaded", localConfig.value);
+        configLoading.value = false;
         return;
       }
       configLoading.value = true;
@@ -590,5 +597,5 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Table = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-6ce36f88"]]);
+const _Table = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-ed67e2f8"]]);
 exports.default = _Table;

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

@@ -176,8 +176,8 @@ class DataSourceManager {
           const responseData = response.data;
           const responseMessage = response.message;
           if (this.pagination) {
-            this.data.list = responseData.records;
-            this.data.total = responseData.total;
+            this.data.list = (responseData == null ? void 0 : responseData.records) || responseData;
+            this.data.total = (responseData == null ? void 0 : responseData.total) || responseData.length;
           } else {
             this.data = responseData;
           }
@@ -194,8 +194,8 @@ class DataSourceManager {
       } else {
         const responseData = response;
         if (this.pagination) {
-          this.data.list = responseData == null ? void 0 : responseData.records;
-          this.data.total = responseData == null ? void 0 : responseData.total;
+          this.data.list = (responseData == null ? void 0 : responseData.records) || responseData;
+          this.data.total = (responseData == null ? void 0 : responseData.total) || responseData.length;
         } else {
           this.data = responseData;
         }