fan-standard-comp 4.0.2 → 4.0.4

package/lib/StandardTable/style/index.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _genStyleHook = require("../../theme/utils/genStyleHook");
 var _index = require("../../theme/index");
-var _tinycolor = require("@ctrl/tinycolor");
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -23,11 +22,10 @@ var StandardTableStyleFunc = function StandardTableStyleFunc(prefix) {
     var prefixCls = ".".concat(prefix);
     var rowTd = {
       '> td': {
-        borderColor: new _tinycolor.TinyColor(token.colorPrimary).setAlpha(0.5).toRgbString(),
-        // fade(@primary-color, 50%),
-        '&::before': {
-          borderTop: "1px solid ".concat(new _tinycolor.TinyColor(token.colorPrimary).setAlpha(0.5).toRgbString())
-        }
+        // borderColor: new TinyColor(token.colorPrimary).setAlpha(0.5).toRgbString(), // fade(@primary-color, 50%),
+        // '&::before': {
+        //   borderTop: `1px solid ${new TinyColor(token.colorPrimary).setAlpha(0.5).toRgbString()}`,
+        // }
       }
     };
     return [_defineProperty(_defineProperty(_defineProperty({}, prefixCls, {
@@ -46,22 +44,22 @@ var StandardTableStyleFunc = function StandardTableStyleFunc(prefix) {
       // 固定右侧列的样式
       '.ant-table-fixed-left table.ant-table-fixed': {
         '.ant-table-thead > tr > th, .ant-table-tbody > tr > td': {
-          paddingRight: token.paddingMD / 2,
+          paddingRight: token.paddingMD,
           '&:first-child': {
             paddingLeft: token.paddingMD,
-            paddingRight: token.paddingMD / 2
+            paddingRight: token.paddingMD
           }
         }
       },
       // 固定右侧列的样式
       '.ant-table-fixed-right': {
         '.ant-table-thead > tr > th, .ant-table-tbody > tr > td': {
-          paddingRight: token.paddingMD / 2,
+          paddingRight: token.paddingMD,
           '&:first-child': {
-            paddingLeft: token.paddingMD / 2
+            paddingLeft: token.paddingMD
           },
           '&:nth-last-child(1)': {
-            paddingLeft: token.paddingMD / 2,
+            paddingLeft: token.paddingMD,
             paddingRight: token.paddingMD
           }
         }
@@ -89,7 +87,7 @@ var StandardTableStyleFunc = function StandardTableStyleFunc(prefix) {
           fontSize: token.fontSizeLG
         },
         '.ant-table-thead > tr > th': {
-          padding: "12px ".concat(token.paddingMD / 2, "px"),
+          padding: "12px ".concat(token.paddingMD, "px"),
           '&:first-child': {
             paddingLeft: token.paddingMD
           },
@@ -98,7 +96,7 @@ var StandardTableStyleFunc = function StandardTableStyleFunc(prefix) {
           }
         },
         '.ant-table-tbody > tr > td ': {
-          padding: "12px ".concat(token.paddingMD / 2, "px"),
+          padding: "12px ".concat(token.paddingMD, "px"),
           '&:first-child': {
             paddingLeft: token.paddingMD
           },

package/lib/utils/filterPermission.d.ts

@@ -1,5 +1,5 @@
 declare const btnClickFunc: (fn: any, params?: {}) => any;
 declare const btnIsDisabled: (isDisabled: any, params?: {}) => any;
 declare const btnIsHide: (isHide: any, params?: {}) => any;
-declare const removeNoPermission: (array: any, permissionCodes: any, codes: any, params: any) => any[];
+declare const removeNoPermission: (array: any, permissionCodes: any, codesList: any, params: any) => any[];
 export { removeNoPermission, btnIsHide, btnIsDisabled, btnClickFunc };

package/lib/utils/filterPermission.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.removeNoPermission = exports.btnIsHide = exports.btnIsDisabled = exports.btnClickFunc = void 0;
 var _lodash = _interopRequireDefault(require("lodash"));
+var _index = require("../data/index");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -58,7 +59,9 @@ var btnIsHide = exports.btnIsHide = function btnIsHide(isHide) {
   return isHide;
 };
 // 重新组合数据(排除不包含在permissionCodes内及isHide数据
-var removeNoPermission = exports.removeNoPermission = function removeNoPermission(array, permissionCodes, codes, params) {
+var removeNoPermission = exports.removeNoPermission = function removeNoPermission(array, permissionCodes, codesList, params) {
+  // 合并本地的codes
+  var codes = _lodash.default.unionBy(codesList || [], _index.funcCode.btnFuncCodes, 'code');
   return Array.isArray(array) && array.filter(function (item) {
     if (item.children) {
       item.children = removeNoPermission(item.children, permissionCodes, codes, params);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fan-standard-comp",
-  "version": "4.0.2",
+  "version": "4.0.4",
   "description": "FZ standard-comp,basic of antd5.0 and custom component.",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -77,14 +77,13 @@
     "prettier": "^2.7.1",
     "prettier-plugin-organize-imports": "^3.0.0",
     "prettier-plugin-packagejson": "^2.2.18",
-    "react": "^18.0.0",
-    "react-dom": "^18.0.0",
+    "react": "18.2.0",
+    "react-dom": "18.2.0",
     "stylelint": "^14.9.1"
   },
   "dependencies": {
     "@babel/preset-react": "^7.24.1",
     "@types/lodash": "^4.17.0",
-    "ant-design-draggable-modal": "^1.0.0",
     "antd": "5.18.1",
     "antd-style": "^3.6.1",
     "babel": "^6.23.0",