fan-standard-comp 3.0.13 → 3.1.0-beta

package/lib/StandardForm/TabForm.d.ts

@@ -15,5 +15,5 @@ export interface TabFormProp extends StandardFormProps {
     actionHide?: boolean;
     formItemGroup?: TabItemGroupProps[];
 }
-declare const TabForm: React.ForwardRefExoticComponent<TabFormProp & React.RefAttributes<unknown>>;
+declare const TabForm: React.ForwardRefExoticComponent<Pick<TabFormProp, string | number> & React.RefAttributes<unknown>>;
 export default TabForm;

package/lib/StandardForm/TabForm.js

@@ -61,7 +61,8 @@ var TabForm = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       fieldSize = _props$fieldSize === void 0 ? "middle" : _props$fieldSize,
       onSubmit = props.onSubmit,
       initialValues = props.initialValues,
-      tabsConfig = props.tabsConfig;
+      tabsConfig = props.tabsConfig,
+      displayLayout = props.displayLayout;
 
   var _useState = (0, _react.useState)(),
       _useState2 = _slicedToArray(_useState, 2),
@@ -98,6 +99,7 @@ var TabForm = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     actionGroup: [],
     ref: ref,
     fieldSize: fieldSize,
+    // @ts-ignore
     getFormFields: function getFormFields(fields, form) {
       setFormChildFields(fields);
       setFormChild(form);
@@ -125,6 +127,7 @@ var TabForm = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       form: formChild,
       fieldStatus: fieldStatus,
       size: formGridSize,
+      displayLayout: displayLayout,
       // doUpdateFormFields={() => forceUpdateForm()}
       itemGroup: fields
     }) : fields, !actionHide && actions && /*#__PURE__*/_react.default.createElement(_col.default, {

package/lib/StandardForm/index.d.ts

@@ -25,6 +25,8 @@ export interface StandardFormProps {
     children?: React.ReactNode;
     postfix?: React.ReactNode;
     prefix?: React.ReactNode;
+    displayLayout?: any;
+    [k: string]: any;
 }
-declare const StandardForm: React.ForwardRefExoticComponent<StandardFormProps & React.RefAttributes<unknown>>;
+declare const StandardForm: React.ForwardRefExoticComponent<Pick<StandardFormProps, string | number> & React.RefAttributes<unknown>>;
 export default StandardForm;

package/lib/StandardForm/index.js

@@ -71,7 +71,8 @@ var StandardForm = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
       prefix = props.prefix,
       postfix = props.postfix,
       fieldSize = props.fieldSize,
-      baseProps = (0, _tslib.__rest)(props, ["formItemGroup", "className", "initialValues", "layout", "grid", "getFormFields", "fieldStatus", "onSubmit", "confirmText", "onCancel", "cancelText", "actionAlign", "actionGroup", "onFinishFailed", "children", "prefix", "postfix", "fieldSize"]);
+      displayLayout = props.displayLayout,
+      baseProps = (0, _tslib.__rest)(props, ["formItemGroup", "className", "initialValues", "layout", "grid", "getFormFields", "fieldStatus", "onSubmit", "confirmText", "onCancel", "cancelText", "actionAlign", "actionGroup", "onFinishFailed", "children", "prefix", "postfix", "fieldSize", "displayLayout"]);
 
   var _Form$useForm = _form.default.useForm(),
       _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
@@ -184,6 +185,7 @@ var StandardForm = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
   }), prefix, children, /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, formItemGroup.length > 0 ? /*#__PURE__*/_react.default.createElement(_RenderItemGroup.default, {
     itemGroup: formItemGroup,
     fieldSize: fieldSize,
+    displayLayout: displayLayout,
     // doUpdateFormFields={() => forceUpdateForm()}
     size: gridSize,
     layout: layout,

package/lib/StandardModal/index.d.ts

@@ -30,7 +30,7 @@ export interface StandardModalProps extends ModalProps {
     hideFooter?: Boolean;
     footerButtonGroup?: ((modalForm?: any, props?: StandardModalProps) => React.ReactNode | PropTypes.ReactNodeArray | any) | any;
     footer?: any;
-    displayLayout?: object;
+    displayLayout?: any;
     confirmLoading?: boolean;
     okText?: string;
     okButtonProps?: any;

package/lib/StandardModal/index.js

@@ -86,7 +86,8 @@ var StandardModal = function StandardModal(props) {
       formLayout = _props$formLayout === void 0 ? 'horizontal' : _props$formLayout,
       tabsConfig = props.tabsConfig,
       stepsConfig = props.stepsConfig,
-      otherProps = (0, _tslib.__rest)(props, ["children", "className", "style", "size", "type", "formItemGroup", "title", "visible", "formPrefix", "formPostfix", "initialValues", "hideRequiredMark", "bodyStyle", "footer", "footerButtonGroup", "hideFooter", "getFormFields", "fieldStatus", "formLayout", "tabsConfig", "stepsConfig"]);
+      displayLayout = props.displayLayout,
+      otherProps = (0, _tslib.__rest)(props, ["children", "className", "style", "size", "type", "formItemGroup", "title", "visible", "formPrefix", "formPostfix", "initialValues", "hideRequiredMark", "bodyStyle", "footer", "footerButtonGroup", "hideFooter", "getFormFields", "fieldStatus", "formLayout", "tabsConfig", "stepsConfig", "displayLayout"]);
 
   var _Form$useForm = _form.default.useForm(),
       _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
@@ -286,8 +287,7 @@ var StandardModal = function StandardModal(props) {
     var fieldStatus = props.fieldStatus,
         formItemGroup = props.formItemGroup,
         _props$size2 = props.size,
-        size = _props$size2 === void 0 ? 'md' : _props$size2,
-        displayLayout = props.displayLayout;
+        size = _props$size2 === void 0 ? 'md' : _props$size2;
 
     if (Array.isArray(formItemGroup)) {
       return /*#__PURE__*/_react.default.createElement(_RenderItemGroup.default, {
@@ -353,22 +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') {
-            return /*#__PURE__*/_react.default.createElement(_button.default, {
-              key: item.name,
-              type: item.type ? item.type : 'primary',
+            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: 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.name);
+            }, others), name);
           } else {
             return item; // 如果是DOM，则直接渲染
           }
@@ -454,6 +464,7 @@ var StandardModal = function StandardModal(props) {
     layout: formLayout,
     fieldStatus: fieldStatus,
     actionHide: true,
+    // @ts-ignore
     getFormFields: function getFormFields(fields, form) {
       setFormChild(form);
       _getFormFields && _getFormFields(fields, form);
@@ -461,20 +472,23 @@ var StandardModal = function StandardModal(props) {
     formItemGroup: formItemGroup,
     tabsConfig: tabsConfig,
     onSubmit: handleSubmit,
-    initialValues: Object.assign({}, initialValues)
+    initialValues: Object.assign({}, initialValues),
+    displayLayout: displayLayout
   }), type === 'stepForm' && /*#__PURE__*/_react.default.createElement(_StepForm.default, {
     grid: size,
     layout: formLayout,
     fieldStatus: fieldStatus,
     actionHide: true,
+    // @ts-ignore
     getFormFields: function getFormFields(fields, form) {
       setFormChild(form);
       _getFormFields && _getFormFields(fields, form);
     },
     formItemGroup: formItemGroup,
     stepsConfig: stepsConfig,
+    onSubmit: handleSubmit,
     initialValues: Object.assign({}, initialValues),
-    onSubmit: handleSubmit
+    displayLayout: displayLayout
   }));
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fan-standard-comp",
-  "version": "3.0.13",
+  "version": "3.1.0-beta",
   "description": "FZ standard-comp,basic of antd4.0 and custom component.",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -17,14 +17,14 @@
     "doc:dev": "dumi dev",
     "doc:build:v3": "cross-env Build_PATH=doc-v3 dumi build",
     "package:build": "father-build && webpack",
-    "package:build:publish": "father-build && webpack && npm version patch && npm publish"
+    "package:build:publish": "father-build && webpack && npm publish"
   },
   "author": "shomychen",
   "license": "ISC",
   "devDependencies": {
     "@ant-design/icons": "^4.3.0",
     "@types/classnames": "^2.2.11",
-    "antd": "^4.16.13",
+    "antd": "^4.19.5",
     "babel-loader": "^8.2.2",
     "babel-plugin-import": "^1.13.3",
     "classnames": "^2.2.6",