fan-standard-comp 3.1.9 → 3.1.10

package/es/ButtonGroup/index.d.ts

@@ -17,6 +17,7 @@ export interface ButtonGroupOptionsProps {
     render?: (() => React.ReactNode) | React.ReactNode;
     confirmText?: any;
     confirmConfig?: any;
+    dropdownConfig?: any;
 }
 interface ButtonGroupProps {
     type?: 'button' | 'text';
@@ -25,6 +26,7 @@ interface ButtonGroupProps {
     permissionCodes?: string[];
     options?: ButtonGroupOptionsProps[];
     min?: number;
+    dropdownConfig?: Object;
 }
 declare const ButtonGroup: (props: ButtonGroupProps) => JSX.Element;
 export default ButtonGroup;

package/es/ButtonGroup/index.js

@@ -48,7 +48,9 @@ var ButtonGroup = function ButtonGroup(props) {
   } : _props$rowParams,
       _props$codes = props.codes,
       codes = _props$codes === void 0 ? funcCode.btnFuncCodes : _props$codes,
-      permissionCodes = props.permissionCodes;
+      permissionCodes = props.permissionCodes,
+      _props$dropdownConfig = props.dropdownConfig,
+      dropdownConfig = _props$dropdownConfig === void 0 ? {} : _props$dropdownConfig;
   var _props$options = props.options,
       options = _props$options === void 0 ? [] : _props$options,
       _props$min = props.min,
@@ -129,12 +131,12 @@ var ButtonGroup = function ButtonGroup(props) {
         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, {
+      return /*#__PURE__*/React.createElement(_Dropdown, Object.assign({
         overlay: buttonMenu(item.children),
         placement: "bottomRight"
-      }, /*#__PURE__*/React.createElement(_Button, {
+      }, (item === null || item === void 0 ? void 0 : item.dropdownConfig) || dropdownConfig || {}), /*#__PURE__*/React.createElement(_Button, {
         type: "primary"
-      }, item.exName || item.name, " ", /*#__PURE__*/React.createElement(SpecIcon, {
+      }, "ss", item.exName || item.name, " ", /*#__PURE__*/React.createElement(SpecIcon, {
         name: "down"
       })));
     }
@@ -152,7 +154,39 @@ var ButtonGroup = function ButtonGroup(props) {
       }),
       disabled: btnIsDisabled(disabled, rowParams)
     }), exName || name);
