ronds-metadata 1.1.44 → 1.1.45

package/es/comps/MetadataForm/hooks/index.js

@@ -5,7 +5,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /*
  * @Author: your name
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2022-07-06 14:02:17
+ * @LastEditTime: 2022-10-12 09:04:56
  */
 import { getLocale } from '../../../framework/locale';
 import moment from 'moment';

package/es/comps/MetadataForm/index.js

@@ -11,6 +11,7 @@ import { JsonMetadataProvider } from '../../framework/metadata';
 import { MetadataService } from '../../framework/metadata/MetadataService';
 import useMemoSubject from '../../framework/rxjs-hooks/useMemoSubject';
 import useObservable from '../../framework/rxjs-hooks/useObservable';
+import moment from 'moment';
 
 var MetadataForm = function MetadataForm(props) {
   var _Form$useForm = _Form.useForm(),
@@ -130,8 +131,16 @@ var MetadataForm = function MetadataForm(props) {
     return function () {};
   }, [mySchma]);
   React.useEffect(function () {
-    if (initialValues && firstLoadRef.current) {
+    if (initialValues && firstLoadRef.current && fields) {
       try {
+        // 处理时间格式
+        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' && initialValues[k]) {
+            initialValues[k] = moment(initialValues[k], 'YYYY-MM-DD HH:mm:ss');
+          }
+        });
         form.setFieldsValue(_objectSpread({}, initialValues));
         firstLoadRef.current = false;
       } catch (ex) {
@@ -142,7 +151,35 @@ var MetadataForm = function MetadataForm(props) {
         }, 500);
       }
     }
-  }, [initialValues]);
+  }, [initialValues, fields]);
+
+  var onMyValuesChange = function onMyValuesChange(value, allValues) {
+    var _extra$text;
+
+    // 处理时间格式
+    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') {
+      value[key[0]] = moment(value[key[0]]).format('YYYY-MM-DD HH:mm:ss');
+      allValues[key[0]] = moment(value[key[0]]).format('YYYY-MM-DD HH:mm:ss');
+    }
+
+    onValuesChange && onValuesChange(value, allValues);
+  };
+
+  var onMyFinish = function onMyFinish(values) {
+    // 处理时间格式
+    fields.forEach(function (v, k) {
+      var _v$text2;
+
+      if ((v === null || v === void 0 ? void 0 : (_v$text2 = v.text) === null || _v$text2 === void 0 ? void 0 : _v$text2.type) === 'datePicker' && values[k]) {
+        values[k] = moment(values[k]).format('YYYY-MM-DD HH:mm:ss');
+      }
+    });
+    onFinish && onFinish(values);
+  };
+
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(MetadataFormContext.Provider, {
     value: {
       fields: fields,
@@ -162,8 +199,8 @@ var MetadataForm = function MetadataForm(props) {
     layout: layout,
     form: form,
     name: "control-hooks",
-    onFinish: onFinish,
-    onValuesChange: onValuesChange
+    onFinish: onMyFinish,
+    onValuesChange: onMyValuesChange
   }, renderForm(mySchma, options, colSpan))));
 };
 

package/package.json

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