@fecp/designer 5.4.76 → 5.4.78

package/lib/packages/mobile/src/components/navigation/navBar/NavBar.vue.js

@@ -8,11 +8,32 @@ const vue = require("vue");
 const index = require("../../../../../../node_modules/vant/es/nav-bar/index.js");
 const _sfc_main = {
   __name: "NavBar",
+  props: {
+    isLeftBack: {
+      type: Boolean,
+      default: false
+    },
+    leftBackText: {
+      type: String,
+      default: ""
+    },
+    isRightButton: {
+      type: Boolean,
+      default: false
+    },
+    rightButtonText: {
+      type: String,
+      default: ""
+    }
+  },
   setup(__props) {
     const onClickLeft = () => history.back();
     return (_ctx, _cache) => {
       const _component_van_nav_bar = index.NavBar;
       return vue.openBlock(), vue.createBlock(_component_van_nav_bar, vue.mergeProps(_ctx.$attrs, {
+        "left-arrow": __props.isLeftBack,
+        "left-text": __props.isLeftBack ? __props.leftBackText : "",
+        "right-text": __props.isRightButton ? __props.rightButtonText : "",
         fixed: false,
         "safe-area-inset-top": "",
         clickable: "",
@@ -26,7 +47,7 @@ const _sfc_main = {
             ])
           };
         })
-      ]), 1040);
+      ]), 1040, ["left-arrow", "left-text", "right-text"]);
     };
   }
 };

package/lib/packages/mobile/src/components/navigation/tabbar/Tabbar.vue.js

@@ -2,8 +2,12 @@
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
 ;/* empty css                                                     */
 ;/* empty css                                                       */
+;/* empty css                                                      */
+;/* empty css                                                     */
+;/* empty css                                                            */
 const vue = require("vue");
 const index = require("../../../../../../node_modules/vant/es/tabbar/index.js");