-  }; // 渲染文本形式多级菜单列表（用于表格）
+  };
+  /*const textMenuItems =  (group) => {
+    return (group || []).map((gItem: any, gIndex) => {
+      return {
+        disabled: btnIsDisabled(gItem.disabled, rowParams),
+        label: gItem.hasOwnProperty('confirmText') || gItem.hasOwnProperty('confirmConfig') ?
+          // @ts-ignore
+          <a disabled={btnIsDisabled(gItem.disabled, rowParams)}
+             onClick={gItem.fn ? () => {
+               setPopVisibleIndex(rowParams.rowIndex)
+               setPopRow(gItem)
+             } : null}>
+            {gItem.render ? gItem.render(...Object.keys(rowParams).map((pItem) => rowParams[pItem])) : (gItem.exName || gItem.name)}
+          </a>
+          : <a className="spec-button-group-text"
+               onClick={gItem.fn ? () => gItem.fn(...Object.keys(rowParams).map((pItem) => rowParams[pItem])) : null}
+            // @ts-ignore
+               disabled={btnIsDisabled(gItem.disabled, rowParams)}>
+            {gItem.render ? gItem.render(...Object.keys(rowParams).map((pItem) => rowParams[pItem])) : (gItem.exName || gItem.name)}
+          </a>,
+        key: gIndex + (gItem.exName || gItem.name),
+        children: gItem.children ? (gItem.children || []).map((child: any, childIndex: number) => {
+          return {
+            label: <a onClick={child.fn ? () => child.fn(...Object.keys(rowParams).map((pItem) => rowParams[pItem])) : null}>
+              {child.render ? child.render(...Object.keys(rowParams).map((pItem) => rowParams[pItem])) : (child.exName || child.name)}
+            </a>,
+            key: childIndex
+          }
+        }) : undefined
+      }
+    })
+  }*/
+  // 渲染文本形式多级菜单列表（用于表格）
 
 
   var textMenu = function textMenu(group) {
@@ -210,10 +244,10 @@ var ButtonGroup = function ButtonGroup(props) {
 
   var RenderTextList = function RenderTextList(item) {
     if (Array.isArray(item.children) && item.children.length > 0) {
-      return /*#__PURE__*/React.createElement(_Dropdown, {
+      return /*#__PURE__*/React.createElement(_Dropdown, Object.assign({
         overlay: textMenu(item.children),
         placement: "bottomRight"
-      }, /*#__PURE__*/React.createElement("a", {
+      }, (item === null || item === void 0 ? void 0 : item.dropdownConfig) || dropdownConfig || {}), /*#__PURE__*/React.createElement("a", {
         className: "spec-button-group-text"
       }, item.render ? item.render.apply(item, _toConsumableArray(Object.keys(rowParams).map(function (pItem) {
         return rowParams[pItem];
@@ -314,10 +348,10 @@ var ButtonGroup = function ButtonGroup(props) {
       className: "spec-button-group"
     }, forGroup.map(function (item, index) {
       return index < min - 1 ? renderDisplayButton(item, index) : null;
-    }), type === 'button' ? /*#__PURE__*/React.createElement(_Dropdown, {
+    }), type === 'button' ? /*#__PURE__*/React.createElement(_Dropdown, Object.assign({
       overlay: buttonMenu(forDrop),
       placement: "bottomRight"
-    }, /*#__PURE__*/React.createElement(_Button, {
+    }, dropdownConfig), /*#__PURE__*/React.createElement(_Button, {
       type: "primary"
     }, "\u66F4\u591A ", /*#__PURE__*/React.createElement(SpecIcon, {
       name: "down"
@@ -356,10 +390,10 @@ var ButtonGroup = function ButtonGroup(props) {
           })));
         }
       }
-    }), /*#__PURE__*/React.createElement(_Dropdown, {
+    }), /*#__PURE__*/React.createElement(_Dropdown, Object.assign({
       overlay: textMenu(forDrop),
       placement: "bottomRight"
-    }, /*#__PURE__*/React.createElement("a", {
+    }, dropdownConfig), /*#__PURE__*/React.createElement("a", {
       className: "spec-button-group-text"
     }, "\u66F4\u591A ", /*#__PURE__*/React.createElement(DownOutlined, null)))));
   }

package/es/FormComp/FieldComponent/RefactorTreeSelect.js

@@ -242,7 +242,7 @@ var RefactorTreeSelect = /*#__PURE__*/React.forwardRef(function (props, ref) {
   }
 
   return /*#__PURE__*/React.createElement(React.Fragment, null, showFullLevel && !otherProps.showCheckedStrategy ? /*#__PURE__*/React.createElement("div", {
-    className: "refactor-tree-select ".concat(disabled ? 'refactor-disabled' : ''),
+    className: "refactor-tree-select ".concat(disabled ? 'refactor-disabled' : '').concat(otherProps.size === 'small' ? ' refactor-tree-select-sm' : ''),
     title: fullLevelName || ''
   }, renderTreeSelectNode(), /*#__PURE__*/React.createElement("span", {
     className: "refactor-tree-select-extra"

package/es/FormComp/FieldComponent/style/index.less

@@ -3,6 +3,12 @@
 
 .refactor-tree-select {
   position: relative;
+  &.refactor-tree-select-sm {
+    .refactor-tree-select-extra {
+      height: 22px;
+      line-height: 20px;
+    }
+  }
   .ant-select {
     z-index: 2;
     .ant-select-selector {

package/es/StandardFilter/index.d.ts

@@ -4,6 +4,7 @@ import { ButtonGroupOptionsProps } from '../ButtonGroup/index';
 import './style/index.less';
 export interface StandardFilterProps {
     buttonGroup?: ButtonGroupOptionsProps[];
+    buttonGroupConfig?: Object;
     formItemGroup?: FieldComponentProps[];
     confirmText?: string;
     onFilterSearch?: (value?: object) => void;

package/es/StandardFilter/index.js

@@ -201,7 +201,8 @@ var StandardFilter = /*#__PURE__*/function (_React$Component) {
           permissionCodes = _this$props2.permissionCodes,
           confirmText = _this$props2.confirmText,
           cancelText = _this$props2.cancelText,
-          onFilterSearch = _this$props2.onFilterSearch; // const { recombinationGroup } = this.state;
+          onFilterSearch = _this$props2.onFilterSearch,
+          buttonGroupConfig = _this$props2.buttonGroupConfig; // const { recombinationGroup } = this.state;
 
       return /*#__PURE__*/React.createElement(_Form, {
         name: "standard-filter-form",
@@ -234,7 +235,8 @@ var StandardFilter = /*#__PURE__*/function (_React$Component) {
         options: buttonGroup,
         min: min,
         codes: codes,
-        permissionCodes: permissionCodes
+        permissionCodes: permissionCodes,
+        dropdownConfig: buttonGroupConfig
       })) : null));
     }
   }], [{

package/es/StandardModal/index.js

@@ -194,7 +194,7 @@ var StandardModal = function StandardModal(props) {
         formItemGroup = props.formItemGroup,
         onSubmit = props.onSubmit;
 
-    if (type === 'form') {
+    if (type === 'form' || type === 'gridForm') {
       modalForm.validateFields().then(function (values) {
         if (Object.prototype.hasOwnProperty.call(values, 'false')) {
           delete values.false; // 自定义结构会莫名的出来一个false字段
@@ -214,7 +214,7 @@ var StandardModal = function StandardModal(props) {
         } // console.error('表单填写有误', errorInfo, '第一条数据',errorInfo.errorFields[0].name[0])
 
       });
-    } else if (type === 'stepForm' || type === 'tabForm' || type === 'gridForm') {
+    } else if (type === 'stepForm' || type === 'tabForm') {
       // onSubmit && onSubmit()
       formChild.validateFields().then(function (values) {
         // console.log(values)

package/es/StandardTable/index.js

@@ -81,7 +81,8 @@ var StandardTable = function StandardTable(props) {
                   text: text,
                   record: record,
                   rowIndex: rowIndex
-                }
+                },
+                dropdownConfig: colItem.buttonGroupConfig || {}
               });
             } else {
               return buttonGroup;

package/lib/ButtonGroup/index.d.ts

@@ -17,6 +17,7 @@ export interface ButtonGroupOptionsProps {
     render?: (() => React.ReactNode) | React.ReactNode;
     confirmText?: any;
     confirmConfig?: any;
+    dropdownConfig?: any;
 }
 interface ButtonGroupProps {
     type?: 'button' | 'text';
@@ -25,6 +26,7 @@ interface ButtonGroupProps {
     permissionCodes?: string[];
     options?: ButtonGroupOptionsProps[];
     min?: number;
+    dropdownConfig?: Object;
 }
 declare const ButtonGroup: (props: ButtonGroupProps) => JSX.Element;
 export default ButtonGroup;

package/lib/ButtonGroup/index.js

@@ -78,7 +78,9 @@ var ButtonGroup = function ButtonGroup(props) {
   } : _props$rowParams,
       _props$codes = props.codes,
       codes = _props$codes === void 0 ? _index3.funcCode.btnFuncCodes : _props$codes,
-      permissionCodes = props.permissionCodes;
+      permissionCodes = props.permissionCodes,
+      _props$dropdownConfig = props.dropdownConfig,
+      dropdownConfig = _props$dropdownConfig === void 0 ? {} : _props$dropdownConfig;
   var _props$options = props.options,
       options = _props$options === void 0 ? [] : _props$options,
       _props$min = props.min,
@@ -159,12 +161,12 @@ var ButtonGroup = function ButtonGroup(props) {
         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, {
+      return /*#__PURE__*/_react.default.createElement(_dropdown.default, Object.assign({
         overlay: buttonMenu(item.children),
         placement: "bottomRight"
-      }, /*#__PURE__*/_react.default.createElement(_button.default, {
+      }, (item === null || item === void 0 ? void 0 : item.dropdownConfig) || dropdownConfig || {}), /*#__PURE__*/_react.default.createElement(_button.default, {
         type: "primary"
-      }, item.exName || item.name, " ", /*#__PURE__*/_react.default.createElement(_index2.default, {
+      }, "ss", item.exName || item.name, " ", /*#__PURE__*/_react.default.createElement(_index2.default, {
         name: "down"
       })));
     }
@@ -182,7 +184,39 @@ var ButtonGroup = function ButtonGroup(props) {
       }),
       disabled: (0, _filterPermission.btnIsDisabled)(disabled, rowParams)
     }), exName || name);
-  }; // 渲染文本形式多级菜单列表（用于表格）
+  };
+  /*const textMenuItems =  (group) => {
+    return (group || []).map((gItem: any, gIndex) => {
+      return {
+        disabled: btnIsDisabled(gItem.disabled, rowParams),
+        label: gItem.hasOwnProperty('confirmText') || gItem.hasOwnProperty('confirmConfig') ?
+          // @ts-ignore
+          <a disabled={btnIsDisabled(gItem.disabled, rowParams)}
+             onClick={gItem.fn ? () => {
+               setPopVisibleIndex(rowParams.rowIndex)
+               setPopRow(gItem)
+             } : null}>
+            {gItem.render ? gItem.render(...Object.keys(rowParams).map((pItem) => rowParams[pItem])) : (gItem.exName || gItem.name)}
+          </a>
+          : <a className="spec-button-group-text"
+               onClick={gItem.fn ? () => gItem.fn(...Object.keys(rowParams).map((pItem) => rowParams[pItem])) : null}
+            // @ts-ignore
+               disabled={btnIsDisabled(gItem.disabled, rowParams)}>
+            {gItem.render ? gItem.render(...Object.keys(rowParams).map((pItem) => rowParams[pItem])) : (gItem.exName || gItem.name)}
+          </a>,
+        key: gIndex + (gItem.exName || gItem.name),
+        children: gItem.children ? (gItem.children || []).map((child: any, childIndex: number) => {
+          return {
+            label: <a onClick={child.fn ? () => child.fn(...Object.keys(rowParams).map((pItem) => rowParams[pItem])) : null}>
+              {child.render ? child.render(...Object.keys(rowParams).map((pItem) => rowParams[pItem])) : (child.exName || child.name)}
+            </a>,
+            key: childIndex
+          }
+        }) : undefined
+      }
+    })
+  }*/
+  // 渲染文本形式多级菜单列表（用于表格）
 
 
   var textMenu = function textMenu(group) {
@@ -240,10 +274,10 @@ var ButtonGroup = function ButtonGroup(props) {
 
   var RenderTextList = function RenderTextList(item) {
     if (Array.isArray(item.children) && item.children.length > 0) {
-      return /*#__PURE__*/_react.default.createElement(_dropdown.default, {
+      return /*#__PURE__*/_react.default.createElement(_dropdown.default, Object.assign({
         overlay: textMenu(item.children),
         placement: "bottomRight"
-      }, /*#__PURE__*/_react.default.createElement("a", {
+      }, (item === null || item === void 0 ? void 0 : item.dropdownConfig) || dropdownConfig || {}), /*#__PURE__*/_react.default.createElement("a", {
         className: "spec-button-group-text"
       }, item.render ? item.render.apply(item, _toConsumableArray(Object.keys(rowParams).map(function (pItem) {
         return rowParams[pItem];
@@ -344,10 +378,10 @@ var ButtonGroup = function ButtonGroup(props) {
       className: "spec-button-group"
     }, forGroup.map(function (item, index) {
       return index < min - 1 ? renderDisplayButton(item, index) : null;
-    }), type === 'button' ? /*#__PURE__*/_react.default.createElement(_dropdown.default, {
+    }), type === 'button' ? /*#__PURE__*/_react.default.createElement(_dropdown.default, Object.assign({
       overlay: buttonMenu(forDrop),
       placement: "bottomRight"
-    }, /*#__PURE__*/_react.default.createElement(_button.default, {
+    }, dropdownConfig), /*#__PURE__*/_react.default.createElement(_button.default, {
       type: "primary"
     }, "\u66F4\u591A ", /*#__PURE__*/_react.default.createElement(_index2.default, {
       name: "down"
@@ -386,10 +420,10 @@ var ButtonGroup = function ButtonGroup(props) {
           })));
         }
       }
-    }), /*#__PURE__*/_react.default.createElement(_dropdown.default, {
+    }), /*#__PURE__*/_react.default.createElement(_dropdown.default, Object.assign({
       overlay: textMenu(forDrop),
       placement: "bottomRight"
-    }, /*#__PURE__*/_react.default.createElement("a", {
+    }, dropdownConfig), /*#__PURE__*/_react.default.createElement("a", {
       className: "spec-button-group-text"
     }, "\u66F4\u591A ", /*#__PURE__*/_react.default.createElement(_icons.DownOutlined, null)))));
   }

package/lib/FormComp/FieldComponent/RefactorTreeSelect.js

@@ -263,7 +263,7 @@ var RefactorTreeSelect = /*#__PURE__*/_react.default.forwardRef(function (props,
   }
 
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, showFullLevel && !otherProps.showCheckedStrategy ? /*#__PURE__*/_react.default.createElement("div", {
-    className: "refactor-tree-select ".concat(disabled ? 'refactor-disabled' : ''),
+    className: "refactor-tree-select ".concat(disabled ? 'refactor-disabled' : '').concat(otherProps.size === 'small' ? ' refactor-tree-select-sm' : ''),
     title: fullLevelName || ''
   }, renderTreeSelectNode(), /*#__PURE__*/_react.default.createElement("span", {
     className: "refactor-tree-select-extra"

package/lib/FormComp/FieldComponent/style/index.less

@@ -3,6 +3,12 @@
 
 .refactor-tree-select {
   position: relative;
+  &.refactor-tree-select-sm {
+    .refactor-tree-select-extra {
+      height: 22px;
+      line-height: 20px;
+    }
+  }
   .ant-select {
     z-index: 2;
     .ant-select-selector {

package/lib/StandardFilter/index.d.ts

@@ -4,6 +4,7 @@ import { ButtonGroupOptionsProps } from '../ButtonGroup/index';
 import './style/index.less';
 export interface StandardFilterProps {
     buttonGroup?: ButtonGroupOptionsProps[];
+    buttonGroupConfig?: Object;
     formItemGroup?: FieldComponentProps[];
     confirmText?: string;
     onFilterSearch?: (value?: object) => void;

package/lib/StandardFilter/index.js

@@ -217,7 +217,8 @@ var StandardFilter = /*#__PURE__*/function (_React$Component) {
           permissionCodes = _this$props2.permissionCodes,
           confirmText = _this$props2.confirmText,
           cancelText = _this$props2.cancelText,
-          onFilterSearch = _this$props2.onFilterSearch; // const { recombinationGroup } = this.state;
+          onFilterSearch = _this$props2.onFilterSearch,
+          buttonGroupConfig = _this$props2.buttonGroupConfig; // const { recombinationGroup } = this.state;
 
       return /*#__PURE__*/_react.default.createElement(_form.default, {
         name: "standard-filter-form",
@@ -250,7 +251,8 @@ var StandardFilter = /*#__PURE__*/function (_React$Component) {
         options: buttonGroup,
         min: min,
         codes: codes,
-        permissionCodes: permissionCodes
+        permissionCodes: permissionCodes,
+        dropdownConfig: buttonGroupConfig
       })) : null));
     }
   }], [{

package/lib/StandardModal/index.js

@@ -227,7 +227,7 @@ var StandardModal = function StandardModal(props) {
         formItemGroup = props.formItemGroup,
         onSubmit = props.onSubmit;
 
-    if (type === 'form') {
+    if (type === 'form' || type === 'gridForm') {
       modalForm.validateFields().then(function (values) {
         if (Object.prototype.hasOwnProperty.call(values, 'false')) {
           delete values.false; // 自定义结构会莫名的出来一个false字段
@@ -247,7 +247,7 @@ var StandardModal = function StandardModal(props) {
         } // console.error('表单填写有误', errorInfo, '第一条数据',errorInfo.errorFields[0].name[0])
 
       });
-    } else if (type === 'stepForm' || type === 'tabForm' || type === 'gridForm') {
+    } else if (type === 'stepForm' || type === 'tabForm') {
       // onSubmit && onSubmit()
       formChild.validateFields().then(function (values) {
         // console.log(values)

package/lib/StandardTable/index.js

@@ -97,7 +97,8 @@ var StandardTable = function StandardTable(props) {
                   text: text,
                   record: record,
                   rowIndex: rowIndex
-                }
+                },
+                dropdownConfig: colItem.buttonGroupConfig || {}
               });
             } else {
               return buttonGroup;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fan-standard-comp",
-  "version": "3.1.9",
+  "version": "3.1.10",
   "description": "FZ standard-comp,basic of antd4.0 and custom component.",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -26,7 +26,7 @@
   "devDependencies": {
     "@ant-design/icons": "^4.3.0",
     "@types/classnames": "^2.2.11",
-    "antd": "4.24.7",
+    "antd": "4.24.11",
     "babel-loader": "^8.2.2",
     "babel-plugin-import": "^1.13.3",
     "classnames": "^2.2.6",
@@ -38,11 +38,11 @@
     "webpack-cli": "4.3.1"
   },
   "dependencies": {
+    "ant-design-draggable-modal": "^1.0.0",
     "css-loader": "3.6.0",
     "file-loader": "6.2.0",
     "less-loader": "5.0.0",
     "style-loader": "1.3.0",
-    "webpack": "4.44.1",
-    "ant-design-draggable-modal": "^1.0.0"
+    "webpack": "4.44.1"
   }
 }