@fecp/designer 5.5.121 → 5.6.1

package/lib/packages/vue/src/components/bus/contract/Contract.vue.js

@@ -31,10 +31,12 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     const ctx = getInstance.getCurrentVueInstance();
     Vue.ref("");
     const formData = Vue.inject("formData");
+    const getFormData = Vue.inject("getFormData");
     Vue.inject("rowHeight");
     Vue.inject("gridLayout");
     Vue.inject("gridLayoutFieldsData");
     const setFormItemHeight = Vue.inject("setFormItemHeight");
+    const handleEvent = Vue.inject("handleEvent");
     const fieldsData = props.localConfig.fieldsData.map((item) => {
       return item.component;
     });
@@ -76,6 +78,14 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         visibleData
       });
     }
+    function savaFuncCallback() {
+      var _a;
+      handleEvent.value(
+        getFormData(),
+        config,
+        (_a = config.callbackEventConfig) == null ? void 0 : _a.find((item) => item.name == "Click")
+      );
+    }
     return (_ctx, _cache) => {
       return Vue.openBlock(), Vue.createElementBlock("div", _hoisted_1, [
         (Vue.openBlock(), Vue.createBlock(Vue.resolveDynamicComponent(Vue.unref(currentComponent)), {
@@ -86,7 +96,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
           modeNo: __props.config.busSubject,
           genType: __props.config.genType,
           parmList: Vue.unref(parsedParams),
-          onLoaded: loaded
+          onLoaded: loaded,
+          savaData: savaFuncCallback
         }, null, 40, ["id", "mode", "busNo", "contNo", "modeNo", "genType", "parmList"]))
       ]);
     };

package/lib/packages/vue/src/components/forms/form/Form.vue.js

@@ -49,6 +49,7 @@ const RightAnchorNav = require("./RightAnchorNav.vue.js");
 const parseFilterConfig = require("../../../utils/parseFilterConfig.js");
 const moment = require("../../../../../../node_modules/moment/dist/moment.js");
 const eventBus = require("../../../utils/eventBus.js");
+const vuex_esmBundler = require("../../../../../../node_modules/vuex/dist/vuex.esm-bundler.js");
 ;/* empty css           */
 const index = require("../../../../../../node_modules/element-plus/es/hooks/use-locale/index.js");
 const index$1 = require("../../../../../../node_modules/element-plus/es/components/message/index.js");
