@donglegeyu/company-ui 1.2.18 → 1.2.21

package/dist/cjs/shared-components/BaseInfoForm/index.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="react" />
 import type { FormInstance } from 'antd';
 import './index.scss';
-export interface FormField {
+export interface FormFieldItem {
     name: string;
     label: string;
     type: 'input' | 'select' | 'textarea' | 'input-number';
@@ -16,6 +16,12 @@ export interface FormField {
     required?: boolean;
     rows?: number;
 }
+export interface FormFieldGroup {
+    type: 'compact';
+    label: string;
+    children: FormFieldItem[];
+}
+export type FormField = FormFieldItem | FormFieldGroup;
 export interface BaseInfoFormProps {
     value: Record<string, any>;
     fields: FormField[];

package/dist/cjs/shared-components/BaseInfoForm/index.js

@@ -68,8 +68,9 @@ var BaseInfoForm = (0, import_react.forwardRef)(({
       const currentFormValues = form.getFieldsValue();
       const diff = {};
       for (const k of Object.keys(value)) {
-        if (value[k] !== currentFormValues[k]) {
-          diff[k] = value[k];
+        const v = value[k] === "" ? void 0 : value[k];
+        if (v !== currentFormValues[k]) {
+          diff[k] = v;
         }
       }
       if (Object.keys(diff).length > 0) {
@@ -77,12 +78,19 @@ var BaseInfoForm = (0, import_react.forwardRef)(({
       }
     }
   }, [value, form]);
+  const normalizeValue = (val) => {
+    const result = {};
+    for (const k of Object.keys(val)) {
+      result[k] = val[k] === "" ? void 0 : val[k];
+    }
+    return result;
+  };
   const handleValuesChange = (_changedValues, allValues) => {
     const key = Object.keys(_changedValues)[0];
     if (key) {
-      onFieldChange == null ? void 0 : onFieldChange(key, _changedValues[key]);
+      onFieldChange == null ? void 0 : onFieldChange(key, _changedValues[key] === "" ? void 0 : _changedValues[key]);
     }
-    onChange == null ? void 0 : onChange(allValues);
+    onChange == null ? void 0 : onChange(normalizeValue(allValues));
   };
   (0, import_react.useImperativeHandle)(ref, () => ({
     validate: () => form.validateFields().then(() => true).catch(() => false),
@@ -142,20 +150,34 @@ var BaseInfoForm = (0, import_react.forwardRef)(({
         import_basic_components.CompanyForm,
         {
           form,
-          initialValues: value,
+          initialValues: normalizeValue(value),
           layout,
           onValuesChange: handleValuesChange,
-          children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd.Row, { gutter: 24, children: fields.map((field) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd.Col, { span: getColSpan(), children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
-            import_basic_components.CompanyForm.Item,
-            {
-              label: field.label,
-              name: field.name,
-              rules: field.rules,
-              required: field.required,
-              className: field.type === "textarea" ? "label-top" : void 0,
-              children: renderField(field)
+          children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd.Row, { gutter: 24, children: fields.map((field, index) => {
+            if (field.type === "compact") {
+              return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd.Col, { span: getColSpan(), children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_basic_components.CompanyForm.Item, { label: field.label, children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd.Space.Compact, { style: { width: "100%" }, children: field.children.map((child) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+                import_basic_components.CompanyForm.Item,
+                {
+                  name: child.name,
+                  noStyle: true,
+                  rules: child.rules,
+                  children: renderField(child)
+                },
+                child.name
+              )) }) }) }, `compact-${index}`);
             }
-          ) }, field.name)) })
+            return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_antd.Col, { span: getColSpan(), children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+              import_basic_components.CompanyForm.Item,
+              {
+                label: field.label,
+                name: field.name,
+                rules: field.rules,
+                required: field.required,
+                className: field.type === "textarea" ? "label-top" : void 0,
+                children: renderField(field)
+              }
+            ) }, field.name);
+          }) })
         }
       )
     }

package/dist/cjs/shared-components/index.d.ts

@@ -6,7 +6,7 @@ export { default as PageTitle } from "./PageTitle";
 export { default as FormFooterActions } from "./FormFooterActions";
 export { default as SectionTitle } from "./SectionTitle";
 export { default as BaseInfoForm } from "./BaseInfoForm";
-export type { FormField, BaseInfoFormProps, BaseInfoFormRef } from "./BaseInfoForm";
+export type { FormField, FormFieldItem, FormFieldGroup, BaseInfoFormProps, BaseInfoFormRef } from "./BaseInfoForm";
 export { default as ColorScale } from "./ColorScale";
 export { default as AccessibilityChecker } from "./AccessibilityChecker";
 export { default as EllipsisText } from "./EllipsisText";

package/dist/es/shared-components/BaseInfoForm/index.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="react" />
 import type { FormInstance } from 'antd';
 import './index.scss';
-export interface FormField {
+export interface FormFieldItem {
     name: string;
     label: string;
     type: 'input' | 'select' | 'textarea' | 'input-number';
@@ -16,6 +16,12 @@ export interface FormField {
     required?: boolean;
     rows?: number;
 }
+export interface FormFieldGroup {
+    type: 'compact';
+    label: string;
+    children: FormFieldItem[];
+}
+export type FormField = FormFieldItem | FormFieldGroup;
 export interface BaseInfoFormProps {
     value: Record<string, any>;
     fields: FormField[];

package/dist/es/shared-components/BaseInfoForm/index.js

@@ -9,7 +9,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 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; }
 import { forwardRef, useImperativeHandle, useRef, useEffect, useState } from 'react';
-import { Row, Col } from 'antd';
+import { Row, Col, Space } from 'antd';
 import { CompanyForm, CompanyInput, CompanySelect, CompanyInputNumber } from "../../basic-components";
 import "./index.scss";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -59,8 +59,9 @@ var BaseInfoForm = /*#__PURE__*/forwardRef(function (_ref, ref) {
       var diff = {};
       for (var _i = 0, _Object$keys = Object.keys(value); _i < _Object$keys.length; _i++) {
         var k = _Object$keys[_i];
-        if (value[k] !== currentFormValues[k]) {
-          diff[k] = value[k];
+        var v = value[k] === '' ? undefined : value[k];
+        if (v !== currentFormValues[k]) {
+          diff[k] = v;
         }
       }
       if (Object.keys(diff).length > 0) {
@@ -68,12 +69,20 @@ var BaseInfoForm = /*#__PURE__*/forwardRef(function (_ref, ref) {
       }
     }
   }, [value, form]);
+  var normalizeValue = function normalizeValue(val) {
+    var result = {};
+    for (var _i2 = 0, _Object$keys2 = Object.keys(val); _i2 < _Object$keys2.length; _i2++) {
+      var k = _Object$keys2[_i2];
+      result[k] = val[k] === '' ? undefined : val[k];
+    }
+    return result;
+  };
   var handleValuesChange = function handleValuesChange(_changedValues, allValues) {
     var key = Object.keys(_changedValues)[0];
     if (key) {
-      onFieldChange === null || onFieldChange === void 0 || onFieldChange(key, _changedValues[key]);
+      onFieldChange === null || onFieldChange === void 0 || onFieldChange(key, _changedValues[key] === '' ? undefined : _changedValues[key]);
     }
-    onChange === null || onChange === void 0 || onChange(allValues);
+    onChange === null || onChange === void 0 || onChange(normalizeValue(allValues));
   };
   useImperativeHandle(ref, function () {
     return {
@@ -132,12 +141,33 @@ var BaseInfoForm = /*#__PURE__*/forwardRef(function (_ref, ref) {
     style: _defineProperty({}, '--company-label-max-width', "".concat(labelMaxWidth, "em")),
     children: /*#__PURE__*/_jsx(CompanyForm, {
       form: form,
-      initialValues: value,
+      initialValues: normalizeValue(value),
       layout: layout,
       onValuesChange: handleValuesChange,
       children: /*#__PURE__*/_jsx(Row, {
         gutter: 24,
-        children: fields.map(function (field) {
+        children: fields.map(function (field, index) {
+          if (field.type === 'compact') {
+            return /*#__PURE__*/_jsx(Col, {
+              span: getColSpan(),
+              children: /*#__PURE__*/_jsx(CompanyForm.Item, {
+                label: field.label,
+                children: /*#__PURE__*/_jsx(Space.Compact, {
+                  style: {
+                    width: '100%'
+                  },
+                  children: field.children.map(function (child) {
+                    return /*#__PURE__*/_jsx(CompanyForm.Item, {
+                      name: child.name,
+                      noStyle: true,
+                      rules: child.rules,
+                      children: renderField(child)
+                    }, child.name);
+                  })
+                })
+              })
+            }, "compact-".concat(index));
+          }
           return /*#__PURE__*/_jsx(Col, {
             span: getColSpan(),
             children: /*#__PURE__*/_jsx(CompanyForm.Item, {

package/dist/es/shared-components/index.d.ts

@@ -6,7 +6,7 @@ export { default as PageTitle } from "./PageTitle";
 export { default as FormFooterActions } from "./FormFooterActions";
 export { default as SectionTitle } from "./SectionTitle";
 export { default as BaseInfoForm } from "./BaseInfoForm";
-export type { FormField, BaseInfoFormProps, BaseInfoFormRef } from "./BaseInfoForm";
+export type { FormField, FormFieldItem, FormFieldGroup, BaseInfoFormProps, BaseInfoFormRef } from "./BaseInfoForm";
 export { default as ColorScale } from "./ColorScale";
 export { default as AccessibilityChecker } from "./AccessibilityChecker";
 export { default as EllipsisText } from "./EllipsisText";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@donglegeyu/company-ui",
-  "version": "1.2.18",
+  "version": "1.2.21",
   "main": "dist/cjs/index.js",
   "module": "dist/es/index.js",
   "types": "dist/es/index.d.ts",
@@ -18,7 +18,7 @@
     "dev": "dumi dev",
     "build": "father build",
     "type-check": "tsc --noEmit",
-    "prepublishOnly": "npm run build"
+    "prepublishOnly": "bash scripts/check-clean.sh && npm run build"
   },
   "keywords": [
     "antd",