Merge pull request #451 from kne-union/release

Release

Author: zhipenglin

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kne-components/components-core",
-  "version": "0.3.24",
+  "version": "0.3.25",
   "files": [
     "build"
   ],
@@ -36,7 +36,7 @@
     "@kne/react-text-escape": "^0.1.4",
     "@kne/remote-loader": "^1.2.2",
     "@kne/scroll-loader": "^0.1.9",
-    "@kne/super-select": "^0.1.16",
+    "@kne/super-select": "^0.1.19",
     "@kne/use-click-outside": "^0.2.1",
     "@kne/use-control-value": "^0.1.7",
     "@kne/use-ref-callback": "^0.1.2",

src/common/components/SuperSelectField/index.js

@@ -98,14 +98,14 @@ export const SuperSelectUserField = forwardRef((p, ref) => {
               size={40}
               gender="M"
             />
-            <div>
+            <Flex vertical gap={8} align="center">
               <div className={"select-list-item-label"}>{item[labelKey]}</div>
               {item.description && (
                 <div className={"select-list-item-description"}>
                   {item.description}
                 </div>
               )}
-            </div>
+            </Flex>
           </Flex>
         );
       }}

src/components/FormInfo/computedModalCommonProps.js

@@ -1,82 +1,59 @@
 import importMessages from "./locale";
-import { CancelButton, SubmitButton } from "@kne/react-form-antd";
-import { IntlProvider, FormattedMessage } from "@components/Intl";
-import { Form } from "./formModule";
+import {CancelButton, SubmitButton} from "@kne/react-form-antd";
+import {IntlProvider, FormattedMessage} from "@components/Intl";
+import {Form} from "./formModule";
 import classnames from "classnames";
 import style from "./style.module.scss";
 
 const localeModuleName = "FormInfo";
 
 const computedCommonProps = ({
-  className,
-  withDecorator,
-  footerButtons,
-  formProps,
-  cancelText,
-  saveText,
-  autoClose,
-  ...modalProps
-}) => {
-  return {
-    ...modalProps,
-    footerButtons: footerButtons || [
-      {
-        children: (
-          <IntlProvider
-            importMessages={importMessages}
-            moduleName={localeModuleName}
-          >
-            {cancelText || (
-              <FormattedMessage id={"Cancel"} moduleName={localeModuleName} />
-            )}
-          </IntlProvider>
-        ),
-        ButtonComponent: CancelButton,
-      },
-      {
-        type: "primary",
-        children: (
-          <IntlProvider
-            importMessages={importMessages}
-            moduleName={localeModuleName}
-          >
-            {saveText || (
-              <FormattedMessage id={"Save"} moduleName={localeModuleName} />
-            )}
-          </IntlProvider>
-        ),
-        ButtonComponent: SubmitButton,
-        autoClose: false,
-      },
-    ],
-    withDecorator: (render, args) => {
-      const innerRender = (props) => {
-        const { onSubmit, ..._formProps } =
-          typeof formProps === "function" ? formProps(props) : formProps;
-        return (
-          <Form
-            {..._formProps}
-            onSubmit={async (data, ...args) => {
-              const res =
-                onSubmit &&
-                (await onSubmit(data, Object.assign({}, props), ...args));
-              if (res !== false) {
-                autoClose && props.close();
-              }
-            }}
-          >
-            <IntlProvider importMessages={importMessages} moduleName="FormInfo">
-              {render(props)}
-            </IntlProvider>
-          </Form>
-        );
-      };
-      return typeof withDecorator === "function"
-        ? withDecorator(innerRender, args)
-        : innerRender(args);
-    },
-    className: classnames(className, style["form-outer"]),
-  };
+                                 className,
+                                 withDecorator,
+                                 footerButtons,
+                                 formProps,
+                                 cancelText,
+                                 saveText,
+                                 autoClose,
+                                 ...modalProps
+                             }) => {
+    return {
+        ...modalProps, footerButtons: footerButtons || [{
+            children: (<IntlProvider
+                importMessages={importMessages}
+                moduleName={localeModuleName}
+            >
+                {cancelText || (<FormattedMessage id={"Cancel"} moduleName={localeModuleName}/>)}
+            </IntlProvider>), ButtonComponent: CancelButton,
+        }, {
+            type: "primary", children: (<IntlProvider
+                importMessages={importMessages}
+                moduleName={localeModuleName}
+            >
+                {saveText || (<FormattedMessage id={"Save"} moduleName={localeModuleName}/>)}
+            </IntlProvider>), ButtonComponent: SubmitButton, autoClose: false,
+        },], withDecorator: (render, args) => {
+            const innerRender = (props) => {
+                const {
+                    onSubmit, ..._formProps
+                } = Object.assign({}, typeof formProps === "function" ? formProps(props) : formProps);
+                return (<Form
+                    {..._formProps}
+                    onSubmit={async (data, ...args) => {
+                        const res = onSubmit && (await onSubmit(data, Object.assign({}, props), ...args));
+                        if (res !== false) {
+                            autoClose && props.close();
+                        }
+                    }}
+                >
+                    <IntlProvider importMessages={importMessages} moduleName="FormInfo">
+                        {render(props)}
+                    </IntlProvider>
+                </Form>);
+            };
+            return typeof withDecorator === "function" ? withDecorator(innerRender, args) : innerRender(args);
+        }, className: classnames(className, style["form-outer"]),
+    };
 };
 
 export default computedCommonProps;

src/components/FormInfo/fields/Upload/index.js

@@ -84,7 +84,7 @@ const UploadField = createWithIntl({
 
     return (
         <Space direction="vertical">
-            <Flex align="start" gap={8}>
+            <Flex align="start" gap={8} vertical>
                 <InputFileButton
                     {...omit(props, ["value", "onChange"])}
                     size={size}