fan-standard-comp 3.2.1 → 3.2.2

package/lib/StandardForm/index.d.ts

@@ -28,5 +28,5 @@ export interface StandardFormProps {
     displayLayout?: any;
     [k: string]: any;
 }
-declare const StandardForm: React.ForwardRefExoticComponent<Pick<StandardFormProps, string | number> & React.RefAttributes<unknown>>;
+declare const StandardForm: React.ForwardRefExoticComponent<Omit<StandardFormProps, "ref"> & React.RefAttributes<unknown>>;
 export default StandardForm;

package/lib/StandardForm/index.js

@@ -16,15 +16,15 @@ var _RenderItemGroup = _interopRequireDefault(require("../FormComp/RenderItemGro
 var _data = require("../data");
 require("./style/index.less");
 var _ActionList = _interopRequireDefault(require("./ActionList"));
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+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 && {}.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 _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _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 _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+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(r) { if (Array.isArray(r)) return r; }
 var StandardForm = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
   var _props$formItemGroup = props.formItemGroup,
     formItemGroup = _props$formItemGroup === void 0 ? [] : _props$formItemGroup,
@@ -158,5 +158,4 @@ var StandardForm = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
     fieldStatus: fieldStatus
   }) : null, renderActionGroup()), postfix);
 });
-var _default = StandardForm;
-exports.default = _default;
+var _default = exports.default = StandardForm;

package/lib/StandardModal/UpdateFormRef.js

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+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 && {}.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; }
 var updateModalForm = function updateModalForm(props) {
   var getFormAndFields = props.getFormAndFields,
     form = props.form;
@@ -20,5 +20,4 @@ var updateModalForm = function updateModalForm(props) {
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null);
   /* 如果是ReactNode则直接返回 */
 };
-var _default = updateModalForm;
-exports.default = _default;
+var _default = exports.default = updateModalForm;

package/lib/StandardModal/index.d.ts

@@ -3,6 +3,7 @@ import { ModalProps } from 'antd/es/modal';
 import PropTypes from 'prop-types';
 import { ItemGroupProps } from '../StandardForm/index';
 import './style/index.less';