@@ -114,6 +115,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     "layoutUpdated"
   ],
   setup(__props, { expose: __expose, emit: __emit }) {
+    const store = vuex_esmBundler.useStore();
+    window.$user = store.getters.user;
     const props = __props;
     index.useLocale();
     const emit = __emit;
@@ -322,7 +325,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         try {
           const keyName = Array.from(dictionaryKeys).join(",");
           const response = await ctx.$http.postForm(
-            "/base-server/parm/sysParmDic/getDicListByKey",
+            "/" + window.$servers.base + "/parm/sysParmDic/getDicListByKey",
             {
               keyName
             }
@@ -1289,5 +1292,5 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Form = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-48f97717"]]);
+const _Form = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-3ee0473d"]]);
 exports.default = _Form;

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

@@ -70,7 +70,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     customTableConfig.dataSources.push({
       id: "roleSelectDataSourceId",
       name: "角色选择数据源",
-      serverName: "base-server",
+      serverName: window.$servers.base,
       url: "/sysRole/findByPageV5",
       method: "post",
       contentType: "json",
@@ -126,5 +126,5 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _RoleSelect = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-3f845d75"]]);
+const _RoleSelect = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-aacdc4d9"]]);
 exports.default = _RoleSelect;

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

@@ -155,19 +155,16 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
           }, Vue.createSlots({
             default: Vue.withCtx(() => [
               __props.formMode != "query" ? (Vue.openBlock(true), Vue.createElementBlock(Vue.Fragment, { key: 0 }, Vue.renderList(Vue.unref(rightButtons), (btn) => {
-                return Vue.openBlock(), Vue.createElementBlock(Vue.Fragment, null, [
-                  btn.btnType == "custom" ? (Vue.openBlock(), Vue.createBlock(_component_el_button, {
-                    key: btn.id,
-                    link: "",
-                    type: "primary",
-                    onClick: ($event) => handleClick(btn, $event)
-                  }, {
-                    default: Vue.withCtx(() => [
-                      Vue.createTextVNode(Vue.toDisplayString(btn.label), 1)
-                    ]),
-                    _: 2
-                  }, 1032, ["onClick"])) : Vue.createCommentVNode("", true)
-                ], 64);
+                return Vue.openBlock(), Vue.createBlock(_component_el_button, {
+                  link: "",
+                  type: "primary",
+                  onClick: ($event) => handleClick(btn, $event)
+                }, {
+                  default: Vue.withCtx(() => [
+                    Vue.createTextVNode(Vue.toDisplayString(btn.label), 1)
+                  ]),
+                  _: 2
+                }, 1032, ["onClick"]);
               }), 256)) : Vue.createCommentVNode("", true)
             ]),
             _: 2
@@ -176,19 +173,16 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
               name: "left",
               fn: Vue.withCtx(() => [
                 __props.formMode != "query" ? (Vue.openBlock(true), Vue.createElementBlock(Vue.Fragment, { key: 0 }, Vue.renderList(Vue.unref(leftButtons), (btn) => {
-                  return Vue.openBlock(), Vue.createElementBlock(Vue.Fragment, null, [
-                    btn.btnType == "custom" ? (Vue.openBlock(), Vue.createBlock(_component_el_button, {
-                      key: btn.id,
-                      link: "",
-                      type: "primary",
-                      onClick: ($event) => handleClick(btn, $event)
-                    }, {
-                      default: Vue.withCtx(() => [
-                        Vue.createTextVNode(Vue.toDisplayString(btn.label), 1)
-                      ]),
-                      _: 2
-                    }, 1032, ["onClick"])) : Vue.createCommentVNode("", true)
-                  ], 64);
+                  return Vue.openBlock(), Vue.createBlock(_component_el_button, {
+                    link: "",
+                    type: "primary",
+                    onClick: ($event) => handleClick(btn, $event)
+                  }, {
+                    default: Vue.withCtx(() => [
+                      Vue.createTextVNode(Vue.toDisplayString(btn.label), 1)
+                    ]),
+                    _: 2
+                  }, 1032, ["onClick"]);
                 }), 256)) : Vue.createCommentVNode("", true)
               ]),
               key: "0"

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

@@ -70,7 +70,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     customTableConfig.dataSources.push({
       id: "userSelectDataSourceId",
       name: "用户选择数据源",
-      serverName: "base-server",
+      serverName: window.$servers.base,
       url: "/user/sysUser/findByPageV5",
       method: "post",
       contentType: "json",
@@ -126,5 +126,5 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _UserSelect = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-0cc70898"]]);
+const _UserSelect = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-06dfa7f6"]]);
 exports.default = _UserSelect;

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

@@ -44,6 +44,7 @@ const _pluginVue_exportHelper = require("../../../../../_virtual/_plugin-vue_exp
 const getJsonAsyncUtil = require("../../utils/getJsonAsyncUtil.js");
 const eventBus = require("../../utils/eventBus.js");
 const decimal = require("../../../../../node_modules/decimal.js/decimal.js");
+const vuex_esmBundler = require("../../../../../node_modules/vuex/dist/vuex.esm-bundler.js");
 ;/* empty css            */
 const index = require("../../../../../node_modules/element-plus/es/components/container/index.js");
 const index$1 = require("../../../../../node_modules/element-plus/es/components/message/index.js");
@@ -141,6 +142,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     "height-loaded"
   ],
   setup(__props, { expose: __expose, emit: __emit }) {
+    const store = vuex_esmBundler.useStore();
+    window.$user = store.getters.user;
     const props = __props;
     const emit = __emit;
     const fecTableContainerRef = Vue.ref(null);
@@ -437,7 +440,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         try {
           const keyName = Array.from(dictionaryKeys).join(",");
           const response = await ctx.$http.postForm(
-            "/base-server/parm/sysParmDic/getDicListByKey",
+            "/" + window.$servers.base + "/parm/sysParmDic/getDicListByKey",
             {
               keyName
             }
@@ -1111,5 +1114,5 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Table = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-199fae66"]]);
+const _Table = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-7f4898b0"]]);
 exports.default = _Table;

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

@@ -40,7 +40,7 @@ const _hoisted_2 = {
   key: 0,
   class: "prefix-content"
 };
-const _hoisted_3 = ["title"];
+const _hoisted_3 = { key: 2 };
 const _hoisted_4 = {
   key: 3,
   class: "suffix-content"
@@ -157,11 +157,12 @@ const _sfc_main = {
       });
     };
     function hasPerm(permission) {
+      var _a;
       if (permission === true || permission === void 0 || permission === "") {
         return true;
       }
       let btnFlag = false;
-      const myBtns = window.$store.getters.funcAuthList;
+      const myBtns = ((_a = window.$store) == null ? void 0 : _a.getters.funcAuthList) || [];
       for (let i in myBtns) {
         if (myBtns[i] == permission) {
           btnFlag = true;
@@ -274,7 +275,7 @@ const _sfc_main = {
             resizable: false,
             "show-header-overflow": "",
             "show-footer-overflow": "",
-            "show-overflow": false,
+            "show-overflow": field.isOverflowWrap ? false : "tooltip",
             "header-class-name": field.sortRule == "server" ? "serverSort" : ""
           }, {
             default: Vue.withCtx(({ row }) => [
@@ -295,10 +296,7 @@ const _sfc_main = {
                     Vue.createTextVNode(Vue.toDisplayString(__props.formatCellValue(row, field)), 1)
                   ]),
                   _: 2
-                }, 1032, ["title", "onClick"])) : (Vue.openBlock(), Vue.createElementBlock("span", {
-                  key: 2,
-                  title: __props.formatCellValue(row, field)
-                }, Vue.toDisplayString(__props.formatCellValue(row, field)), 9, _hoisted_3)),
+                }, 1032, ["title", "onClick"])) : (Vue.openBlock(), Vue.createElementBlock("span", _hoisted_3, Vue.toDisplayString(__props.formatCellValue(row, field)), 1)),
                 field.suffix ? (Vue.openBlock(), Vue.createElementBlock("span", _hoisted_4, Vue.toDisplayString(field.suffix), 1)) : Vue.createCommentVNode("", true),
                 field.canCopy ? (Vue.openBlock(), Vue.createBlock(_component_el_icon, {
                   key: 4,
@@ -313,7 +311,7 @@ const _sfc_main = {
               ], true)
             ]),
             _: 2
-          }, 1032, ["field", "title", "width", "min-width", "fixed", "align", "header-align", "sortable", "header-class-name"]);
+          }, 1032, ["field", "title", "width", "min-width", "fixed", "align", "header-align", "sortable", "show-overflow", "header-class-name"]);
         }), 128)),
         !__props.readonly && shouldShowOptColumn.value ? (Vue.openBlock(), Vue.createBlock(Vue.unref(vxeTable.VxeColumn), {
           key: 3,
@@ -345,5 +343,5 @@ const _sfc_main = {
     };
   }
 };
-const TableColumn = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-7b218935"]]);
+const TableColumn = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-fac941fe"]]);
 exports.default = TableColumn;

package/lib/packages/vue/src/directive/auth.js

@@ -9,11 +9,12 @@ const auth = {
     }
   },
   hasPerm(permission) {
+    var _a;
     if (permission === true || permission === void 0 || permission === "") {
       return true;
     }
     let btnFlag = false;
-    const myBtns = window.$store.getters.funcAuthList;
+    const myBtns = ((_a = window.$store) == null ? void 0 : _a.getters.funcAuthList) || [];
     for (let i in myBtns) {
       if (myBtns[i] === permission) {
         btnFlag = true;

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const common = require("./common.js");
 function parseSingleParamValue(value, data, fields) {
+  var _a;
   if (typeof value !== "object" || value === null) {
     return value;
   }
@@ -16,8 +17,7 @@ function parseSingleParamValue(value, data, fields) {
     }
     return null;
   } else if (type === "userInfo") {
-    console.warn("[parseRouteParams] userInfo 类型暂未实现");
-    return {};
+    return ((_a = window.$user) == null ? void 0 : _a[value.value]) || null;
   } else if (type === "urlParam") {
     const urlParams = new URLSearchParams(window.location.search);
     return urlParams.get(value.value) || null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fecp/designer",
-  "version": "5.5.121",
+  "version": "5.6.1",
   "main": "lib/designer/index.js",
   "module": "es/designer/index.mjs",
   "files": [