+const index$1 = require("../../../../../../node_modules/vant/es/tabbar-item/index.js");
 const _sfc_main = {
   __name: "Tabbar",
   props: {
@@ -14,12 +18,25 @@ const _sfc_main = {
   },
   setup(__props) {
     return (_ctx, _cache) => {
+      const _component_van_tabbar_item = index$1.TabbarItem;
       const _component_van_tabbar = index.Tabbar;
       return vue.openBlock(), vue.createBlock(_component_van_tabbar, vue.mergeProps(_ctx.$attrs, {
         route: "",
         fixed: false
       }), {
         default: vue.withCtx(() => [
+          (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(__props.tabbarOptions, (item) => {
+            return vue.openBlock(), vue.createBlock(_component_van_tabbar_item, {
+              icon: item.icon,
+              replace: "",
+              to: item.to
+            }, {
+              default: vue.withCtx(() => [
+                vue.createTextVNode(vue.toDisplayString(item.title), 1)
+              ]),
+              _: 2
+            }, 1032, ["icon", "to"]);
+          }), 256)),
           vue.renderSlot(_ctx.$slots, "default")
         ]),
         _: 3

package/lib/packages/vue/index.js

@@ -8,6 +8,7 @@ const components = require("../../node_modules/vxe-pc-ui/es/components.js");
 ;/* empty css                                         */
 ;/* empty css                      */
 const layout = require("./src/directive/layout.js");
+const auth = require("./src/directive/auth.js");
 const fecVue = {
   install: (app) => {
     for (let c in all) {
@@ -23,6 +24,7 @@ const fecVue = {
     });
     app.use(components);
     app.use(layout.default);
+    app.use(auth.default);
   }
 };
 exports.default = fecVue;

package/lib/packages/vue/src/components/details/footer/Footer.vue.js

@@ -34,6 +34,7 @@ const _sfc_main = {
       var _a;
       const _component_el_button = index$1.ElButton;
       const _component_el_footer = index.ElFooter;
+      const _directive_fec_auth = vue.resolveDirective("fec-auth");
       return __props.pageFooterConfig.enabled && ((_a = __props.pageFooterConfig.actions) == null ? void 0 : _a.length) ? (vue.openBlock(), vue.createBlock(_component_el_footer, {
         key: 0,
         class: "form-details-footer"
@@ -43,7 +44,7 @@ const _sfc_main = {
             return vue.openBlock(), vue.createElementBlock(vue.Fragment, {
               key: button.id
             }, [
-              button.btnType == "default" || button.btnType == "primary" && __props.formMode == "edit" ? (vue.openBlock(), vue.createBlock(_component_el_button, {
+              button.btnType == "default" || button.btnType == "primary" && __props.formMode == "edit" ? vue.withDirectives((vue.openBlock(), vue.createBlock(_component_el_button, {
                 key: 0,
                 type: button.btnType,
                 onClick: ($event) => handleButtonClick(button)
@@ -52,7 +53,9 @@ const _sfc_main = {
                   vue.createTextVNode(vue.toDisplayString(button.label), 1)
                 ]),
                 _: 2
-              }, 1032, ["type", "onClick"])) : vue.createCommentVNode("", true)
+              }, 1032, ["type", "onClick"])), [
+                [_directive_fec_auth, button.permission]
+              ]) : vue.createCommentVNode("", true)
             ], 64);
           }), 128))
         ]),
@@ -61,5 +64,5 @@ const _sfc_main = {
     };
   }
 };
-const component = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-97060b52"]]);
+const component = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-97973006"]]);
 exports.default = component;

package/lib/packages/vue/src/components/details/header/Header.vue.js

@@ -74,6 +74,7 @@ const _sfc_main = {
       var _a, _b, _c, _d, _e;
       const _component_el_button = index$2.ElButton;
       const _component_el_page_header = index.ElPageHeader;
+      const _directive_fec_auth = vue.resolveDirective("fec-auth");
       return ((_a = __props.pageHeaderConfig) == null ? void 0 : _a.enabled) && (vue.unref(canBack) || ((_c = (_b = __props.pageHeaderConfig) == null ? void 0 : _b.actions) == null ? void 0 : _c.length) > 0) ? (vue.openBlock(), vue.createBlock(_component_el_page_header, {
         key: 0,
         icon: vue.unref(canBack) ? vue.unref(index$1.ArrowLeftBold) : null,
@@ -95,7 +96,7 @@ const _sfc_main = {
             var _a2;
             return [
               (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList((_a2 = __props.pageHeaderConfig) == null ? void 0 : _a2.actions, (action) => {
-                return vue.openBlock(), vue.createBlock(_component_el_button, {
+                return vue.withDirectives((vue.openBlock(), vue.createBlock(_component_el_button, {
                   key: action.id,
                   type: getButtonType(action.btnStyle),
                   onClick: ($event) => handleActionClick(action)
@@ -104,7 +105,9 @@ const _sfc_main = {
                     vue.createTextVNode(vue.toDisplayString(action.label), 1)
                   ]),
                   _: 2
-                }, 1032, ["type", "onClick"]);
+                }, 1032, ["type", "onClick"])), [
+                  [_directive_fec_auth, action.permission]
+                ]);
               }), 128))
             ];
           }),
@@ -114,5 +117,5 @@ const _sfc_main = {
     };
   }
 };
-const component = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-29cfb366"]]);
+const component = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-a55fc4ab"]]);
 exports.default = component;

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

