fan-standard-comp 4.0.1 → 4.0.3

package/lib/StandardForm/TabForm.js

@@ -1,6 +1,5 @@
 "use strict";
 
-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); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -11,16 +10,13 @@ require("./style/index.less");
 var _index2 = _interopRequireDefault(require("./index"));
 var _RenderItemGroup = _interopRequireDefault(require("../FormComp/RenderItemGroup"));
 var _ActionList = _interopRequireDefault(require("./ActionList"));
+var _ConfigContext = require("../ConfigContext");
 var _excluded = ["title", "fields", "actions"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+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 _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
-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; }
-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); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
@@ -29,23 +25,31 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+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; }
+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); }
 var TabForm = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
-  var getFormFields = props.getFormFields,
-    _props$formItemGroup = props.formItemGroup,
-    formItemGroup = _props$formItemGroup === void 0 ? [] : _props$formItemGroup,
-    _props$grid = props.grid,
-    grid = _props$grid === void 0 ? 'md' : _props$grid,
-    layout = props.layout,
-    _props$actionAlign = props.actionAlign,
-    actionAlign = _props$actionAlign === void 0 ? 'center' : _props$actionAlign,
-    actionHide = props.actionHide,
-    fieldStatus = props.fieldStatus,
-    _props$fieldSize = props.fieldSize,
-    fieldSize = _props$fieldSize === void 0 ? "middle" : _props$fieldSize,
-    onSubmit = props.onSubmit,
-    initialValues = props.initialValues,
-    tabsConfig = props.tabsConfig,
-    displayLayout = props.displayLayout;
+  var InitFanContext = (0, _react.useContext)(_ConfigContext.FanContext);
+  var providerConfig = InitFanContext['TabForm'] || {}; // 使用上下文（全局配置）设置扩展的配置项
+  var _providerConfig$props = _objectSpread(_objectSpread({}, providerConfig), props),
+    getFormFields = _providerConfig$props.getFormFields,
+    _providerConfig$props2 = _providerConfig$props.formItemGroup,
+    formItemGroup = _providerConfig$props2 === void 0 ? [] : _providerConfig$props2,
+    _providerConfig$props3 = _providerConfig$props.grid,
+    grid = _providerConfig$props3 === void 0 ? 'md' : _providerConfig$props3,
+    layout = _providerConfig$props.layout,
+    _providerConfig$props4 = _providerConfig$props.actionAlign,
+    actionAlign = _providerConfig$props4 === void 0 ? 'center' : _providerConfig$props4,
+    actionHide = _providerConfig$props.actionHide,
+    fieldStatus = _providerConfig$props.fieldStatus,
+    _providerConfig$props5 = _providerConfig$props.fieldSize,
+    fieldSize = _providerConfig$props5 === void 0 ? "middle" : _providerConfig$props5,
+    onSubmit = _providerConfig$props.onSubmit,
+    initialValues = _providerConfig$props.initialValues,
+    tabsConfig = _providerConfig$props.tabsConfig,
+    displayLayout = _providerConfig$props.displayLayout;
   var _useState = (0, _react.useState)(),
     _useState2 = _slicedToArray(_useState, 2),
     formChildFields = _useState2[0],

package/lib/StandardForm/index.js

@@ -13,52 +13,60 @@ var _data = require("../data");
 require("./style/index.less");
 var _ActionList = _interopRequireDefault(require("./ActionList"));
 var _index2 = _interopRequireDefault(require("./style/index"));
