@bit-sun/business-component 2.4.31-alpha.4 → 2.4.31-alpha.5

package/dist/index.esm.js

@@ -1515,6 +1515,11 @@ var handleJudgeAuthButtons = function handleJudgeAuthButtons(buttonCodeArray) {
   });
   return result;
 };
+// 判断何时菜单权限和表格权限生效
+var shouldUseAuth = function shouldUseAuth() {
+  // @ts-ignore
+  return window.__POWERED_BY_WUJIE__ ? true : false;
+};
 
 var css_248z$1 = ".luckysheet {\n  overflow: hidden;\n}\n.luckysheet .luckysheet-work-area.luckysheet-noselected-text {\n  display: none;\n}\n.sheet_table_top {\n  height: 50px;\n  background: #f2f2f2;\n  width: 100%;\n  display: flex;\n  justify-content: space-between;\n  align-items: center;\n  padding: 0 20px;\n  border: 1px solid #d8d8d8;\n}\n.sheet_table_top .menu_item_text {\n  display: flex;\n  justify-content: center;\n  align-items: center;\n}\n.sheet_table_footer {\n  height: 50px;\n  background: #f2f2f2;\n  width: 100%;\n  display: flex;\n  justify-content: space-between;\n  align-items: center;\n  padding: 0 20px;\n  border: 1px solid #d8d8d8;\n}\n.sheet_table_text {\n  color: #8f8f8f;\n}\n.sheet_table_dnd_text {\n  background: #f2f2f2;\n  border: 1px solid #d8d8d8;\n  display: inline-block;\n  width: 100px;\n  height: 30px;\n  display: flex;\n  align-items: center;\n  justify-content: center;\n}\n";
 styleInject(css_248z$1);
