@pisell/materials 1.0.974 → 1.0.975

package/es/components/dataSourceComponents/dataSourceForm/BaseForm.js

@@ -91,18 +91,40 @@ var BaseForm = /*#__PURE__*/forwardRef(function (props, ref) {
           channelCode: channelCode,
           isBoard: isBoard
         }).then(function (res) {
-          var _formRef$current2;
+          var _dataSource$fields2, _formRef$current2;
           var formattedValues = formatInitialValues ? formatInitialValues(res.data) : res.data || {};
-          (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 || _formRef$current2.setFields(transformFormObjToArrayWithUntouched(_objectSpread({}, formattedValues)));
+
+          // 根据 dataSource.fields 筛选 formattedValues
+          var fieldNames = new Set((dataSource === null || dataSource === void 0 || (_dataSource$fields2 = dataSource.fields) === null || _dataSource$fields2 === void 0 ? void 0 : _dataSource$fields2.map(function (field) {
+            return field.name;
+          })) || []);
+          var filteredValues = Object.keys(formattedValues).reduce(function (acc, key) {
+            if (fieldNames.has(key)) {
+              acc[key] = formattedValues[key];
+            }
+            return acc;
+          }, {});
+          (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 || _formRef$current2.setFields(transformFormObjToArrayWithUntouched(_objectSpread({}, filteredValues)));
         }).catch(function (error) {
           console.error('获取formSettingMeta数据失败:', error);
         });
         return;
       }
       get === null || get === void 0 || get.runAsync().then(function (res) {
-        var _formRef$current3;
+        var _dataSource$fields3, _formRef$current3;
         var formattedValues = formatInitialValues ? formatInitialValues(res) : res;
-        (_formRef$current3 = formRef.current) === null || _formRef$current3 === void 0 || _formRef$current3.setFields(transformFormObjToArrayWithUntouched(formattedValues));
+
+        // 根据 dataSource.fields 筛选 formattedValues
+        var fieldNames = new Set((dataSource === null || dataSource === void 0 || (_dataSource$fields3 = dataSource.fields) === null || _dataSource$fields3 === void 0 ? void 0 : _dataSource$fields3.map(function (field) {
+          return field.name;
+        })) || []);
+        var filteredValues = Object.keys(formattedValues).reduce(function (acc, key) {
+          if (fieldNames.has(key)) {
+            acc[key] = formattedValues[key];
+          }
+          return acc;
+        }, {});
+        (_formRef$current3 = formRef.current) === null || _formRef$current3 === void 0 || _formRef$current3.setFields(transformFormObjToArrayWithUntouched(filteredValues));
       });
     }
   }, [renderMode, dataSource]);

package/lib/components/dataSourceComponents/dataSourceForm/BaseForm.js

@@ -93,10 +93,17 @@ var BaseForm = (0, import_react.forwardRef)(
           const { businessCode, channelCode, isBoard } = (0, import_urlUtils.getFormSettingParams)();
           const sectionCodes = Array.from(new Set((_a2 = dataSource == null ? void 0 : dataSource.fields) == null ? void 0 : _a2.map((field) => field.name.split(".").shift())));
           (0, import_serve.getFormSettingMetaData)({ sectionCodes, businessCode, channelCode, isBoard }).then((res) => {
-            var _a3;
+            var _a3, _b;
             const formattedValues = formatInitialValues ? formatInitialValues(res.data) : res.data || {};
-            (_a3 = formRef.current) == null ? void 0 : _a3.setFields((0, import_utils.transformFormObjToArrayWithUntouched)({
-              ...formattedValues
+            const fieldNames = new Set(((_a3 = dataSource == null ? void 0 : dataSource.fields) == null ? void 0 : _a3.map((field) => field.name)) || []);
+            const filteredValues = Object.keys(formattedValues).reduce((acc, key) => {
+              if (fieldNames.has(key)) {
+                acc[key] = formattedValues[key];
+              }
+              return acc;
+            }, {});
+            (_b = formRef.current) == null ? void 0 : _b.setFields((0, import_utils.transformFormObjToArrayWithUntouched)({
+              ...filteredValues
             }));
           }).catch((error) => {
             console.error("获取formSettingMeta数据失败:", error);
@@ -104,9 +111,16 @@ var BaseForm = (0, import_react.forwardRef)(
           return;
         }
         get == null ? void 0 : get.runAsync().then((res) => {
-          var _a3;
+          var _a3, _b;
           const formattedValues = formatInitialValues ? formatInitialValues(res) : res;
-          (_a3 = formRef.current) == null ? void 0 : _a3.setFields((0, import_utils.transformFormObjToArrayWithUntouched)(formattedValues));
+          const fieldNames = new Set(((_a3 = dataSource == null ? void 0 : dataSource.fields) == null ? void 0 : _a3.map((field) => field.name)) || []);
+          const filteredValues = Object.keys(formattedValues).reduce((acc, key) => {
+            if (fieldNames.has(key)) {
+              acc[key] = formattedValues[key];
+            }
+            return acc;
+          }, {});
+          (_b = formRef.current) == null ? void 0 : _b.setFields((0, import_utils.transformFormObjToArrayWithUntouched)(filteredValues));
         });
       }
     }, [renderMode, dataSource]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/materials",
-  "version": "1.0.974",
+  "version": "1.0.975",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -75,9 +75,9 @@
     "antd-mobile": "^5.38.1",
     "vod-js-sdk-v6": "^1.4.11",
     "react-camera-pro": "1.4.0",
+    "@pisell/icon": "0.0.10",
     "@pisell/date-picker": "1.0.127",
-    "@pisell/utils": "1.0.55",
-    "@pisell/icon": "0.0.10"
+    "@pisell/utils": "1.0.55"
   },
   "peerDependencies": {
     "react": "^18.0.0",