fan-standard-comp 3.0.15 → 3.0.17

package/es/ButtonGroup/index.js

@@ -27,6 +27,7 @@ function _iterableToArrayLimit(arr, i) { if (typeof Symbol === "undefined" || !(
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
+import { __rest } from "tslib";
 import React, { useState, useEffect } from "react";
 import { IconNode } from "../components/index";
 import SpecIcon from "../SpecIcon/index";
@@ -90,11 +91,11 @@ var ButtonGroup = function ButtonGroup(props) {
         }, item.children.map(function (child, childIndex) {
           return /*#__PURE__*/React.createElement(_Menu.Item, {
             key: childIndex
-          }, /*#__PURE__*/React.createElement("a", Object.assign({
+          }, /*#__PURE__*/React.createElement("a", {
             onClick: child.fn ? function () {
               return child.fn(child);
             } : null
-          }, child), /*#__PURE__*/React.createElement(IconNode, {
+          }, /*#__PURE__*/React.createElement(IconNode, {
             icon: child.icon
           }), " ", child.exName || child.name));
         }));
@@ -102,11 +103,11 @@ var ButtonGroup = function ButtonGroup(props) {
 
       return /*#__PURE__*/React.createElement(_Menu.Item, {
         key: index
-      }, /*#__PURE__*/React.createElement("a", Object.assign({
+      }, /*#__PURE__*/React.createElement("a", {
         onClick: item.fn ? function () {
           return item.fn(item);
         } : null
-      }, item), /*#__PURE__*/React.createElement(IconNode, {
+      }, /*#__PURE__*/React.createElement(IconNode, {
         icon: item.icon
       }), " ", item.exName || item.name));
     }));
@@ -114,6 +115,19 @@ var ButtonGroup = function ButtonGroup(props) {
 
 
   var RenderButtonList = function RenderButtonList(item) {
+    var exName = item.exName,
+        name = item.name,
+        type = item.type,
+        icon = item.icon,
+        ghost = item.ghost,
+        danger = item.danger,
+        disabled = item.disabled,
+        loading = item.loading,
+        fn = item.fn,
+        code = item.code,
+        rowParams = item.rowParams,
+        others = __rest(item, ["exName", "name", "type", "icon", "ghost", "danger", "disabled", "loading", "fn", "code", "rowParams"]);
+
     if (Array.isArray(item.children) && item.children.length > 0) {
       return /*#__PURE__*/React.createElement(_Dropdown, {
         overlay: buttonMenu(item.children),
@@ -126,16 +140,18 @@ var ButtonGroup = function ButtonGroup(props) {
     }
 
     return /*#__PURE__*/React.createElement(_Button, Object.assign({
-      type: item.type ? item.type : 'primary',
-      danger: item.danger,
+      type: type || 'primary',
+      danger: danger,
+      ghost: ghost,
+      onClick: fn ? function () {
+        return fn(item);
+      } : null
+    }, others, {
       icon: /*#__PURE__*/React.createElement(IconNode, {
-        icon: item.icon
+        icon: icon
       }),
-      disabled: btnIsDisabled(item.disabled, rowParams),
-      onClick: item.fn ? function () {
-        return item.fn(item);
-      } : null
-    }, item), item.exName || item.name);
+      disabled: btnIsDisabled(disabled, rowParams)
+    }), exName || name);
   }; // 渲染文本形式多级菜单列表（用于表格）
 
 
@@ -150,13 +166,13 @@ var ButtonGroup = function ButtonGroup(props) {
         }, gItem.children.map(function (child, childIndex) {
           return /*#__PURE__*/React.createElement(_Menu.Item, {
             key: childIndex
-          }, /*#__PURE__*/React.createElement("a", Object.assign({
+          }, /*#__PURE__*/React.createElement("a", {
             onClick: child.fn ? function () {
               return child.fn.apply(child, _toConsumableArray(Object.keys(rowParams).map(function (pItem) {
                 return rowParams[pItem];
               })));
             } : null
-          }, child), child.render ? child.render.apply(child, _toConsumableArray(Object.keys(rowParams).map(function (pItem) {
+          }, child.render ? child.render.apply(child, _toConsumableArray(Object.keys(rowParams).map(function (pItem) {
             return rowParams[pItem];
           }))) : child.exName || child.name));
         }));
@@ -168,15 +184,15 @@ var ButtonGroup = function ButtonGroup(props) {
       }, gItem.hasOwnProperty('confirmText') || gItem.hasOwnProperty('confirmConfig') ?
       /*#__PURE__*/
       // @ts-ignore
-      React.createElement("a", Object.assign({
+      React.createElement("a", {
         disabled: btnIsDisabled(gItem.disabled, rowParams),
         onClick: gItem.fn ? function () {
           setPopVisibleIndex(rowParams.rowIndex);
           setPopRow(gItem);
         } : null
-      }, gItem), gItem.render ? gItem.render.apply(gItem, _toConsumableArray(Object.keys(rowParams).map(function (pItem) {
+      }, gItem.render ? gItem.render.apply(gItem, _toConsumableArray(Object.keys(rowParams).map(function (pItem) {
         return rowParams[pItem];
-      }))) : gItem.exName || gItem.name) : /*#__PURE__*/React.createElement("a", Object.assign({
+      }))) : gItem.exName || gItem.name) : /*#__PURE__*/React.createElement("a", {
         className: "spec-button-group-text",
         onClick: gItem.fn ? function () {
           return gItem.fn.apply(gItem, _toConsumableArray(Object.keys(rowParams).map(function (pItem) {
@@ -185,7 +201,7 @@ var ButtonGroup = function ButtonGroup(props) {
         } : null,
         // @ts-ignore
         disabled: btnIsDisabled(gItem.disabled, rowParams)
-      }, gItem), gItem.render ? gItem.render.apply(gItem, _toConsumableArray(Object.keys(rowParams).map(function (pItem) {
+      }, gItem.render ? gItem.render.apply(gItem, _toConsumableArray(Object.keys(rowParams).map(function (pItem) {
         return rowParams[pItem];
       }))) : gItem.exName || gItem.name));
     }));
@@ -261,14 +277,16 @@ var ButtonGroup = function ButtonGroup(props) {
 
 
   var renderDisplayButton = function renderDisplayButton(item, index) {
+    /*渲染自定义*/
     if (item.render) {
       return /*#__PURE__*/React.createElement(React.Fragment, null, typeof item.render === 'function' ? item.render.apply(item, _toConsumableArray(Object.keys(rowParams).map(function (pItem) {
         return rowParams[pItem];
       }))) : item.render);
     }
+    /*渲染按钮形式*/
+
 
     if (type === 'button') {
-      /*渲染按钮形式*/
       return /*#__PURE__*/React.createElement(RenderButtonList, Object.assign({
         key: index
       }, item, {

package/es/FormComp/FieldComponent/index.d.ts

@@ -14,7 +14,7 @@ export interface FieldComponentProps {
     value?: any;
     protoConfig?: any;
     onChange?: (value?: any, option?: any) => void;
-    selectOptions?: PropTypes.ReactNodeArray;
+    selectOptions?: any[];
     selectOptionName?: OptionNameProps;
     treeData?: PropTypes.ReactNodeArray;
     treeOptionName?: OptionNameProps;

package/es/FormComp/Uploader/index.js

@@ -156,7 +156,7 @@ var Uploader = /*#__PURE__*/React.forwardRef(function (props, ref) {
     var isLtSize = file.size < size;
 
     if (!isLtSize) {
-      _message.error("\u6587\u4EF6\u5927\u5C0F\u4E0D\u80FD\u8D85\u8FC7".concat(Math.round(size / 1024 * 100) / 100, "MB!"));
+      _message.error("\u6587\u4EF6\u5927\u5C0F\u4E0D\u80FD\u8D85\u8FC7".concat(Math.round(size / 1024 / 1024 * 100) / 100, "MB!"));
 
       return false;
     }

package/es/StandardModal/index.js

@@ -324,23 +324,34 @@ var StandardModal = function StandardModal(props) {
 
     if (footerButtonGroup) {
       if (Array.isArray(footerButtonGroup)) {
-        if (footerButtonGroup.length === 0) return /*#__PURE__*/React.createElement("div", null, "\u6309\u94AE\u7EC4\u5408\u914D\u7F6E\u4E3A\u7A7A");
+        if (footerButtonGroup.length === 0) return null; // <div>按钮组合配置为空</div>
+
         return /*#__PURE__*/React.createElement(React.Fragment, null, footerButtonGroup.map(function (item) {
           if (_typeof(item) === 'object') {
             if (item.isHide) return null;
+
+            var name = item.name,
+                _type = item.type,
+                icon = item.icon,
+                ghost = item.ghost,
+                disabled = item.disabled,
+                loading = item.loading,
+                fn = item.fn,
+                others = __rest(item, ["name", "type", "icon", "ghost", "disabled", "loading", "fn"]);
+
             return /*#__PURE__*/React.createElement(_Button, Object.assign({
-              key: item.name,
-              type: item.type ? item.type : 'primary',
+              key: name,
+              type: _type || 'primary',
               icon: /*#__PURE__*/React.createElement(IconNode, {
-                icon: item.icon
+                icon: icon
               }),
-              ghost: item.ghost,
-              disabled: item.disabled,
-              loading: item.loading,
-              onClick: item.fn ? function (e) {
-                return item.fn(item, modalForm, props, e);
+              ghost: ghost,
+              disabled: disabled,
+              loading: loading,
+              onClick: fn ? function (e) {
+                return fn(item, modalForm, props, e);
               } : null
-            }, item), item.name);
+            }, others), name);
           } else {
             return item; // 如果是DOM，则直接渲染
           }

package/lib/ButtonGroup/index.js

@@ -23,6 +23,8 @@ require("antd/es/menu/style");
 
 var _menu = _interopRequireDefault(require("antd/es/menu"));
 
+var _tslib = require("tslib");
+
 var _react = _interopRequireWildcard(require("react"));
 
 var _index = require("../components/index");
@@ -119,11 +121,11 @@ var ButtonGroup = function ButtonGroup(props) {
         }, item.children.map(function (child, childIndex) {
           return /*#__PURE__*/_react.default.createElement(_menu.default.Item, {
             key: childIndex
-          }, /*#__PURE__*/_react.default.createElement("a", Object.assign({
+          }, /*#__PURE__*/_react.default.createElement("a", {
             onClick: child.fn ? function () {
               return child.fn(child);
             } : null
-          }, child), /*#__PURE__*/_react.default.createElement(_index.IconNode, {
+          }, /*#__PURE__*/_react.default.createElement(_index.IconNode, {
             icon: child.icon
           }), " ", child.exName || child.name));
         }));
@@ -131,11 +133,11 @@ var ButtonGroup = function ButtonGroup(props) {
 
       return /*#__PURE__*/_react.default.createElement(_menu.default.Item, {
         key: index
-      }, /*#__PURE__*/_react.default.createElement("a", Object.assign({
+      }, /*#__PURE__*/_react.default.createElement("a", {
         onClick: item.fn ? function () {
           return item.fn(item);
         } : null
-      }, item), /*#__PURE__*/_react.default.createElement(_index.IconNode, {
+      }, /*#__PURE__*/_react.default.createElement(_index.IconNode, {
         icon: item.icon
       }), " ", item.exName || item.name));
     }));
@@ -143,6 +145,19 @@ var ButtonGroup = function ButtonGroup(props) {
 
 
   var RenderButtonList = function RenderButtonList(item) {
+    var exName = item.exName,
+        name = item.name,
+        type = item.type,
+        icon = item.icon,
+        ghost = item.ghost,
+        danger = item.danger,
+        disabled = item.disabled,
+        loading = item.loading,
+        fn = item.fn,
+        code = item.code,
+        rowParams = item.rowParams,
+        others = (0, _tslib.__rest)(item, ["exName", "name", "type", "icon", "ghost", "danger", "disabled", "loading", "fn", "code", "rowParams"]);
+
     if (Array.isArray(item.children) && item.children.length > 0) {
       return /*#__PURE__*/_react.default.createElement(_dropdown.default, {
         overlay: buttonMenu(item.children),
@@ -155,16 +170,18 @@ var ButtonGroup = function ButtonGroup(props) {
     }
 
     return /*#__PURE__*/_react.default.createElement(_button.default, Object.assign({
-      type: item.type ? item.type : 'primary',
-      danger: item.danger,
+      type: type || 'primary',
+      danger: danger,
+      ghost: ghost,
+      onClick: fn ? function () {
+        return fn(item);
+      } : null
+    }, others, {
       icon: /*#__PURE__*/_react.default.createElement(_index.IconNode, {
-        icon: item.icon
+        icon: icon
       }),
-      disabled: (0, _filterPermission.btnIsDisabled)(item.disabled, rowParams),
-      onClick: item.fn ? function () {
-        return item.fn(item);
-      } : null
-    }, item), item.exName || item.name);
+      disabled: (0, _filterPermission.btnIsDisabled)(disabled, rowParams)
+    }), exName || name);
   }; // 渲染文本形式多级菜单列表（用于表格）
 
 
@@ -179,13 +196,13 @@ var ButtonGroup = function ButtonGroup(props) {
         }, gItem.children.map(function (child, childIndex) {
           return /*#__PURE__*/_react.default.createElement(_menu.default.Item, {
             key: childIndex
-          }, /*#__PURE__*/_react.default.createElement("a", Object.assign({
+          }, /*#__PURE__*/_react.default.createElement("a", {
             onClick: child.fn ? function () {
               return child.fn.apply(child, _toConsumableArray(Object.keys(rowParams).map(function (pItem) {
                 return rowParams[pItem];
               })));
             } : null
-          }, child), child.render ? child.render.apply(child, _toConsumableArray(Object.keys(rowParams).map(function (pItem) {
+          }, child.render ? child.render.apply(child, _toConsumableArray(Object.keys(rowParams).map(function (pItem) {
             return rowParams[pItem];
           }))) : child.exName || child.name));
         }));
@@ -197,15 +214,15 @@ var ButtonGroup = function ButtonGroup(props) {
       }, gItem.hasOwnProperty('confirmText') || gItem.hasOwnProperty('confirmConfig') ?
       /*#__PURE__*/
       // @ts-ignore
-      _react.default.createElement("a", Object.assign({
+      _react.default.createElement("a", {
         disabled: (0, _filterPermission.btnIsDisabled)(gItem.disabled, rowParams),
         onClick: gItem.fn ? function () {
           setPopVisibleIndex(rowParams.rowIndex);
           setPopRow(gItem);
         } : null
-      }, gItem), gItem.render ? gItem.render.apply(gItem, _toConsumableArray(Object.keys(rowParams).map(function (pItem) {
+      }, gItem.render ? gItem.render.apply(gItem, _toConsumableArray(Object.keys(rowParams).map(function (pItem) {
         return rowParams[pItem];
-      }))) : gItem.exName || gItem.name) : /*#__PURE__*/_react.default.createElement("a", Object.assign({
+      }))) : gItem.exName || gItem.name) : /*#__PURE__*/_react.default.createElement("a", {
         className: "spec-button-group-text",
         onClick: gItem.fn ? function () {
           return gItem.fn.apply(gItem, _toConsumableArray(Object.keys(rowParams).map(function (pItem) {
@@ -214,7 +231,7 @@ var ButtonGroup = function ButtonGroup(props) {
         } : null,
         // @ts-ignore
         disabled: (0, _filterPermission.btnIsDisabled)(gItem.disabled, rowParams)
-      }, gItem), gItem.render ? gItem.render.apply(gItem, _toConsumableArray(Object.keys(rowParams).map(function (pItem) {
+      }, gItem.render ? gItem.render.apply(gItem, _toConsumableArray(Object.keys(rowParams).map(function (pItem) {
         return rowParams[pItem];
       }))) : gItem.exName || gItem.name));
     }));
@@ -290,14 +307,16 @@ var ButtonGroup = function ButtonGroup(props) {
 
 
   var renderDisplayButton = function renderDisplayButton(item, index) {
+    /*渲染自定义*/
     if (item.render) {
       return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, typeof item.render === 'function' ? item.render.apply(item, _toConsumableArray(Object.keys(rowParams).map(function (pItem) {
         return rowParams[pItem];
       }))) : item.render);
     }
+    /*渲染按钮形式*/
+
 
     if (type === 'button') {
-      /*渲染按钮形式*/
       return /*#__PURE__*/_react.default.createElement(RenderButtonList, Object.assign({
         key: index
       }, item, {

package/lib/FormComp/FieldComponent/index.d.ts

@@ -14,7 +14,7 @@ export interface FieldComponentProps {
     value?: any;
     protoConfig?: any;
     onChange?: (value?: any, option?: any) => void;
-    selectOptions?: PropTypes.ReactNodeArray;
+    selectOptions?: any[];
     selectOptionName?: OptionNameProps;
     treeData?: PropTypes.ReactNodeArray;
     treeOptionName?: OptionNameProps;

package/lib/FormComp/Uploader/index.js

@@ -180,7 +180,7 @@ var Uploader = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     var isLtSize = file.size < size;
 
     if (!isLtSize) {
-      _message2.default.error("\u6587\u4EF6\u5927\u5C0F\u4E0D\u80FD\u8D85\u8FC7".concat(Math.round(size / 1024 * 100) / 100, "MB!"));
+      _message2.default.error("\u6587\u4EF6\u5927\u5C0F\u4E0D\u80FD\u8D85\u8FC7".concat(Math.round(size / 1024 / 1024 * 100) / 100, "MB!"));
 
       return false;
     }

package/lib/StandardModal/index.js

@@ -353,23 +353,32 @@ var StandardModal = function StandardModal(props) {
 
     if (footerButtonGroup) {
       if (Array.isArray(footerButtonGroup)) {
-        if (footerButtonGroup.length === 0) return /*#__PURE__*/_react.default.createElement("div", null, "\u6309\u94AE\u7EC4\u5408\u914D\u7F6E\u4E3A\u7A7A");
+        if (footerButtonGroup.length === 0) return null; // <div>按钮组合配置为空</div>
+
         return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, footerButtonGroup.map(function (item) {
           if (_typeof(item) === 'object') {
             if (item.isHide) return null;
+            var name = item.name,
+                _type = item.type,
+                icon = item.icon,
+                ghost = item.ghost,
+                disabled = item.disabled,
+                loading = item.loading,
+                fn = item.fn,
+                others = (0, _tslib.__rest)(item, ["name", "type", "icon", "ghost", "disabled", "loading", "fn"]);
             return /*#__PURE__*/_react.default.createElement(_button.default, Object.assign({
-              key: item.name,
-              type: item.type ? item.type : 'primary',
+              key: name,
+              type: _type || 'primary',
               icon: /*#__PURE__*/_react.default.createElement(_IconNode.default, {
-                icon: item.icon
+                icon: icon
               }),
-              ghost: item.ghost,
-              disabled: item.disabled,
-              loading: item.loading,
-              onClick: item.fn ? function (e) {
-                return item.fn(item, modalForm, props, e);
+              ghost: ghost,
+              disabled: disabled,
+              loading: loading,
+              onClick: fn ? function (e) {
+                return fn(item, modalForm, props, e);
               } : null
-            }, item), item.name);
+            }, others), name);
           } else {
             return item; // 如果是DOM，则直接渲染
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fan-standard-comp",
-  "version": "3.0.15",
+  "version": "3.0.17",
   "description": "FZ standard-comp,basic of antd4.0 and custom component.",
   "main": "lib/index.js",
   "module": "es/index.js",