@@ -12479,7 +12484,7 @@ var DetailWrapper = /*#__PURE__*/React$1.memo(function (_ref) {
   var renderPageActionList = function renderPageActionList(actionLists) {
     var authButton = localStorage.getItem(getMenuAuthDataKey()) ? JSON.parse(localStorage.getItem(getMenuAuthDataKey())) : [];
     var visibleActions = actionLists.filter(function (action) {
-      return (action.visible && action.visible !== 'false' || judgeIsEmpty$1(action.visible)) && (judgeIsEmpty$1(action.code) || authButton.filter(function (item) {
+      return (action.visible && action.visible !== 'false' || judgeIsEmpty$1(action.visible)) && (!shouldUseAuth() || judgeIsEmpty$1(action.code) || authButton.filter(function (item) {
         return item === action.code;
       }));
     });
@@ -14121,7 +14126,7 @@ var BsSulaQueryTable = (function (props) {
         if (Number(item.slice(-1)) >= 1) {
           Item = item.substr(0, item.length - 1);
         }
-        if (!authButton.filter(function (itemInner) {
+        if (shouldUseAuth() && !authButton.filter(function (itemInner) {
           return Item === itemInner;
         }).length) {
           resourceCodeArray[item].visible = false;
@@ -14557,7 +14562,7 @@ var setMenuTreeData = function setMenuTreeData(routesData) {
         routesData.splice(i, 1);
         return 0; // continue
       }
-      if (routesData[i].code && authButton.every(function (item) {
+      if (shouldUseAuth() && routesData[i].code && authButton.every(function (item) {
         return routesData[i].code != item;
       })) {
         routesData.splice(i, 1);
@@ -15200,9 +15205,7 @@ var GlobalHeaderCom = function GlobalHeaderCom(props) {
             deep(item.routes);
           } else if (!item.hideInMenu && (name ? formatMessage({
             id: "menu.".concat(item.name)
-          }).indexOf(name) !== -1 : true) && btnAuth.find(function (d) {
-            return d === item.code;
-          })) {
+          }).indexOf(name) !== -1 : true)) {
             resultList.push(_objectSpread2(_objectSpread2({}, item), {}, {
               fullPathName: getFullPathName(item.name)
             }));
@@ -32786,4 +32789,4 @@ var index$8 = /*#__PURE__*/forwardRef(function (props, ref) {
   })));
 });
 
-export { AddSelect, AddSkcSelect, AddSkuSelect, AddSpuSelect, BillEntry, BsCascader, index$6 as BsLayout, BsSulaQueryTable, BusinessSearchSelect$1 as BusinessSearchSelect, BusinessTreeSearchSelect$1 as BusinessTreeSearchSelect, index$2 as CheckOneUser, ColumnSettingTable, CommodityEntry, DataImport, DataValidation, index$4 as DetailPageWrapper, EllipsisTooltip, ExportIcon, GuideWrapper, index$5 as HomePageWrapper, JsonQueryTable, index$7 as MoreTreeTable, QueryMutipleInput, RuleObjectComponent as RuleComponent, index$8 as RuleSetter, SearchSelect, index$3 as StateFlow, ColumnSettingSulaTable as SulaColumnSettingTable, TableColumnSetting, TreeSearchSelect, authFunc, checkQuantityAccuracy, downloadExcel, formatter, getAccountID, getAccountId, getConfigTableColumns, getCurrentTargetBgId, getCurrentTenantId, getDictionarySource, getEmployeeCode, getEmployeeId, getLastKey, getLimitMenuDataKey, getLocalStorageSaveKey, getMenuAuthDataKey, getSessionId, getTenantList, getUserId, getUserName, go2BackAndClose, handleAntdColumnsSpecialParams, handleBssulaColumnsSpecialParams, handleError, handleJudgeAuthButtons, handleRequestAuthHeader, handleRequestUrl, handleUserPhone, judgeIsEmpty, judgeIsRequestError, judgeIsRequestSuccess, memoizeOneFormatter, precisionQuantity, removeCurrentTenantId, removeTenantList, saveCurrentTenantId, saveTenantList, setConfigTableColumns, uuid };
+export { AddSelect, AddSkcSelect, AddSkuSelect, AddSpuSelect, BillEntry, BsCascader, index$6 as BsLayout, BsSulaQueryTable, BusinessSearchSelect$1 as BusinessSearchSelect, BusinessTreeSearchSelect$1 as BusinessTreeSearchSelect, index$2 as CheckOneUser, ColumnSettingTable, CommodityEntry, DataImport, DataValidation, index$4 as DetailPageWrapper, EllipsisTooltip, ExportIcon, GuideWrapper, index$5 as HomePageWrapper, JsonQueryTable, index$7 as MoreTreeTable, QueryMutipleInput, RuleObjectComponent as RuleComponent, index$8 as RuleSetter, SearchSelect, index$3 as StateFlow, ColumnSettingSulaTable as SulaColumnSettingTable, TableColumnSetting, TreeSearchSelect, authFunc, checkQuantityAccuracy, downloadExcel, formatter, getAccountID, getAccountId, getConfigTableColumns, getCurrentTargetBgId, getCurrentTenantId, getDictionarySource, getEmployeeCode, getEmployeeId, getLastKey, getLimitMenuDataKey, getLocalStorageSaveKey, getMenuAuthDataKey, getSessionId, getTenantList, getUserId, getUserName, go2BackAndClose, handleAntdColumnsSpecialParams, handleBssulaColumnsSpecialParams, handleError, handleJudgeAuthButtons, handleRequestAuthHeader, handleRequestUrl, handleUserPhone, judgeIsEmpty, judgeIsRequestError, judgeIsRequestSuccess, memoizeOneFormatter, precisionQuantity, removeCurrentTenantId, removeTenantList, saveCurrentTenantId, saveTenantList, setConfigTableColumns, shouldUseAuth, uuid };

package/dist/index.js

@@ -1535,6 +1535,11 @@ var handleJudgeAuthButtons = function handleJudgeAuthButtons(buttonCodeArray) {
   });
   return result;
 };
+// 判断何时菜单权限和表格权限生效
+var shouldUseAuth = function shouldUseAuth() {
+  // @ts-ignore
+  return window.__POWERED_BY_WUJIE__ ? true : false;
+};
 
 var css_248z$1 = ".luckysheet {\n  overflow: hidden;\n}\n.luckysheet .luckysheet-work-area.luckysheet-noselected-text {\n  display: none;\n}\n.sheet_table_top {\n  height: 50px;\n  background: #f2f2f2;\n  width: 100%;\n  display: flex;\n  justify-content: space-between;\n  align-items: center;\n  padding: 0 20px;\n  border: 1px solid #d8d8d8;\n}\n.sheet_table_top .menu_item_text {\n  display: flex;\n  justify-content: center;\n  align-items: center;\n}\n.sheet_table_footer {\n  height: 50px;\n  background: #f2f2f2;\n  width: 100%;\n  display: flex;\n  justify-content: space-between;\n  align-items: center;\n  padding: 0 20px;\n  border: 1px solid #d8d8d8;\n}\n.sheet_table_text {\n  color: #8f8f8f;\n}\n.sheet_table_dnd_text {\n  background: #f2f2f2;\n  border: 1px solid #d8d8d8;\n  display: inline-block;\n  width: 100px;\n  height: 30px;\n  display: flex;\n  align-items: center;\n  justify-content: center;\n}\n";
 styleInject(css_248z$1);
@@ -12499,7 +12504,7 @@ var DetailWrapper = /*#__PURE__*/React__default['default'].memo(function (_ref)
   var renderPageActionList = function renderPageActionList(actionLists) {
     var authButton = localStorage.getItem(getMenuAuthDataKey()) ? JSON.parse(localStorage.getItem(getMenuAuthDataKey())) : [];
     var visibleActions = actionLists.filter(function (action) {
-      return (action.visible && action.visible !== 'false' || judgeIsEmpty$1(action.visible)) && (judgeIsEmpty$1(action.code) || authButton.filter(function (item) {
+      return (action.visible && action.visible !== 'false' || judgeIsEmpty$1(action.visible)) && (!shouldUseAuth() || judgeIsEmpty$1(action.code) || authButton.filter(function (item) {
         return item === action.code;
       }));
     });
@@ -14141,7 +14146,7 @@ var BsSulaQueryTable = (function (props) {
         if (Number(item.slice(-1)) >= 1) {
           Item = item.substr(0, item.length - 1);
         }
-        if (!authButton.filter(function (itemInner) {
+        if (shouldUseAuth() && !authButton.filter(function (itemInner) {
           return Item === itemInner;
         }).length) {
           resourceCodeArray[item].visible = false;
@@ -14577,7 +14582,7 @@ var setMenuTreeData = function setMenuTreeData(routesData) {
         routesData.splice(i, 1);
         return 0; // continue
       }
-      if (routesData[i].code && authButton.every(function (item) {
+      if (shouldUseAuth() && routesData[i].code && authButton.every(function (item) {
         return routesData[i].code != item;
       })) {
         routesData.splice(i, 1);
@@ -15220,9 +15225,7 @@ var GlobalHeaderCom = function GlobalHeaderCom(props) {
             deep(item.routes);
           } else if (!item.hideInMenu && (name ? umi.formatMessage({
             id: "menu.".concat(item.name)
-          }).indexOf(name) !== -1 : true) && btnAuth.find(function (d) {
-            return d === item.code;
-          })) {
+          }).indexOf(name) !== -1 : true)) {
             resultList.push(_objectSpread2(_objectSpread2({}, item), {}, {
               fullPathName: getFullPathName(item.name)
             }));
@@ -32874,4 +32877,5 @@ exports.removeTenantList = removeTenantList;
 exports.saveCurrentTenantId = saveCurrentTenantId;
 exports.saveTenantList = saveTenantList;
 exports.setConfigTableColumns = setConfigTableColumns;
+exports.shouldUseAuth = shouldUseAuth;
 exports.uuid = uuid;

package/dist/utils/auth.d.ts

@@ -1,2 +1,3 @@
 export declare const authFunc: (code: string) => any;
 export declare const handleJudgeAuthButtons: (buttonCodeArray: any[]) => true | boolean[];
+export declare const shouldUseAuth: () => boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bit-sun/business-component",
-  "version": "2.4.31-alpha.4",
+  "version": "2.4.31-alpha.5",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",

package/src/components/Business/BsLayouts/Components/GlobalHeader/index.tsx

@@ -50,7 +50,6 @@ const GlobalHeaderCom = (props: any) => {
             (name
               ? formatMessage({ id: `menu.${item.name}` }).indexOf(name) !== -1
               : true)
-              && btnAuth.find((d: any) => d === item.code)
           ) {
             resultList.push({
               ...item,

package/src/components/Business/BsLayouts/utils.tsx

@@ -3,6 +3,7 @@ import cloneDeep from 'lodash/cloneDeep';
 import memoizeOne from 'memoize-one';
 import { getMenuAuthDataKey } from '@/utils/LocalstorageUtils'
 import { history } from 'umi';
+import { shouldUseAuth } from '@/utils';
 
 const cache = {};
 const cacheLimit = 10000;
@@ -122,6 +123,7 @@ export const setMenuTreeData = (routesData: Array<any>) => {
       continue;
     }
     if (
+      shouldUseAuth() && 
       routesData[i].code &&
       authButton.every((item) => {
         return routesData[i].code != item;

package/src/components/Business/BsSulaQueryTable/index.tsx

@@ -20,6 +20,7 @@ import ExportIcon from '@/components/Functional/ExportFunctions/ExportIcon';
 import ENUM from '@/utils/enumConfig';
 import { handleBssulaColumnsSpecialParams } from '@/utils/utils';
 import { getMenuAuthDataKey } from '@/utils/LocalstorageUtils';
+import { shouldUseAuth } from '@/utils';
 
 const MemoQueryTable = React.memo(QueryTable);
 
@@ -177,7 +178,7 @@ export default (props: any) => {
         if (Number(item.slice(-1)) >= 1) {
           Item = item.substr(0, item.length - 1);
         }
-        if (!authButton.filter((itemInner: any) => Item === itemInner).length) {
+        if (shouldUseAuth() && !authButton.filter((itemInner: any) => Item === itemInner).length) {
           resourceCodeArray[item].visible = false;
         }
       });

package/src/components/Business/DetailPageWrapper/index.tsx

@@ -17,6 +17,7 @@ import moreIcon from '../../../assets/btn-more.svg';
 import { useLocation, formatMessage } from 'umi';
 import CommonAlert from '../CommonAlert';
 import { getMenuAuthDataKey, getLimitMenuDataKey } from '@/utils/LocalstorageUtils';
+import { shouldUseAuth } from '@/utils';
 
 interface actionItem {
   type?: string;
@@ -154,7 +155,7 @@ const DetailWrapper = React.memo(
       let visibleActions = actionLists.filter(
         (action) =>
           ((action.visible && action.visible !== 'false') || judgeIsEmpty(action.visible)) &&
-          (judgeIsEmpty(action.code) || authButton.filter(item => item === action.code)),
+          (!shouldUseAuth() || (judgeIsEmpty(action.code) || authButton.filter(item => item === action.code))),
       );
 
       const renderButton = (item: actionItem, type?: any) => {

package/src/utils/auth.ts

@@ -30,3 +30,9 @@ export const handleJudgeAuthButtons = (buttonCodeArray: any[]) => {
   });
   return result;
 };
+
+// 判断何时菜单权限和表格权限生效
+export const shouldUseAuth = () => {
+  // @ts-ignore
+  return window.__POWERED_BY_WUJIE__ ? true : false;
+};