@@ -863,6 +863,12 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       const updatedLayoutData = common.cloneDeep(oriGridLayoutData.value || []);
       relevantConfigs.visibility.forEach((item) => {
         const dataLinkFieldList = item.dataLinkFieldList || [];
+        dataLinkFieldList.forEach((fieldId) => {
+          const layoutFieldItem = updatedLayoutData.find((g) => g.id == fieldId);
+          if (layoutFieldItem) {
+            layoutFieldItem.hidden = true;
+          }
+        });
         if (parseFilterConfig.checkFilterMatch(item.filterConfig, formData.value, fields)) {
           dataLinkFieldList.forEach((fieldId) => {
             const layoutFieldItem = updatedLayoutData.find((g) => g.id == fieldId);
@@ -870,17 +876,16 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
               layoutFieldItem.hidden = false;
             }
           });
-        } else {
-          dataLinkFieldList.forEach((fieldId) => {
-            const layoutFieldItem = updatedLayoutData.find((g) => g.id == fieldId);
-            if (layoutFieldItem) {
-              layoutFieldItem.hidden = true;
-            }
-          });
         }
       });
       relevantConfigs.required.forEach((item) => {
         const dataLinkFieldList = item.dataLinkFieldList || [];
+        dataLinkFieldList.forEach((fieldId) => {
+          const layoutFieldItem = updatedLayoutData.find((g) => g.id == fieldId);
+          if (layoutFieldItem) {
+            layoutFieldItem.component.required = false;
+          }
+        });
         if (parseFilterConfig.checkFilterMatch(item.filterConfig, formData.value, fields)) {
           dataLinkFieldList.forEach((fieldId) => {
             const layoutFieldItem = updatedLayoutData.find((g) => g.id == fieldId);
@@ -888,13 +893,6 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
               layoutFieldItem.component.required = true;
             }
           });
-        } else {
-          dataLinkFieldList.forEach((fieldId) => {
-            const layoutFieldItem = updatedLayoutData.find((g) => g.id == fieldId);
-            if (layoutFieldItem) {
-              layoutFieldItem.component.required = false;
-            }
-          });
         }
       });
       const rules = {};
@@ -912,6 +910,12 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       formRules.value = rules;
       relevantConfigs.readonly.forEach((item) => {
         const dataLinkFieldList = item.dataLinkFieldList || [];
+        dataLinkFieldList.forEach((fieldId) => {
+          const layoutFieldItem = updatedLayoutData.find((g) => g.id == fieldId);
+          if (layoutFieldItem) {
+            layoutFieldItem.component.readOnly = false;
+          }
+        });
         if (parseFilterConfig.checkFilterMatch(item.filterConfig, formData.value, fields)) {
           dataLinkFieldList.forEach((fieldId) => {
             const layoutFieldItem = updatedLayoutData.find((g) => g.id == fieldId);
@@ -919,17 +923,16 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
               layoutFieldItem.component.readOnly = true;
             }
           });
-        } else {
-          dataLinkFieldList.forEach((fieldId) => {
-            const layoutFieldItem = updatedLayoutData.find((g) => g.id == fieldId);
-            if (layoutFieldItem) {
-              layoutFieldItem.component.readOnly = false;
-            }
-          });
         }
       });
       relevantConfigs.disabled.forEach((item) => {
         const dataLinkFieldList = item.dataLinkFieldList || [];
+        dataLinkFieldList.forEach((fieldId) => {
+          const layoutFieldItem = updatedLayoutData.find((g) => g.id == fieldId);
+          if (layoutFieldItem) {
+            layoutFieldItem.component.disabled = false;
+          }
+        });
         if (parseFilterConfig.checkFilterMatch(item.filterConfig, formData.value, fields)) {
           dataLinkFieldList.forEach((fieldId) => {
             const layoutFieldItem = updatedLayoutData.find((g) => g.id == fieldId);
@@ -937,13 +940,6 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
               layoutFieldItem.component.disabled = true;
             }
           });
-        } else {
-          dataLinkFieldList.forEach((fieldId) => {
-            const layoutFieldItem = updatedLayoutData.find((g) => g.id == fieldId);
-            if (layoutFieldItem) {
-              layoutFieldItem.component.disabled = false;
-            }
-          });
         }
       });
       gridLayoutFieldsData.value = updatedLayoutData.filter((item) => !item.hidden);
@@ -1102,5 +1098,5 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Form = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-38bc8c5b"]]);
+const _Form = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-48d4542c"]]);
 exports.default = _Form;

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

