fan-standard-comp 3.2.1 → 3.2.2

package/es/StandardModal/index.js

@@ -9,12 +9,12 @@ import _Row from "antd/es/row";
 import "antd/es/form/style";
 import _Form from "antd/es/form";
 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; }
+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; }
 import { __rest } from "tslib";
 import React, { useEffect, useMemo, useState } from 'react';
 import { general } from '../data';
@@ -25,8 +25,8 @@ import TabForm from '../StandardForm/TabForm';
 import StepForm from '../StandardForm/StepForm';
 import ActionList from '../StandardForm/ActionList.js';
 import './style/index.less';
-// import { DraggableModal, DraggableModalProvider } from '../StandardDragModal/index'
-import StandardDragModal from '../StandardDragModal/Modal';
+import { DraggableModal, DraggableModalProvider } from 'ant-design-draggable-modal';
+import 'ant-design-draggable-modal/dist/index.css';
 var StandardModal = function StandardModal(props) {
   var children = props.children,
     className = props.className,
@@ -66,7 +66,8 @@ var StandardModal = function StandardModal(props) {
   var _useState3 = useState(0),
     _useState4 = _slicedToArray(_useState3, 2),
     bodyMaxHeight = _useState4[0],
-    setBodyMaxHeight = _useState4[1]; // setTabFormChild
+    setBodyMaxHeight = _useState4[1];
+  // setTabFormChild
   var _useState5 = useState(),
     _useState6 = _slicedToArray(_useState5, 2),
     formChild = _useState6[0],
@@ -84,7 +85,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;
       }
@@ -131,7 +134,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"));
@@ -169,7 +173,6 @@ var StandardModal = function StandardModal(props) {
         if (Object.prototype.hasOwnProperty.call(values, 'false')) {
           delete values.false; // 自定义结构会莫名的出来一个false字段
         }
-
         var resultValues = UtilValueFormat(values, formItemGroup);
         if (onSubmit) {
           onSubmit(Object.assign({}, resultValues));
@@ -189,7 +192,6 @@ var StandardModal = function StandardModal(props) {
         if (Object.prototype.hasOwnProperty.call(values, 'false')) {
           delete values.false; // 自定义结构会莫名的出来一个false字段
         }
-
         var resultValues = UtilValueFormat(values, formItemGroup);
         if (onSubmit) {
           onSubmit(Object.assign({}, resultValues));
@@ -214,7 +216,6 @@ var StandardModal = function StandardModal(props) {
     // modalForm.setFieldsValue(allFields) // 直接清空表单的赋值(initialValues传值如果没有前后赋值没有全部带上所有字段，则会默认又使用之前的部分未传参字段)
     modalForm.resetFields(); // 直接使用这个无效
   };
-
   var onAfterClose = function onAfterClose() {
     var afterClose = props.afterClose;
     if (type === 'form') clearAllFieldsValue();
@@ -246,6 +247,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.createElement(_Col, {
@@ -350,7 +352,6 @@ var StandardModal = function StandardModal(props) {
           }
         }));
       }
-
       if (typeof footerButtonGroup === 'function') {
         return footerButtonGroup(modalForm, props);
       }
@@ -370,7 +371,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.createElement(ActionList, {
         list: currentStepInfo.actions || [],
         onStep: handleStepType,
@@ -392,7 +396,7 @@ 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, {
+    return /*#__PURE__*/React.createElement(React.Fragment, null, children, (type === 'form' || type === 'gridForm') && (/*#__PURE__*/React.createElement(_Form, {
       layout: formLayout,
       ref: setModalFormRef,
       form: modalForm,
@@ -401,7 +405,7 @@ var StandardModal = function StandardModal(props) {
       // initialValues={{ ...initialValues }}
       scrollToFirstError: true,
       className: "modalForm"
-    }, formPrefix && /*#__PURE__*/React.createElement(_Row, null, formPrefix(modalForm, props, forceUpdateForm)), formItemGroup ? renderFormItemGroup() : null, formPostfix && /*#__PURE__*/React.createElement(_Row, null, formPostfix(modalForm, props, forceUpdateForm), " ")), type === 'tabForm' && /*#__PURE__*/React.createElement(TabForm, {
+    }, formPrefix && /*#__PURE__*/React.createElement(_Row, null, formPrefix(modalForm, props, forceUpdateForm)), formItemGroup ? renderFormItemGroup() : null, formPostfix && /*#__PURE__*/React.createElement(_Row, null, formPostfix(modalForm, props, forceUpdateForm), " "))), type === 'tabForm' && (/*#__PURE__*/React.createElement(TabForm, {
       grid: size,
       layout: formLayout,
       fieldStatus: fieldStatus,
@@ -416,7 +420,7 @@ var StandardModal = function StandardModal(props) {
       onSubmit: handleSubmit,
       initialValues: Object.assign({}, initialValues),
       displayLayout: displayLayout
-    }), type === 'stepForm' && /*#__PURE__*/React.createElement(StepForm, {
+    })), type === 'stepForm' && (/*#__PURE__*/React.createElement(StepForm, {
       grid: size,
       layout: formLayout,
       fieldStatus: fieldStatus,
@@ -431,11 +435,11 @@ var StandardModal = function StandardModal(props) {
       onSubmit: handleSubmit,
       initialValues: Object.assign({}, initialValues),
       displayLayout: displayLayout
-    }));
+    })));
   };
   // 可拖动及缩放
   if (dragAble) {
-    return /*#__PURE__*/React.createElement(StandardDragModal, Object.assign({
+    return /*#__PURE__*/React.createElement(DraggableModalProvider, null, /*#__PURE__*/React.createElement(DraggableModal, Object.assign({
       destroyOnClose: true,
       initialWidth: otherProps.width || general.modalSize[size].width,
       initialHeight: otherProps.height,
@@ -448,26 +452,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.createElement(_Modal, Object.assign({
     destroyOnClose: true,
     maskClosable: false,

package/es/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/es/StandardPanel/index.js

@@ -2,12 +2,12 @@ import "antd/es/popover/style";
 import _Popover from "antd/es/popover";
 import "antd/es/radio/style";
 import _Radio from "antd/es/radio";
-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; }
+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; }
 import React, { useState, useMemo, useRef, useEffect } from 'react';
 import classNames from 'classnames';
 import './style/index.less';
@@ -57,10 +57,10 @@ var StandardPanel = function StandardPanel(props) {
   };
   // 是否显示提示框
   var popoverShow = function popoverShow() {
-    return title.content ? /*#__PURE__*/React.createElement(_Popover, {
+    return title.content ? (/*#__PURE__*/React.createElement(_Popover, {
       content: title.content,
       placement: title.placement
-    }, " ", title.label, " ") : title;
+    }, " ", title.label, " ")) : title;
   };
   var panelHeaderRef = useRef();
   var bodyLimitStyle = useMemo(function () {

package/es/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/es/StandardTable/index.js

@@ -3,26 +3,34 @@ import _Table from "antd/es/table";
 import "antd/es/card/style";
 import _Card from "antd/es/card";
 import { __rest } from "tslib";
-import React from 'react';
+import React, { useContext } from 'react';
 import classNames from 'classnames';
 import ButtonGroup from '../ButtonGroup/index';
 import './style/index.less';
+import { FanContext } from '../ConfigContext';
 var StandardTable = function StandardTable(props) {
+  var InitFanContext = useContext(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 = __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 = __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: '序号',
@@ -32,7 +40,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;
@@ -46,12 +54,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) {
           // 按钮列表组
@@ -76,7 +89,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;
@@ -84,25 +99,28 @@ var StandardTable = function StandardTable(props) {
           };
           return /*#__PURE__*/React.createElement(React.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.createElement(_Card, {
     className: classNames('standard-table', className),
     bordered: false
   }, /*#__PURE__*/React.createElement(_Table, 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,

package/es/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/es/components/IconNode/index.js

@@ -18,7 +18,6 @@ var IconNode = function IconNode(props) {
       name: icon[1]
     }); // 预留 Array ['speci','plus']
   }
-
   return /*#__PURE__*/React.createElement(React.Fragment, null, icon);
 };
 export default IconNode;

package/es/data/general.config.js

@@ -72,6 +72,8 @@ export default {
   // 弹窗梯度大小及对应的表单栅格
   modalSize: {
     xs: {
+      columnNumber: 1,
+      // 栅格列数量
       width: 420,
       formLayout: {
         labelCol: {
@@ -91,6 +93,8 @@ export default {
       }
     },
     sm: {
+      columnNumber: 1,
+      // 栅格列数量
       width: 680,
       formLayout: {
         labelCol: {
@@ -110,6 +114,8 @@ export default {
       }
     },
     md: {
+      columnNumber: 2,
+      // 栅格列数量
       width: 780,
       formLayout: {
         labelCol: {
@@ -130,6 +136,8 @@ export default {
     },
     // 宽度大，1000px下
     lg: {
+      columnNumber: 3,
+      // 栅格列数量
       width: 1000,
       formLayout: {
         labelCol: {
@@ -150,6 +158,8 @@ export default {
     },
     // 超级宽度大，1200px下
     xlg: {
+      columnNumber: 3,
+      // 栅格列数量
       width: 1200,
       formLayout: {
         labelCol: {
@@ -167,6 +177,27 @@ export default {
           span: 21
         }
       }
+    },
+    xxlg: {
+      columnNumber: 4,
+      // 栅格列数量
+      width: 1400,
+      formLayout: {
+        labelCol: {
+          span: 8
+        },
+        wrapperCol: {
+          span: 16
+        }
+      },
+      formBlockLayout: {
+        labelCol: {
+          span: 2
+        },
+        wrapperCol: {
+          span: 22
+        }
+      }
     }
   }
 };

package/es/index.d.ts

@@ -8,7 +8,6 @@ export { default as StepForm } from './StandardForm/StepForm';
 export { default as TabForm } from './StandardForm/TabForm';
 export { default as StandardFilter } from './StandardFilter';
 export { default as StandardModal } from './StandardModal';
-export { default as StandardDragModal } from './StandardDragModal/Modal';
 export { default as Uploader } from './FormComp/Uploader';
 export { default as EditButton } from './FormComp/EditButton';
 export { default as FieldComponent } from './FormComp/FieldComponent';
@@ -23,3 +22,6 @@ export { default as NavLeafScroll } from './NavLeafScroll';
 export * from './components';
 export * from './utils';
 export * from './data';
+export * from './ConfigContext';
+export { default as ImageGallery } from './ImageGallery/index';
+export { default as ImagePreview } from './ImageGallery/ImagePreview';

package/es/index.js

@@ -9,7 +9,6 @@ export { default as StepForm } from './StandardForm/StepForm';
 export { default as TabForm } from './StandardForm/TabForm';
 export { default as StandardFilter } from './StandardFilter';
 export { default as StandardModal } from './StandardModal';
-export { default as StandardDragModal } from './StandardDragModal/Modal';
 export { default as Uploader } from './FormComp/Uploader';
 export { default as EditButton } from './FormComp/EditButton';
 // 基础控件
@@ -29,4 +28,9 @@ export * from './components';
 // 工具类
 export * from './utils';
 // 数据类
-export * from './data';
+export * from './data';
+// 上下文
+export * from './ConfigContext';
+// 图集
+export { default as ImageGallery } from './ImageGallery/index';
+export { default as ImagePreview } from './ImageGallery/ImagePreview';

package/es/utils/filterPermission.js

@@ -1,8 +1,8 @@
 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(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : 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 _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); }
 import _ from "lodash";
 // 按钮方法
@@ -18,7 +18,6 @@ var btnClickFunc = function btnClickFunc(fn) {
   if (typeof fn === 'function') {
     return fn.apply(void 0, paramsArr); // 表格列返回的是方法
   }
-
   return fn;
 };
 // 按钮是否禁用
@@ -34,7 +33,6 @@ var btnIsDisabled = function btnIsDisabled(isDisabled) {
   if (typeof isDisabled === 'function') {
     return isDisabled.apply(void 0, paramsArr); // 表格列返回的是方法
   }
-
   return isDisabled;
 };
 // 按钮是否隐藏
@@ -50,14 +48,13 @@ var btnIsHide = function btnIsHide(isHide) {
   if (typeof isHide === 'function') {
     return isHide.apply(void 0, paramsArr); // 表格列返回的是方法
   }
-
   return isHide;
 };
 // 重新组合数据(排除不包含在permissionCodes内及isHide数据
-var removeNoPermission = function removeNoPermission(array, permissionCodes, codes, params) {
+var _removeNoPermission = function removeNoPermission(array, permissionCodes, codes, params) {
   return Array.isArray(array) && array.filter(function (item) {
     if (item.children) {
-      item.children = removeNoPermission(item.children, permissionCodes, codes, params);
+      item.children = _removeNoPermission(item.children, permissionCodes, codes, params);
       if (item.children.length === 0) return false; // 如果子集合过滤为空时，不返当前数据
     }
     // permissionCodes未定义，则直接返回不进行过滤
@@ -83,11 +80,11 @@ var removeNoPermission = function removeNoPermission(array, permissionCodes, cod
         var _codes$matchIndex;
         // 如果有配置code，则使用func.code.js里面配置的名称
         resultItem = _objectSpread(_objectSpread(_objectSpread({}, resultItem), codes[matchIndex]), {}, {
-          icon: resultItem.icon || ((_codes$matchIndex = codes[matchIndex]) === null || _codes$matchIndex === void 0 ? void 0 : _codes$matchIndex.icon)
+          icon: resultItem.icon === '' || resultItem.icon === null ? resultItem.icon : resultItem.icon || ((_codes$matchIndex = codes[matchIndex]) === null || _codes$matchIndex === void 0 ? void 0 : _codes$matchIndex.icon)
         });
       }
     }
     return resultItem;
   });
 };
-export { removeNoPermission, btnIsHide, btnIsDisabled, btnClickFunc };
+export { _removeNoPermission as removeNoPermission, btnIsHide, btnIsDisabled, btnClickFunc };