-var _excluded = ["formItemGroup", "className", "initialValues", "layout", "grid", "getFormFields", "fieldStatus", "onSubmit", "confirmText", "onCancel", "cancelText", "actionAlign", "actionGroup", "onFinishFailed", "children", "prefix", "postfix", "fieldSize", "displayLayout", "itemGroupConfig"];
+var _ConfigContext = require("../ConfigContext");
+var _excluded = ["formItemGroup", "className", "initialValues", "layout", "grid", "getFormFields", "fieldStatus", "onSubmit", "confirmText", "onCancel", "cancelText", "confirmButtonProps", "cancelButtonProps", "actionAlign", "actionGroup", "onFinishFailed", "children", "prefix", "postfix", "fieldSize", "displayLayout", "itemGroupConfig"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
-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; }
-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); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+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; }
+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); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 var StandardForm = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
-  var _props$formItemGroup = props.formItemGroup,
-    formItemGroup = _props$formItemGroup === void 0 ? [] : _props$formItemGroup,
-    className = props.className,
-    initialValues = props.initialValues,
-    _props$layout = props.layout,
-    layout = _props$layout === void 0 ? 'horizontal' : _props$layout,
-    _props$grid = props.grid,
-    grid = _props$grid === void 0 ? 1 : _props$grid,
-    getFormFields = props.getFormFields,
-    fieldStatus = props.fieldStatus,
-    onSubmit = props.onSubmit,
-    _props$confirmText = props.confirmText,
-    confirmText = _props$confirmText === void 0 ? '确认' : _props$confirmText,
-    onCancel = props.onCancel,
-    _props$cancelText = props.cancelText,
-    cancelText = _props$cancelText === void 0 ? '取消' : _props$cancelText,
-    actionAlign = props.actionAlign,
-    actionGroup = props.actionGroup,
-    onFinishFailed = props.onFinishFailed,
-    children = props.children,
-    prefix = props.prefix,
-    postfix = props.postfix,
-    fieldSize = props.fieldSize,
-    displayLayout = props.displayLayout,
-    _props$itemGroupConfi = props.itemGroupConfig,
-    itemGroupConfig = _props$itemGroupConfi === void 0 ? {} : _props$itemGroupConfi,
-    baseProps = _objectWithoutProperties(props, _excluded);
+  var InitFanContext = (0, _react.useContext)(_ConfigContext.FanContext);
+  var providerConfig = InitFanContext['StandardForm'] || {}; // 使用上下文（全局配置）设置扩展的配置项
+  var _providerConfig$props = _objectSpread(_objectSpread({}, providerConfig), props),
+    _providerConfig$props2 = _providerConfig$props.formItemGroup,
+    formItemGroup = _providerConfig$props2 === void 0 ? [] : _providerConfig$props2,
+    className = _providerConfig$props.className,
+    initialValues = _providerConfig$props.initialValues,
+    _providerConfig$props3 = _providerConfig$props.layout,
+    layout = _providerConfig$props3 === void 0 ? 'horizontal' : _providerConfig$props3,
+    _providerConfig$props4 = _providerConfig$props.grid,
+    grid = _providerConfig$props4 === void 0 ? 1 : _providerConfig$props4,
+    getFormFields = _providerConfig$props.getFormFields,
+    fieldStatus = _providerConfig$props.fieldStatus,
+    onSubmit = _providerConfig$props.onSubmit,
+    _providerConfig$props5 = _providerConfig$props.confirmText,
+    confirmText = _providerConfig$props5 === void 0 ? '确认' : _providerConfig$props5,
+    onCancel = _providerConfig$props.onCancel,
+    _providerConfig$props6 = _providerConfig$props.cancelText,
+    cancelText = _providerConfig$props6 === void 0 ? '取消' : _providerConfig$props6,
+    _providerConfig$props7 = _providerConfig$props.confirmButtonProps,
+    confirmButtonProps = _providerConfig$props7 === void 0 ? {} : _providerConfig$props7,
+    _providerConfig$props8 = _providerConfig$props.cancelButtonProps,
+    cancelButtonProps = _providerConfig$props8 === void 0 ? {} : _providerConfig$props8,
+    actionAlign = _providerConfig$props.actionAlign,
+    actionGroup = _providerConfig$props.actionGroup,
+    onFinishFailed = _providerConfig$props.onFinishFailed,
+    children = _providerConfig$props.children,
+    prefix = _providerConfig$props.prefix,
+    postfix = _providerConfig$props.postfix,
+    fieldSize = _providerConfig$props.fieldSize,
+    displayLayout = _providerConfig$props.displayLayout,
+    _providerConfig$props9 = _providerConfig$props.itemGroupConfig,
+    itemGroupConfig = _providerConfig$props9 === void 0 ? {} : _providerConfig$props9,
+    baseProps = _objectWithoutProperties(_providerConfig$props, _excluded);
   var componentName = 'spec-standard-form';
   var _useStyle = (0, _index2.default)(componentName),
     _useStyle2 = _slicedToArray(_useStyle, 2),
@@ -106,6 +114,7 @@ var StandardForm = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
       errorFields = _ref.errorFields,
       outOfDate = _ref.outOfDate;
     // 定位到第一条表单异常的焦点
+    if (fieldStatus === 'viewOnly') return;
     var errorCollection = Array.prototype.slice.call(document.getElementsByClassName('ant-form-item-has-error'));
     if (errorCollection[0] && errorCollection[0].getElementsByTagName('input')) {
       Array.prototype.slice.call(errorCollection[0].getElementsByTagName('input'))[0].focus();
@@ -143,19 +152,19 @@ var StandardForm = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
         'textAlign': !actionAlign || actionAlign === 'default' ? 'inherit' : actionAlign
       },
       wrapperCol: actionAlignCol