@@ -111,6 +111,7 @@ const _sfc_main = {
     return (_ctx, _cache) => {
       const _component_el_icon = index.ElIcon;
       const _component_el_button = index$3.ElButton;
+      const _directive_fec_auth = vue.resolveDirective("fec-auth");
       return vue.openBlock(), vue.createElementBlock("div", _hoisted_1, [
         __props.localConfig.showReturn ? (vue.openBlock(), vue.createElementBlock("div", {
           key: 0,
@@ -132,7 +133,7 @@ const _sfc_main = {
         }, {
           buttons: vue.withCtx(() => [
             leftButtons.value.length ? (vue.openBlock(true), vue.createElementBlock(vue.Fragment, { key: 0 }, vue.renderList(leftButtons.value, (btn) => {
-              return vue.openBlock(), vue.createBlock(_component_el_button, {
+              return vue.withDirectives((vue.openBlock(), vue.createBlock(_component_el_button, {
                 key: btn.id,
                 type: getBtnType(btn),
                 icon: getBtnIcon(btn.btnType),
@@ -142,12 +143,14 @@ const _sfc_main = {
                   vue.createTextVNode(vue.toDisplayString(btn.label), 1)
                 ]),
                 _: 2
-              }, 1032, ["type", "icon", "onClick"]);
+              }, 1032, ["type", "icon", "onClick"])), [
+                [_directive_fec_auth, btn.permission]
+              ]);
             }), 128)) : vue.createCommentVNode("", true)
           ]),
           tools: vue.withCtx(() => [
             rightButtons.value.length ? (vue.openBlock(true), vue.createElementBlock(vue.Fragment, { key: 0 }, vue.renderList(rightButtons.value, (btn) => {
-              return vue.openBlock(), vue.createBlock(_component_el_button, {
+              return vue.withDirectives((vue.openBlock(), vue.createBlock(_component_el_button, {
                 key: btn.id,
                 type: getBtnType(btn),
                 icon: getBtnIcon(btn.btnType),
@@ -157,7 +160,9 @@ const _sfc_main = {
                   vue.createTextVNode(vue.toDisplayString(btn.label), 1)
                 ]),
                 _: 2
-              }, 1032, ["type", "icon", "onClick"]);
+              }, 1032, ["type", "icon", "onClick"])), [
+                [_directive_fec_auth, btn.permission]
+              ]);
             }), 128)) : vue.createCommentVNode("", true)
           ]),
           _: 1
@@ -166,5 +171,5 @@ const _sfc_main = {
     };
   }
 };
-const CustomButtons = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-e370363e"]]);
+const CustomButtons = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-7610c2d4"]]);
 exports.default = CustomButtons;

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

@@ -267,6 +267,7 @@ const _sfc_main = {
       const _component_el_form_item = index$7.ElFormItem;
       const _component_el_form = index$7.ElForm;
       const _component_el_collapse_transition = index$6.ElCollapseTransition;
+      const _directive_fec_auth = vue.resolveDirective("fec-auth");
       return vue.openBlock(), vue.createElementBlock("div", _hoisted_1, [
         vue.createElementVNode("div", _hoisted_2, [
           __props.localConfig.showReturn ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_3, [
@@ -329,7 +330,7 @@ const _sfc_main = {
             }, {
               tools: vue.withCtx(() => [
                 !__props.isSubTable && rightButtons.value.length ? (vue.openBlock(true), vue.createElementBlock(vue.Fragment, { key: 0 }, vue.renderList(rightButtons.value, (btn) => {
-                  return vue.openBlock(), vue.createBlock(_component_el_button, {
+                  return vue.withDirectives((vue.openBlock(), vue.createBlock(_component_el_button, {
                     key: btn.id,
                     type: getBtnType(btn),
                     icon: getBtnIcon(btn.btnType),
@@ -339,7 +340,9 @@ const _sfc_main = {
                       vue.createTextVNode(vue.toDisplayString(btn.label), 1)
                     ]),
                     _: 2
-                  }, 1032, ["type", "icon", "onClick"]);
+                  }, 1032, ["type", "icon", "onClick"])), [
+                    [_directive_fec_auth, btn.permission]
+                  ]);
                 }), 128)) : vue.createCommentVNode("", true)
               ]),
               _: 1
@@ -452,5 +455,5 @@ const _sfc_main = {
     };
   }
 };
-const DynamicQuery = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-e93f2602"]]);
+const DynamicQuery = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-d11a831a"]]);
 exports.default = DynamicQuery;

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

@@ -264,8 +264,24 @@ const _sfc_main = {
         if (!item.showCondition) return true;
         return parseFilterConfig.checkFilterMatch(item.showCondition, row, props.fieldsData);
       });
-      return btnList;
+      return btnList.filter((item) => {
+        return hasPerm(item.permission);
+      });
     };
+    function hasPerm(permission) {
+      if (permission === true || permission === void 0 || permission === "") {
+        return true;
+      }
+      let btnFlag = false;
+      const myBtns = window.$store.getters.funcAuthList;
+      for (let i in myBtns) {
+        if (myBtns[i] == permission) {
+          btnFlag = true;
+          break;
+        }
+      }
+      return btnFlag;
+    }
     const shouldShowOptColumn = vue.computed(() => {
       if (!props.isOptBtns || !props.optBtns.length) return false;
       if (!props.tableData || props.tableData.length === 0) return true;
@@ -276,15 +292,35 @@ const _sfc_main = {
       return parseFilterConfig.checkFilterMatch(item.disableCondition, row, props.fieldsData);
     };
     const optColumnWidth = vue.computed(() => {
-      const padding = 20;
-      const btnWidth = 60;
+      const padding = 12;
+      const labelWidth = 14;
+      const labelMargin = 18;
       if (!props.tableData || props.tableData.length === 0) {
-        return props.optBtns.length * btnWidth + padding;
+        let labelLength = 0;
+        props.optBtns.forEach((btn) => {
+          labelLength += btn.label.length;
+        });
+        if (labelLength > 0) {
+          return labelLength * labelWidth + (props.optBtns.length - 1) * labelMargin + padding * 2 + 6;
+        }
+        return 0;
       }
+      let maxBtnLength = 0;
       const maxVisibleBtns = Math.max(
-        ...props.tableData.map((row) => getVisibleOptBtns(row).length)
+        ...props.tableData.map((row) => {
+          const btnList = getVisibleOptBtns(row);
+          if (btnList.length > maxBtnLength) {
+            maxBtnLength = btnList.length;
+          }
+          let labelLength = 0;
+          btnList.forEach((btn) => {
+            labelLength += btn.label.length;
+          });
+          return labelLength;
+        })
       );
-      return Math.max(maxVisibleBtns, 1) * btnWidth + padding;
+      const maxLength = Math.max(maxVisibleBtns, 1);
+      return maxLength * labelWidth + (maxBtnLength - 1) * labelMargin + padding * 2 + 6;
     });
     const { handleEvent } = eventFlowHandler.useEventFlow({
       fields: props.fieldsData,
@@ -411,5 +447,5 @@ const _sfc_main = {
     };
   }
 };
-const TableColumn = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-3e5372d4"]]);
+const TableColumn = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-77be03fc"]]);
 exports.default = TableColumn;

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

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
+const auth = {
+  mounted(el, binding, vnode, prevVnode) {
+    const permission = binding.value;
+    const btnFlag = auth.hasPerm(permission);
+    if (!btnFlag) {
+      el.parentNode.removeChild(el);
+    }
+  },
+  hasPerm(permission) {
+    if (permission === true || permission === void 0 || permission === "") {
+      return true;
+    }
+    let btnFlag = false;
+    const myBtns = window.$store.getters.funcAuthList;
+    for (let i in myBtns) {
+      if (myBtns[i] === permission) {
+        btnFlag = true;
+        break;
+      }
+    }
+    return btnFlag;
+  }
+};
+auth.install = function(Vue) {
+  Vue.directive("fec-auth", auth);
+};
+exports.default = auth;

package/package.json

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