+import 'ant-design-draggable-modal/dist/index.css';
 export interface StandardModalProps extends ModalProps {
     children?: React.ReactNode;
     title?: String;
@@ -39,5 +40,5 @@ export interface StandardModalProps extends ModalProps {
     dragAble?: boolean;
     [k: string]: any;
 }
-declare const StandardModal: (props: StandardModalProps) => JSX.Element;
+declare const StandardModal: (props: StandardModalProps) => React.JSX.Element;
 export default StandardModal;

package/lib/StandardModal/index.js

@@ -24,17 +24,18 @@ var _TabForm = _interopRequireDefault(require("../StandardForm/TabForm"));
 var _StepForm = _interopRequireDefault(require("../StandardForm/StepForm"));
 var _ActionList = _interopRequireDefault(require("../StandardForm/ActionList.js"));
 require("./style/index.less");
-var _Modal2 = _interopRequireDefault(require("../StandardDragModal/Modal"));
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _antDesignDraggableModal = require("ant-design-draggable-modal");
+require("ant-design-draggable-modal/dist/index.css");
+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 && {}.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 _interopRequireDefault(e) { return e && e.__esModule ? e : { default: 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); }
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _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; } // import { DraggableModal, DraggableModalProvider } from '../StandardDragModal/index'
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+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(r) { if (Array.isArray(r)) return r; }
 var StandardModal = function StandardModal(props) {
   var children = props.children,
     className = props.className,
@@ -74,7 +75,8 @@ var StandardModal = function StandardModal(props) {
   var _useState3 = (0, _react.useState)(0),
     _useState4 = _slicedToArray(_useState3, 2),
     bodyMaxHeight = _useState4[0],
-    setBodyMaxHeight = _useState4[1]; // setTabFormChild
+    setBodyMaxHeight = _useState4[1];
+  // setTabFormChild
   var _useState5 = (0, _react.useState)(),
     _useState6 = _slicedToArray(_useState5, 2),
     formChild = _useState6[0],
@@ -92,7 +94,9 @@ var StandardModal = function StandardModal(props) {
         return ((_b = activeTabInfo === null || activeTabInfo === void 0 ? void 0 : activeTabInfo.actions) === null || _b === void 0 ? void 0 : _b.length) > 0;
       }
       if (type === 'stepForm') {
-        var currentStepInfo = formItemGroup[stepsConfig.current];
+        var currentStepInfo = formItemGroup.filter(function (fItem) {
+          return !fItem.hideStep;
+        })[stepsConfig.current];
         openLog && console.log('rule 0-2', ((_c = currentStepInfo === null || currentStepInfo === void 0 ? void 0 : currentStepInfo.actions) === null || _c === void 0 ? void 0 : _c.length) > 0);
         return ((_d = currentStepInfo === null || currentStepInfo === void 0 ? void 0 : currentStepInfo.actions) === null || _d === void 0 ? void 0 : _d.length) > 0;
       }
@@ -139,7 +143,8 @@ var StandardModal = function StandardModal(props) {
   // 设置限制弹窗高度
   var initBodyMaxHeight = function initBodyMaxHeight() {
     var title = props.title;
-    var bodyHeight = document.body.offsetHeight;
+    // 最大高度基础值调整成页面视口高度
+    var bodyHeight = document.documentElement.clientHeight; // document.body.offsetHeight
     var baseReduce = 80 + 32; // 默认需要减去的高度（上下空白间距150及内部内容间距16*2
     // console.log('弹窗是否有按钮：', hasFooterBar ? '是' : '否')
     setBodyMaxHeight("".concat(bodyHeight - (title ? 55 : 0) - (hasFooterBar ? 55 : 0) - baseReduce, "px"));
@@ -177,7 +182,6 @@ var StandardModal = function StandardModal(props) {
         if (Object.prototype.hasOwnProperty.call(values, 'false')) {
           delete values.false; // 自定义结构会莫名的出来一个false字段
         }
-
         var resultValues = (0, _ValueFormat.default)(values, formItemGroup);
         if (onSubmit) {
           onSubmit(Object.assign({}, resultValues));
@@ -197,7 +201,6 @@ var StandardModal = function StandardModal(props) {
         if (Object.prototype.hasOwnProperty.call(values, 'false')) {
           delete values.false; // 自定义结构会莫名的出来一个false字段
         }
-
         var resultValues = (0, _ValueFormat.default)(values, formItemGroup);
         if (onSubmit) {
           onSubmit(Object.assign({}, resultValues));
@@ -222,7 +225,6 @@ var StandardModal = function StandardModal(props) {
     // modalForm.setFieldsValue(allFields) // 直接清空表单的赋值(initialValues传值如果没有前后赋值没有全部带上所有字段，则会默认又使用之前的部分未传参字段)
     modalForm.resetFields(); // 直接使用这个无效
   };
-
   var onAfterClose = function onAfterClose() {
     var afterClose = props.afterClose;
     if (type === 'form') clearAllFieldsValue();
@@ -254,6 +256,7 @@ var StandardModal = function StandardModal(props) {
               type: item.type,
               label: item.label,
               protoConfig: Object.assign({}, item.protoConfig)
+              // protoConfig: { className: '', ...item.protoConfig }
             }].concat(childrenFields);
           }
           return /*#__PURE__*/_react.default.createElement(_col.default, {
@@ -358,7 +361,6 @@ var StandardModal = function StandardModal(props) {
           }
         }));
       }
-
       if (typeof footerButtonGroup === 'function') {
         return footerButtonGroup(modalForm, props);
       }
@@ -378,7 +380,10 @@ var StandardModal = function StandardModal(props) {
   var renderFooter = function renderFooter() {
     var _a, _b;
     if (type === 'stepForm') {
-      var currentStepInfo = formItemGroup[stepsConfig.current];
+      // 过滤隐藏掉的步骤表单
+      var currentStepInfo = formItemGroup.filter(function (fItem) {
+        return !fItem.hideStep;
+      })[stepsConfig.current];
       return ((_a = currentStepInfo === null || currentStepInfo === void 0 ? void 0 : currentStepInfo.actions) === null || _a === void 0 ? void 0 : _a.length) > 0 ? /*#__PURE__*/_react.default.createElement(_ActionList.default, {
         list: currentStepInfo.actions || [],
         onStep: handleStepType,
@@ -400,7 +405,7 @@ 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(_form.default, {
+    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, children, (type === 'form' || type === 'gridForm') && (/*#__PURE__*/_react.default.createElement(_form.default, {
       layout: formLayout,
       ref: setModalFormRef,
       form: modalForm,
@@ -409,7 +414,7 @@ var StandardModal = function StandardModal(props) {
       // initialValues={{ ...initialValues }}
       scrollToFirstError: true,
       className: "modalForm"
-    }, formPrefix && /*#__PURE__*/_react.default.createElement(_row.default, null, formPrefix(modalForm, props, forceUpdateForm)), formItemGroup ? renderFormItemGroup() : null, formPostfix && /*#__PURE__*/_react.default.createElement(_row.default, null, formPostfix(modalForm, props, forceUpdateForm), " ")), type === 'tabForm' && /*#__PURE__*/_react.default.createElement(_TabForm.default, {
+    }, formPrefix && /*#__PURE__*/_react.default.createElement(_row.default, null, formPrefix(modalForm, props, forceUpdateForm)), formItemGroup ? renderFormItemGroup() : null, formPostfix && /*#__PURE__*/_react.default.createElement(_row.default, null, formPostfix(modalForm, props, forceUpdateForm), " "))), type === 'tabForm' && (/*#__PURE__*/_react.default.createElement(_TabForm.default, {
       grid: size,
       layout: formLayout,
       fieldStatus: fieldStatus,
@@ -424,7 +429,7 @@ var StandardModal = function StandardModal(props) {
       onSubmit: handleSubmit,
       initialValues: Object.assign({}, initialValues),
       displayLayout: displayLayout
-    }), type === 'stepForm' && /*#__PURE__*/_react.default.createElement(_StepForm.default, {
+    })), type === 'stepForm' && (/*#__PURE__*/_react.default.createElement(_StepForm.default, {
       grid: size,
       layout: formLayout,
       fieldStatus: fieldStatus,
@@ -439,11 +444,11 @@ var StandardModal = function StandardModal(props) {
       onSubmit: handleSubmit,
       initialValues: Object.assign({}, initialValues),
       displayLayout: displayLayout
-    }));
+    })));
   };
   // 可拖动及缩放
   if (dragAble) {
-    return /*#__PURE__*/_react.default.createElement(_Modal2.default, Object.assign({
+    return /*#__PURE__*/_react.default.createElement(_antDesignDraggableModal.DraggableModalProvider, null, /*#__PURE__*/_react.default.createElement(_antDesignDraggableModal.DraggableModal, Object.assign({
       destroyOnClose: true,
       initialWidth: otherProps.width || _data.general.modalSize[size].width,
       initialHeight: otherProps.height,
@@ -456,26 +461,8 @@ var StandardModal = function StandardModal(props) {
       onOk: handleSubmit,
       title: title,
       footer: renderFooter()
-    }), renderChildrenNodes());
-    /* return <DraggableModalProvider>
-       <DraggableModal destroyOnClose
-                       initialWidth={otherProps.width || general.modalSize[size].width}
-                       initialHeight={otherProps.height}
-                       zIndex={1001}
-                       {...otherProps}
-                       visible={visible}
-                       className={`standardModal ${className || ''} ${fieldStatus === 'viewOnly' ? 'is-view' : ''}`}
-                       onCancel={handleCancel}
-                       afterClose={onAfterClose}
-                       onOk={handleSubmit}
-                       title={title}
-                       footer={renderFooter()}
-       >
-         {renderChildrenNodes()}
-       </DraggableModal>
-     </DraggableModalProvider>*/
+    }), renderChildrenNodes()));
   }
-
   return /*#__PURE__*/_react.default.createElement(_modal.default, Object.assign({
     destroyOnClose: true,
     maskClosable: false,
@@ -497,5 +484,4 @@ var StandardModal = function StandardModal(props) {
     onOk: handleSubmit
   }), renderChildrenNodes());
 };
-var _default = StandardModal;
-exports.default = _default;
+var _default = exports.default = StandardModal;

package/lib/StandardPanel/index.d.ts

@@ -24,5 +24,5 @@ interface badgesListProps {
     label?: string[] | any;
     color?: string;
 }
-declare const StandardPanel: (props: StandardPanelProps) => JSX.Element;
+declare const StandardPanel: (props: StandardPanelProps) => React.JSX.Element;
 export default StandardPanel;

package/lib/StandardPanel/index.js

@@ -12,15 +12,15 @@ var _radio = _interopRequireDefault(require("antd/es/radio"));
 var _react = _interopRequireWildcard(require("react"));
 var _classnames = _interopRequireDefault(require("classnames"));
 require("./style/index.less");
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+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 && {}.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 _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _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 _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+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(r) { if (Array.isArray(r)) return r; }
 var StandardPanel = function StandardPanel(props) {
   var className = props.className,
     style = props.style,
@@ -67,10 +67,10 @@ var StandardPanel = function StandardPanel(props) {
   };
   // 是否显示提示框
   var popoverShow = function popoverShow() {
-    return title.content ? /*#__PURE__*/_react.default.createElement(_popover.default, {
+    return title.content ? (/*#__PURE__*/_react.default.createElement(_popover.default, {
       content: title.content,
       placement: title.placement
-    }, " ", title.label, " ") : title;
+    }, " ", title.label, " ")) : title;
   };
   var panelHeaderRef = (0, _react.useRef)();
   var bodyLimitStyle = (0, _react.useMemo)(function () {
@@ -125,5 +125,4 @@ var StandardPanel = function StandardPanel(props) {
     style: Object.assign({}, bodyLimitStyle)
   }, children));
 };
-var _default = StandardPanel;
-exports.default = _default;
+var _default = exports.default = StandardPanel;

package/lib/StandardTable/index.d.ts

@@ -16,6 +16,7 @@ interface StandardTableProps {
     className?: string;
     rowSelection?: any;
     orderNumber?: object;
+    columnsConfig?: object;
     [k: string]: any;
 }
 declare const StandardTable: FC<StandardTableProps>;

package/lib/StandardTable/index.js

@@ -1,5 +1,6 @@
 "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
 });
@@ -9,27 +10,37 @@ var _table = _interopRequireDefault(require("antd/es/table"));
 require("antd/es/card/style");
 var _card = _interopRequireDefault(require("antd/es/card"));
 var _tslib = require("tslib");
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 var _classnames = _interopRequireDefault(require("classnames"));
 var _index = _interopRequireDefault(require("../ButtonGroup/index"));
 require("./style/index.less");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _ConfigContext = require("../ConfigContext");
+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 && {}.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 _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 var StandardTable = function StandardTable(props) {
+  var InitFanContext = (0, _react.useContext)(_ConfigContext.FanContext);
+  var providerConfig = InitFanContext['StandardTable'] || {}; // 使用上下文（全局配置）设置扩展的配置项
   // const ref= React.createRef<Card>();
-  var _props$data = props.data,
-    data = _props$data === void 0 ? {} : _props$data,
-    rowKey = props.rowKey,
-    rowSelection = props.rowSelection,
-    columns = props.columns,
-    hideOrderNumber = props.hideOrderNumber,
-    _props$orderNumber = props.orderNumber,
-    orderNumber = _props$orderNumber === void 0 ? {} : _props$orderNumber,
-    className = props.className,
-    emptyText = props.emptyText,
-    codes = props.codes,
-    permissionCodes = props.permissionCodes,
-    rest = (0, _tslib.__rest)(props, ["data", "rowKey", "rowSelection", "columns", "hideOrderNumber", "orderNumber", "className", "emptyText", "codes", "permissionCodes"]); // 加上类型修复 TS:2322 报警
-  var resetColumns = [Object.assign({
+  var _a = Object.assign(Object.assign({}, providerConfig), props),
+    _a$data = _a.data,
+    data = _a$data === void 0 ? {} : _a$data,
+    rowKey = _a.rowKey,
+    rowSelection = _a.rowSelection,
+    columns = _a.columns,
+    hideOrderNumber = _a.hideOrderNumber,
+    _a$orderNumber = _a.orderNumber,
+    orderNumber = _a$orderNumber === void 0 ? {} : _a$orderNumber,
+    className = _a.className,
+    emptyText = _a.emptyText,
+    codes = _a.codes,
+    permissionCodes = _a.permissionCodes,
+    _a$columnsConfig = _a.columnsConfig,
+    columnsConfig = _a$columnsConfig === void 0 ? {} : _a$columnsConfig,
+    rest = (0, _tslib.__rest)(_a, ["data", "rowKey", "rowSelection", "columns", "hideOrderNumber", "orderNumber", "className", "emptyText", "codes", "permissionCodes", "columnsConfig"]);
+
+  // 加上类型修复 TS:2322 报警
+  var resetColumns = [Object.assign(Object.assign({
     width: 58,
     align: 'center',
     title: '序号',
@@ -39,7 +50,7 @@ var StandardTable = function StandardTable(props) {
     render: function render(text, record, index) {
       return index + 1;
     }
-  }, orderNumber)];
+  }, (columnsConfig === null || columnsConfig === void 0 ? void 0 : columnsConfig.orderNumber) || {}), orderNumber)];
   var _data$list = data.list,
     list = _data$list === void 0 ? [] : _data$list,
     pagination = data.pagination;
@@ -53,12 +64,17 @@ var StandardTable = function StandardTable(props) {
     }
   }, pagination);
   if (columns) {
-    columns.map(function (colItem) {
+    var recombinationColumns = columns.map(function (colItem) {
+      var action = columnsConfig.action,
+        otherColumn = columnsConfig.otherColumn;
       if (colItem.type === 'action') {
-        colItem.width = colItem.width || (colItem.buttonGroup.length > 1 ? 120 : 80);
-        colItem.align = 'center';
-        colItem.title = colItem.title || '操作';
+        colItem.width = (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.align = (colItem === null || colItem === void 0 ? void 0 : colItem.align) || (action === null || action === void 0 ? void 0 : action.align) || 'center';
+        colItem.title = (colItem === null || colItem === void 0 ? void 0 : colItem.title) || (action === null || action === void 0 ? void 0 : action.title) || '操作';
         colItem.key = 'control';
+        colItem = Object.assign(Object.assign(Object.assign({}, action || {}), colItem), {
+          ellipsis: false
+        }); //  Object.assign(action || {}, colItem, { ellipsis: false }) // 操作列不配置ellipsis
         // colItem.fixed = colItem.fixed || 'right'
         colItem.render = function (text, record, rowIndex) {
           // 按钮列表组
@@ -83,7 +99,9 @@ var StandardTable = function StandardTable(props) {
                   record: record,
                   rowIndex: rowIndex
                 },
-                dropdownConfig: colItem.buttonGroupConfig || {}
+                dropdownConfig: colItem.buttonGroupConfig || {},
+                moreText: colItem === null || colItem === void 0 ? void 0 : colItem.moreText,
+                moreIcon: colItem === null || colItem === void 0 ? void 0 : colItem.moreIcon
               });
             } else {
               return buttonGroup;
@@ -91,25 +109,28 @@ var StandardTable = function StandardTable(props) {
           };
           return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, renderTableButtonGroup(colItem.buttonGroup));
         };
+        return Object.assign({}, colItem);
       } else if (!colItem.render) {
         // 若未配置render，则给加个默认的返回方法
         colItem.render = function (text, record, rowIndex) {
           return text || text === 0 ? text : '-';
         };
-        return colItem;
+        // return Object.assign({ ellipsis: undefined, render: undefined }, { ...otherColumns, ...colItem });  // ellipsis要配置在render之前
+        return Object.assign(Object.assign({}, otherColumn), colItem);
       }
-      return colItem;
+      // return Object.assign({ ellipsis: undefined, render: undefined }, { ...otherColumns, ...colItem }) // ellipsis要配置在render之前
+      return Object.assign(Object.assign({}, otherColumn), colItem);
     });
-    resetColumns = hideOrderNumber ? columns : resetColumns.concat(columns);
+    resetColumns = hideOrderNumber ? recombinationColumns : resetColumns.concat(recombinationColumns);
   }
   return /*#__PURE__*/_react.default.createElement(_card.default, {
     className: (0, _classnames.default)('standard-table', className),
     bordered: false
   }, /*#__PURE__*/_react.default.createElement(_table.default, Object.assign({
     rowKey: rowKey || 'id',
-    rowSelection: rowSelection ? Object.assign(Object.assign({}, rowSelection), {
+    rowSelection: rowSelection ? Object.assign({
       columnWidth: 30
-    }) : rowSelection,
+    }, rowSelection) : rowSelection,
     dataSource: list,
     pagination: !pagination ? false : paginationProps,
     columns: resetColumns,
@@ -120,5 +141,4 @@ var StandardTable = function StandardTable(props) {
     }
   }, rest)));
 };
-var _default = StandardTable;
-exports.default = _default;
+var _default = exports.default = StandardTable;

package/lib/components/IconNode/index.d.ts

@@ -12,5 +12,5 @@ import React from "react";
 interface IconNodeProps {
     icon?: string | string[] | React.ReactNode;
 }
-declare const IconNode: (props: IconNodeProps) => JSX.Element;
+declare const IconNode: (props: IconNodeProps) => React.JSX.Element;
 export default IconNode;

package/lib/components/IconNode/index.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _index = _interopRequireDefault(require("../../SpecIcon/index"));
 var _react = _interopRequireDefault(require("react"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 var IconNode = function IconNode(props) {
   var icon = props.icon;
   if (!icon) return null;
@@ -25,8 +25,6 @@ var IconNode = function IconNode(props) {
       name: icon[1]
     }); // 预留 Array ['speci','plus']
   }
-
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, icon);
 };
-var _default = IconNode;
-exports.default = _default;
+var _default = exports.default = IconNode;

package/lib/components/index.js

@@ -10,4 +10,4 @@ Object.defineProperty(exports, "IconNode", {
   }
 });
 var _index = _interopRequireDefault(require("./IconNode/index"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }

package/lib/data/func.code.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 // 存储当前页面中所有菜单的涉及的功能代码，包括页面及按钮
-var _default = {
+var _default = exports.default = {
   btnFuncCodes: [{
     name: '详情',
     code: 'codeBtnDetail',
@@ -115,5 +115,4 @@ var _default = {
     name: '详情',
     code: 'codePageDetail'
   }]
-};
-exports.default = _default;
+};