ronds-metadata 1.1.51 → 1.1.53

package/es/comps/MetadataForm/index.js

@@ -86,16 +86,6 @@ var MetadataForm = function MetadataForm(props) {
       var e = form.setFieldsValue;
 
       var setFieldsValue = function setFieldsValue(vals) {
-        // 处理时间格式
-        fields.forEach(function (v, k) {
-          var _v$text;
-
-          if ((v === null || v === void 0 ? void 0 : (_v$text = v.text) === null || _v$text === void 0 ? void 0 : _v$text.type) === 'datePicker' && vals[k]) {
-            var _v$text2;
-
-            vals[k] = moment(vals[k], (v === null || v === void 0 ? void 0 : (_v$text2 = v.text) === null || _v$text2 === void 0 ? void 0 : _v$text2.format) || DEFAULT_DATE_FORMAT);
-          }
-        });
         e(vals);
         stream$.next({
           type: 'setFieldsValue',
@@ -146,12 +136,12 @@ var MetadataForm = function MetadataForm(props) {
       try {
         // 处理时间格式
         fields.forEach(function (v, k) {
-          var _v$text3;
+          var _v$text;
 
-          if ((v === null || v === void 0 ? void 0 : (_v$text3 = v.text) === null || _v$text3 === void 0 ? void 0 : _v$text3.type) === 'datePicker' && initialValues[k]) {
-            var _v$text4;
+          if (((v === null || v === void 0 ? void 0 : (_v$text = v.text) === null || _v$text === void 0 ? void 0 : _v$text.type) === 'datePicker' || (v === null || v === void 0 ? void 0 : v.type) === 'datePicker') && initialValues[k]) {
+            var _v$text2;
 
-            initialValues[k] = moment(initialValues[k], (v === null || v === void 0 ? void 0 : (_v$text4 = v.text) === null || _v$text4 === void 0 ? void 0 : _v$text4.format) || DEFAULT_DATE_FORMAT);
+            initialValues[k] = moment(initialValues[k], (v === null || v === void 0 ? void 0 : (_v$text2 = v.text) === null || _v$text2 === void 0 ? void 0 : _v$text2.format) || DEFAULT_DATE_FORMAT);
           }
         });
         form.setFieldsValue(_objectSpread({}, initialValues));
@@ -173,7 +163,7 @@ var MetadataForm = function MetadataForm(props) {
     var key = Object.keys(value);
     var extra = fields.get(key[0]);
 
-    if ((extra === null || extra === void 0 ? void 0 : (_extra$text = extra.text) === null || _extra$text === void 0 ? void 0 : _extra$text.type) === 'datePicker') {
+    if ((extra === null || extra === void 0 ? void 0 : (_extra$text = extra.text) === null || _extra$text === void 0 ? void 0 : _extra$text.type) === 'datePicker' || (extra === null || extra === void 0 ? void 0 : extra.type) === 'datePicker') {
       var _extra$text2, _extra$text3;
 
       value[key[0]] = moment(value[key[0]]).format((extra === null || extra === void 0 ? void 0 : (_extra$text2 = extra.text) === null || _extra$text2 === void 0 ? void 0 : _extra$text2.format) || DEFAULT_DATE_FORMAT);
@@ -186,12 +176,12 @@ var MetadataForm = function MetadataForm(props) {
   var onMyFinish = function onMyFinish(values) {
     // 处理时间格式
     fields.forEach(function (v, k) {
-      var _v$text5;
+      var _v$text3;
 
-      if ((v === null || v === void 0 ? void 0 : (_v$text5 = v.text) === null || _v$text5 === void 0 ? void 0 : _v$text5.type) === 'datePicker' && values[k]) {
-        var _v$text6;
+      if (((v === null || v === void 0 ? void 0 : (_v$text3 = v.text) === null || _v$text3 === void 0 ? void 0 : _v$text3.type) === 'datePicker' || (v === null || v === void 0 ? void 0 : v.type) === 'datePicker') && values[k]) {
+        var _v$text4;
 
-        values[k] = moment(values[k]).format((v === null || v === void 0 ? void 0 : (_v$text6 = v.text) === null || _v$text6 === void 0 ? void 0 : _v$text6.format) || DEFAULT_DATE_FORMAT);
+        values[k] = moment(values[k]).format((v === null || v === void 0 ? void 0 : (_v$text4 = v.text) === null || _v$text4 === void 0 ? void 0 : _v$text4.format) || DEFAULT_DATE_FORMAT);
       }
     });
     onFinish && onFinish(values);

package/package.json

@@ -1,7 +1,7 @@
 {
   "public": true,
   "name": "ronds-metadata",
-  "version": "1.1.51",
+  "version": "1.1.53",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",