fan-standard-comp 4.0.2 → 4.0.3

package/es/ButtonGroup/index.js

@@ -20,7 +20,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-import React, { useState, useEffect, useContext } from "react";
+import React, { useState, useEffect, useContext, useMemo } from "react";
 import { IconNode } from "../components";
 import SpecIcon from "../SpecIcon";
 import PopConfirmTitle from "./PopConfirmTitle";
@@ -29,8 +29,6 @@ import { DownOutlined, QuestionCircleOutlined } from "@ant-design/icons";
 import { removeNoPermission, btnIsDisabled } from "../utils/filterPermission";
 import useStyle from "./styles";
 import classNames from "classnames";
-import _ from "lodash";
-import { funcCode } from "../data/index";
 import { FanContext } from "../ConfigContext";
 
 // 参数API
@@ -67,19 +65,11 @@ var ButtonGroup = function ButtonGroup(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     popRow = _useState4[0],
     setPopRow = _useState4[1];
-  var _useState5 = useState([]),
-    _useState6 = _slicedToArray(_useState5, 2),
-    resetList = _useState6[0],
-    setResetList = _useState6[1];
-  useEffect(function () {
-    // codes在方法内，再合并默认的权限配置
-    // 合并本地的codes
-    var codesConcat = _.unionBy(codes || [], funcCode.btnFuncCodes, 'code');
-    // 重组选项options集合数据，排除：无权限（有配置code,并且不包含permissionCodes内）的数据及，isHide 为true的数据
-    setResetList(_toConsumableArray(removeNoPermission(options, permissionCodes, codesConcat, rowParams)) || []);
-    return function () {
-      setResetList([]);
-    };
+  // const [resetList, setResetList] = useState<any[]>([])
+  var resetList = useMemo(function () {
+    //   // codes在方法内，再合并默认的权限配置
+    //   // 重组选项options集合数据，排除：无权限（有配置code,并且不包含permissionCodes内）的数据及，isHide 为true的数据
+    return _toConsumableArray(removeNoPermission(options, permissionCodes, codes, rowParams)) || [];
   }, [options, codes, permissionCodes]);
   useEffect(function () {
     setPopVisibleIndex(-1);

package/es/ButtonGroup/styles/index.js

@@ -23,18 +23,18 @@ var SpecButtonGroupTextStyle = function SpecButtonGroupTextStyle(prefixCls, toke
     }
   }, "& + ".concat(prefixCls, "-text"), {
     position: 'relative',
-    marginLeft: token.paddingSM,
-    '&:before': {
-      position: 'absolute',
-      content: '""',
-      top: '50%',
-      left: " calc(-".concat(token.paddingSM, "px / 2)"),
-      transform: 'translate(0, -50%)',
-      display: 'inline-block',
-      height: '.9em',
-      verticalAlign: 'middle',
-      borderLeft: "1px solid ".concat(token.colorBorder)
-    }
+    marginLeft: token.paddingSM
+    // '&:before': {
+    //   position: 'absolute',
+    //   content: '""',
+    //   top: '50%',
+    //   left:` calc(-${token.paddingSM}px / 2)`,
+    //   transform: 'translate(0, -50%)',
+    //   display: 'inline-block',
+    //   height: '.9em',
+    //   verticalAlign: 'middle',
+    //   borderLeft: `1px solid ${token.colorBorder}`
+    // }
   }));
 };
 var SpecButtonGroupStyleFunc = function SpecButtonGroupStyleFunc(prefix) {

package/es/StandardModal/index.js

@@ -74,20 +74,17 @@ var StandardModal = function StandardModal(props) {
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     modalForm = _Form$useForm2[0];
-  var _useState = useState(),
+  // const [modalFormRef, setModalFormRef] = useState<any>();  // <---- set the ref when Form Rendered(使用此方法会出现溢出事件）
+  var _useState = useState(0),
     _useState2 = _slicedToArray(_useState, 2),
-    modalFormRef = _useState2[0],
-    setModalFormRef = _useState2[1]; // <---- set the ref when Form Rendered
-  var _useState3 = useState(0),
-    _useState4 = _slicedToArray(_useState3, 2),
-    bodyMaxHeight = _useState4[0],
-    setBodyMaxHeight = _useState4[1];
+    bodyMaxHeight = _useState2[0],
+    setBodyMaxHeight = _useState2[1];
 
   // setTabFormChild
-  var _useState5 = useState(),
-    _useState6 = _slicedToArray(_useState5, 2),
-    formChild = _useState6[0],
-    setFormChild = _useState6[1]; // <---- set the ref when Form Rendered
+  var _useState3 = useState(),
+    _useState4 = _slicedToArray(_useState3, 2),
+    formChild = _useState4[0],
+    setFormChild = _useState4[1]; // <---- set the ref when Form Rendered
 
   // 按钮栏是否有显示（默认显示）
   var hasFooterBar = useMemo(function () {
@@ -163,7 +160,7 @@ var StandardModal = function StandardModal(props) {
   };
   // fill Form when modal open 此处可解决获取  Form.useForm  warning
   useEffect(function () {
-    if (visible && modalFormRef) {
+    if (visible && modalForm) {
       // <---- check ref before use the form instance
       if (initialValues && _typeof(initialValues) === 'object') {
         initialValues && modalForm.setFieldsValue(_objectSpread({}, initialValues));
@@ -173,7 +170,7 @@ var StandardModal = function StandardModal(props) {
     // if (!visible && modalFormRef) {
     //   clearAllFieldsValue() // 清空表单传参数
     // }
-  }, [modalFormRef, visible]);
+  }, [modalForm, visible]);
   useEffect(function () {
     if (visible) {
       initBodyMaxHeight();
@@ -419,8 +416,12 @@ var StandardModal = function StandardModal(props) {
   // 内容渲染
   var renderChildrenNodes = function renderChildrenNodes() {
     return /*#__PURE__*/React.createElement(React.Fragment, null, children, (type === 'form' || type === 'gridForm') && /*#__PURE__*/React.createElement(Form, {
-      layout: formLayout,
-      ref: setModalFormRef,
+      layout: formLayout
+      // ref={(formInstance)=> {
+      //   // console.log('formInstance', formInstance)
+      //   // setModalFormRef(formInstance)
+      // }}
+      ,
       form: modalForm,
       onFinish: handleSubmit,
       hideRequiredMark: fieldStatus === 'viewOnly' || hideRequiredMark

package/es/StandardTable/index.js

@@ -55,7 +55,7 @@ var StandardTable = function StandardTable(props) {
     rest = _objectWithoutProperties(_providerConfig$props, _excluded);
   // 加上类型修复 TS:2322 报警
   var resetColumns = [_objectSpread(_objectSpread({
-    width: 62,
+    width: 76,
     align: 'center',
     title: '序号',
     key: 'orderNum',
@@ -83,7 +83,7 @@ var StandardTable = function StandardTable(props) {
         otherColumn = columnsConfig.otherColumn;
       if (colItem.type === 'action') {
         var _colItem, _colItem2, _colItem3;
-        colItem.width = ((_colItem = colItem) === null || _colItem === void 0 ? void 0 : _colItem.width) || (action === null || action === void 0 ? void 0 : action.width) || (colItem.buttonGroup.length > 1 ? 120 : 80);
+        colItem.width = ((_colItem = colItem) === null || _colItem === void 0 ? void 0 : _colItem.width) || (action === null || action === void 0 ? void 0 : action.width) || (colItem.buttonGroup.length > 1 ? 130 : 80);
         colItem.align = ((_colItem2 = colItem) === null || _colItem2 === void 0 ? void 0 : _colItem2.align) || (action === null || action === void 0 ? void 0 : action.align) || 'center';
         colItem.title = ((_colItem3 = colItem) === null || _colItem3 === void 0 ? void 0 : _colItem3.title) || (action === null || action === void 0 ? void 0 : action.title) || '操作';
         colItem.key = 'control';
@@ -167,7 +167,7 @@ var StandardTable = function StandardTable(props) {
   }, /*#__PURE__*/React.createElement(Table, _extends({
     rowKey: rowKey || 'id',
     rowSelection: rowSelection ? _objectSpread({
-      columnWidth: 46
+      columnWidth: 56
     }, rowSelection) : rowSelection,
     dataSource: list,
     pagination: !pagination ? false : paginationProps,

package/es/StandardTable/style/index.js

@@ -6,7 +6,6 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { createStyleHook } from "../../theme/utils/genStyleHook";
 import { scrollBar } from "../../theme/index";
-import { TinyColor } from "@ctrl/tinycolor";
 var StandardTableStyleFunc = function StandardTableStyleFunc(prefix) {
   var prepareComponentToken = function prepareComponentToken(token) {
     return {
@@ -17,11 +16,10 @@ var StandardTableStyleFunc = function StandardTableStyleFunc(prefix) {
     var prefixCls = ".".concat(prefix);
     var rowTd = {
       '> td': {
-        borderColor: new TinyColor(token.colorPrimary).setAlpha(0.5).toRgbString(),
-        // fade(@primary-color, 50%),
-        '&::before': {
-          borderTop: "1px solid ".concat(new 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, {
@@ -40,22 +38,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
           }
         }
@@ -83,7 +81,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
           },
@@ -92,7 +90,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/es/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/es/utils/filterPermission.js

@@ -6,6 +6,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 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); }
 // @ts-nocheck
 import _ from "lodash";
+import { funcCode } from "../data/index";
 // 按钮方法
 var btnClickFunc = function btnClickFunc(fn) {
   var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
@@ -52,7 +53,9 @@ var btnIsHide = function btnIsHide(isHide) {
   return isHide;
 };
 // 重新组合数据(排除不包含在permissionCodes内及isHide数据
-var removeNoPermission = function removeNoPermission(array, permissionCodes, codes, params) {
+var removeNoPermission = function removeNoPermission(array, permissionCodes, codesList, params) {
+  // 合并本地的codes
+  var codes = _.unionBy(codesList || [], funcCode.btnFuncCodes, 'code');
   return Array.isArray(array) && array.filter(function (item) {
     if (item.children) {
       item.children = removeNoPermission(item.children, permissionCodes, codes, params);

package/lib/ButtonGroup/index.js

@@ -13,8 +13,6 @@ var _icons = require("@ant-design/icons");
 var _filterPermission = require("../utils/filterPermission");
 var _styles = _interopRequireDefault(require("./styles"));
 var _classnames = _interopRequireDefault(require("classnames"));
-var _lodash = _interopRequireDefault(require("lodash"));
-var _index = require("../data/index");
 var _ConfigContext = require("../ConfigContext");
 var _excluded = ["code", "fn", "exName", "name", "children", "icon"],
   _excluded2 = ["exName", "name", "type", "icon", "ghost", "danger", "disabled", "loading", "fn", "code", "rowParams", "isHide"],
@@ -75,19 +73,11 @@ var ButtonGroup = function ButtonGroup(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     popRow = _useState4[0],
     setPopRow = _useState4[1];
-  var _useState5 = (0, _react.useState)([]),
-    _useState6 = _slicedToArray(_useState5, 2),
-    resetList = _useState6[0],
-    setResetList = _useState6[1];
-  (0, _react.useEffect)(function () {
-    // codes在方法内，再合并默认的权限配置
-    // 合并本地的codes
-    var codesConcat = _lodash.default.unionBy(codes || [], _index.funcCode.btnFuncCodes, 'code');
-    // 重组选项options集合数据，排除：无权限（有配置code,并且不包含permissionCodes内）的数据及，isHide 为true的数据
-    setResetList(_toConsumableArray((0, _filterPermission.removeNoPermission)(options, permissionCodes, codesConcat, rowParams)) || []);
-    return function () {
-      setResetList([]);
-    };
+  // const [resetList, setResetList] = useState<any[]>([])
+  var resetList = (0, _react.useMemo)(function () {
+    //   // codes在方法内，再合并默认的权限配置
+    //   // 重组选项options集合数据，排除：无权限（有配置code,并且不包含permissionCodes内）的数据及，isHide 为true的数据
+    return _toConsumableArray((0, _filterPermission.removeNoPermission)(options, permissionCodes, codes, rowParams)) || [];
   }, [options, codes, permissionCodes]);
   (0, _react.useEffect)(function () {
     setPopVisibleIndex(-1);

package/lib/ButtonGroup/styles/index.js

@@ -30,18 +30,18 @@ var SpecButtonGroupTextStyle = function SpecButtonGroupTextStyle(prefixCls, toke
     }
   }, "& + ".concat(prefixCls, "-text"), {
     position: 'relative',
-    marginLeft: token.paddingSM,
-    '&:before': {
-      position: 'absolute',
-      content: '""',
-      top: '50%',
-      left: " calc(-".concat(token.paddingSM, "px / 2)"),
-      transform: 'translate(0, -50%)',
-      display: 'inline-block',
-      height: '.9em',
-      verticalAlign: 'middle',
-      borderLeft: "1px solid ".concat(token.colorBorder)
-    }
+    marginLeft: token.paddingSM
+    // '&:before': {
+    //   position: 'absolute',
+    //   content: '""',
+    //   top: '50%',
+    //   left:` calc(-${token.paddingSM}px / 2)`,
+    //   transform: 'translate(0, -50%)',
+    //   display: 'inline-block',
+    //   height: '.9em',
+    //   verticalAlign: 'middle',
+    //   borderLeft: `1px solid ${token.colorBorder}`
+    // }
   }));
 };
 var SpecButtonGroupStyleFunc = function SpecButtonGroupStyleFunc(prefix) {

package/lib/StandardModal/index.js

@@ -82,20 +82,17 @@ var StandardModal = function StandardModal(props) {
   var _Form$useForm = _antd.Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     modalForm = _Form$useForm2[0];
-  var _useState = (0, _react.useState)(),
+  // const [modalFormRef, setModalFormRef] = useState<any>();  // <---- set the ref when Form Rendered(使用此方法会出现溢出事件）
+  var _useState = (0, _react.useState)(0),
     _useState2 = _slicedToArray(_useState, 2),
-    modalFormRef = _useState2[0],
-    setModalFormRef = _useState2[1]; // <---- set the ref when Form Rendered
-  var _useState3 = (0, _react.useState)(0),
-    _useState4 = _slicedToArray(_useState3, 2),
-    bodyMaxHeight = _useState4[0],
-    setBodyMaxHeight = _useState4[1];
+    bodyMaxHeight = _useState2[0],
+    setBodyMaxHeight = _useState2[1];
 
   // setTabFormChild
-  var _useState5 = (0, _react.useState)(),
-    _useState6 = _slicedToArray(_useState5, 2),
-    formChild = _useState6[0],
-    setFormChild = _useState6[1]; // <---- set the ref when Form Rendered
+  var _useState3 = (0, _react.useState)(),
+    _useState4 = _slicedToArray(_useState3, 2),
+    formChild = _useState4[0],
+    setFormChild = _useState4[1]; // <---- set the ref when Form Rendered
 
   // 按钮栏是否有显示（默认显示）
   var hasFooterBar = (0, _react.useMemo)(function () {
@@ -171,7 +168,7 @@ var StandardModal = function StandardModal(props) {
   };
   // fill Form when modal open 此处可解决获取  Form.useForm  warning
   (0, _react.useEffect)(function () {
-    if (visible && modalFormRef) {
+    if (visible && modalForm) {
       // <---- check ref before use the form instance
       if (initialValues && _typeof(initialValues) === 'object') {
         initialValues && modalForm.setFieldsValue(_objectSpread({}, initialValues));
@@ -181,7 +178,7 @@ var StandardModal = function StandardModal(props) {
     // if (!visible && modalFormRef) {
     //   clearAllFieldsValue() // 清空表单传参数
     // }
-  }, [modalFormRef, visible]);
+  }, [modalForm, visible]);
   (0, _react.useEffect)(function () {
     if (visible) {
       initBodyMaxHeight();
@@ -427,8 +424,12 @@ var StandardModal = function StandardModal(props) {
   // 内容渲染
   var renderChildrenNodes = function renderChildrenNodes() {
     return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, children, (type === 'form' || type === 'gridForm') && /*#__PURE__*/_react.default.createElement(_antd.Form, {
-      layout: formLayout,
-      ref: setModalFormRef,
+      layout: formLayout
+      // ref={(formInstance)=> {
+      //   // console.log('formInstance', formInstance)
+      //   // setModalFormRef(formInstance)
+      // }}
+      ,
       form: modalForm,
       onFinish: handleSubmit,
       hideRequiredMark: fieldStatus === 'viewOnly' || hideRequiredMark

package/lib/StandardTable/index.js

@@ -64,7 +64,7 @@ var StandardTable = function StandardTable(props) {
     rest = _objectWithoutProperties(_providerConfig$props, _excluded);
   // 加上类型修复 TS:2322 报警
   var resetColumns = [_objectSpread(_objectSpread({
-    width: 62,
+    width: 76,
     align: 'center',
     title: '序号',
     key: 'orderNum',
@@ -92,7 +92,7 @@ var StandardTable = function StandardTable(props) {
         otherColumn = columnsConfig.otherColumn;
       if (colItem.type === 'action') {
         var _colItem, _colItem2, _colItem3;
-        colItem.width = ((_colItem = colItem) === null || _colItem === void 0 ? void 0 : _colItem.width) || (action === null || action === void 0 ? void 0 : action.width) || (colItem.buttonGroup.length > 1 ? 120 : 80);
+        colItem.width = ((_colItem = colItem) === null || _colItem === void 0 ? void 0 : _colItem.width) || (action === null || action === void 0 ? void 0 : action.width) || (colItem.buttonGroup.length > 1 ? 130 : 80);
         colItem.align = ((_colItem2 = colItem) === null || _colItem2 === void 0 ? void 0 : _colItem2.align) || (action === null || action === void 0 ? void 0 : action.align) || 'center';
         colItem.title = ((_colItem3 = colItem) === null || _colItem3 === void 0 ? void 0 : _colItem3.title) || (action === null || action === void 0 ? void 0 : action.title) || '操作';
         colItem.key = 'control';
@@ -176,7 +176,7 @@ var StandardTable = function StandardTable(props) {
   }, /*#__PURE__*/_react.default.createElement(_antd.Table, _extends({
     rowKey: rowKey || 'id',
     rowSelection: rowSelection ? _objectSpread({
-      columnWidth: 46
+      columnWidth: 56
     }, rowSelection) : rowSelection,
     dataSource: list,
     pagination: !pagination ? false : paginationProps,

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.3",
   "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",