-    }, confirmText && /*#__PURE__*/_react.default.createElement(_antd.Button, {
+    }, confirmText && /*#__PURE__*/_react.default.createElement(_antd.Button, _extends({
       type: "primary",
       htmlType: "submit",
       size: fieldSize
-    }, confirmText), cancelText && /*#__PURE__*/_react.default.createElement(_antd.Button, {
+    }, confirmButtonProps), confirmText), cancelText && /*#__PURE__*/_react.default.createElement(_antd.Button, _extends({
       onClick: function onClick() {
         return onFormCancel();
       },
       size: fieldSize
-    }, cancelText));
+    }, cancelButtonProps), cancelText));
   };
   return wrapSSR( /*#__PURE__*/_react.default.createElement(_antd.Form, _extends({
-    className: (0, _classnames.default)(componentName, 'standardForm', hashId, className),
+    className: (0, _classnames.default)(componentName, 'standardForm', layout ? "standard-form-".concat(layout) : '', className, hashId),
     ref: ref,
     form: initForm,
     initialValues: initialValues,

package/lib/StandardForm/style/index.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _genStyleHook = require("../../theme/utils/genStyleHook");
-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 _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); }
@@ -18,15 +17,14 @@ var StandardFormStyleFunc = function StandardFormStyleFunc(prefix) {
   };
   return (0, _genStyleHook.createStyleHook)(prefix, function (token) {
     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())
-        }
-      }
-    };
+    // const rowTd = {
+    //   '> td': {
+    //     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({}, prefixCls, {
       '&.ant-form-inline': {
         ' .ant-form-item': {
@@ -46,8 +44,15 @@ var StandardFormStyleFunc = function StandardFormStyleFunc(prefix) {
           }
         }
       }
-    }), '.stepForm-content', {
-      margin: "".concat(token.marginMD, "px 0")
+    }), '.spec-standard-form', {
+      '.stepForm-content': {
+        margin: "".concat(token.marginMD, "px 0px"),
+        '&.stepForm-content-vertical': {
+          '.standardForm-actions': {
+            marginTop: "".concat(token.marginMD, "px")
+          }
+        }
+      }
     })];
   }, prepareComponentToken // 当前组件扩展的变量
   );

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.d.ts

@@ -17,10 +17,11 @@ interface StandardTableProps {
     rowSelection?: any;
     orderNumber?: object;
     columnsConfig?: object;
-    buttonGroup?: React.ReactNode | any[];
+    buttonGroup?: any[];
     title?: React.ReactNode | string;
     min?: number;
-    buttonGroupConfig?: Object;
+    buttonGroupConfig?: any[];
+    batchButtonGroup?: any[];
     [k: string]: any;
 }
 declare const StandardTable: FC<StandardTableProps>;

package/lib/StandardTable/index.js

@@ -11,8 +11,9 @@ var _antd = require("antd");
 var _index = _interopRequireDefault(require("../ButtonGroup/index"));
 require("./style/index.less");
 var _ConfigContext = require("../ConfigContext");
+var _lodash = _interopRequireDefault(require("lodash"));
 var _index3 = _interopRequireDefault(require("./style/index"));
