@donglegeyu/company-ui 1.2.18 → 1.2.20

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,7 +150,7 @@ 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)(

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

@@ -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,7 +141,7 @@ 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, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@donglegeyu/company-ui",
-  "version": "1.2.18",
+  "version": "1.2.20",
   "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",