-var _excluded = ["data", "rowKey", "rowSelection", "columns", "hideOrderNumber", "orderNumber", "className", "emptyText", "codes", "permissionCodes", "columnsConfig", "title", "buttonGroup", "buttonGroupConfig", "min"];
+var _excluded = ["data", "rowKey", "rowSelection", "columns", "hideOrderNumber", "orderNumber", "className", "emptyText", "codes", "permissionCodes", "columnsConfig", "title", "buttonGroup", "buttonGroupConfig", "min", "batchButtonGroup"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
@@ -59,11 +60,11 @@ var StandardTable = function StandardTable(props) {
     buttonGroup = _providerConfig$props.buttonGroup,
     buttonGroupConfig = _providerConfig$props.buttonGroupConfig,
     min = _providerConfig$props.min,
+    batchButtonGroup = _providerConfig$props.batchButtonGroup,
     rest = _objectWithoutProperties(_providerConfig$props, _excluded);
-
   // 加上类型修复 TS:2322 报警
   var resetColumns = [_objectSpread(_objectSpread({
-    width: 58,
+    width: 76,
     align: 'center',
     title: '序号',
     key: 'orderNum',
@@ -91,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';
@@ -148,22 +149,35 @@ var StandardTable = function StandardTable(props) {
     });
     resetColumns = hideOrderNumber ? recombinationColumns : resetColumns.concat(recombinationColumns);
   }
-  return wrapSSR( /*#__PURE__*/_react.default.createElement(_antd.Card, {
-    className: (0, _classnames.default)(componentName, 'standard-table', className, hashId),
-    bordered: false,
-    title: title,
-    extra: buttonGroup && buttonGroup.length > 0 ? /*#__PURE__*/_react.default.createElement(_index.default, {
-      options: buttonGroup,
+  var RenderExtraButtonGroup = function RenderExtraButtonGroup(exProps) {
+    // @ts-ignore
+    var _providerConfig$props5 = _objectSpread(_objectSpread({}, providerConfig), props),
+      rowSelection = _providerConfig$props5.rowSelection;
+    var buttonGroup = exProps.buttonGroup,
+      batchButtonGroup = exProps.batchButtonGroup;
+    // 只有配置rowSelection才显示对应的批量按钮组
+    var list = _lodash.default.unionBy(rowSelection && (rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.type) !== 'radio' && (batchButtonGroup || []), buttonGroup || []);
+    return /*#__PURE__*/_react.default.createElement(_index.default, {
+      options: list,
       min: min,
       codes: codes,
       permissionCodes: permissionCodes,
       dropdownConfig: buttonGroupConfig
-    }) : null
+    });
+  };
+  return wrapSSR( /*#__PURE__*/_react.default.createElement(_antd.Card, {
+    className: (0, _classnames.default)(componentName, 'standard-table', className, hashId),
+    bordered: false,
+    title: title,
+    extra: /*#__PURE__*/_react.default.createElement(RenderExtraButtonGroup, {
+      buttonGroup: buttonGroup,
+      batchButtonGroup: batchButtonGroup
+    })
   }, /*#__PURE__*/_react.default.createElement(_antd.Table, _extends({
     rowKey: rowKey || 'id',
-    rowSelection: rowSelection ? _objectSpread(_objectSpread({}, rowSelection), {}, {
-      columnWidth: 30
-    }) : rowSelection,
+    rowSelection: rowSelection ? _objectSpread({
+      columnWidth: 56
+    }, rowSelection) : rowSelection,
     dataSource: list,
     pagination: !pagination ? false : paginationProps,
     columns: resetColumns,

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,6 +87,7 @@ var StandardTableStyleFunc = function StandardTableStyleFunc(prefix) {
           fontSize: token.fontSizeLG
         },
         '.ant-table-thead > tr > th': {
+          padding: "12px ".concat(token.paddingMD, "px"),
           '&:first-child': {
             paddingLeft: token.paddingMD
           },
@@ -97,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/StandardTable/style/index.less

@@ -16,6 +16,8 @@
 
     .ant-pagination-total-text {
       float: left;
+      flex:1;
+      text-align: left;
     }
 
     .ant-pagination-options-size-changer.ant-select {
@@ -79,6 +81,8 @@
 .spec-pagination {
   .ant-pagination-total-text {
     float: left;
+    flex:1;
+    text-align: left;
   }
 }
 
@@ -136,15 +140,15 @@
 
     .ant-table-tbody > tr > td {
       //padding: 12px @padding-md/2;
-      &:first-child {
-        //padding-left: @padding-md;
-        border-left: 1px solid transparent;
-      }
-
-      &:last-child {
-        //padding-right: @padding-md;
-        border-right: 1px solid transparent;
-      }
+      //&:first-child {
+      //  //padding-left: @padding-md;
+      //  border-left: 1px solid transparent;
+      //}
+      //
+      //&:last-child {
+      //  //padding-right: @padding-md;
+      //  border-right: 1px solid transparent;
+      //}
     }
 
     .ant-table-thead > tr.ant-table-row-hover:not(.ant-table-expanded-row),

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) => false | 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);
@@ -92,5 +95,5 @@ var removeNoPermission = exports.removeNoPermission = function removeNoPermissio
       }
     }
     return resultItem;
-  });
+  }) || [];
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fan-standard-comp",
-  "version": "4.0.1",
+  "version": "4.0.3",
   "description": "FZ standard-comp,basic of antd5.0 and custom component.",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -77,15 +77,14 @@
     "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.15.1",
+    "antd": "5.18.1",
     "antd-style": "^3.6.1",
     "babel": "^6.23.0",
     "dayjs": "^1.11.10",