sz-mx-cabin - npm Package Compare versions

Comparing version 0.0.9 to 0.0.10

es/MainGenerator.js

@@ -546,16 +546,8 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
       });
-      var cloneData = deepClone(newData); //从sessionStorage取
+      var cloneData = deepClone(newData);
 
-      var newFileData = JSON.parse(sessionStorage.getItem('fileData'));
-      dispatch({
-        type: 'updateFileData',
-        payload: {
-          fileData: newFileData
+      for (var key in mainGeneratorState.fileData) {
+        for (var fileItemKey in mainGeneratorState.fileData[key]) {
+          cloneData[key][fileItemKey] = mainGeneratorState.fileData[key][fileItemKey];
         }
-      });
-
-      for (var key in newFileData) {
-        for (var fileItemKey in newFileData[key]) {
-          cloneData[key][fileItemKey] = newFileData[key][fileItemKey];
-        }
       }
@@ -767,4 +759,2 @@
   var onFormDataChange = function onFormDataChange(formName, formValues) {
-    var newData = {};
-
     var _parseFileDataStructu = parseFileDataStructureByFormValues(formValues),
@@ -776,13 +766,5 @@ _parseFileDataStructu2 = _parseFileDataStructu.result,
 
-    newData = _extends(_extends({}, mainGeneratorState.data), _defineProperty({}, formName, _extends({}, formData)));
-
     var newFileData = _extends(_extends({}, mainGeneratorState.fileData), _defineProperty({}, formName, _extends({}, result)));
 
     dispatch({
-      type: 'updateData',
-      payload: {
-        data: newData
-      }
-    });
-    dispatch({
       type: 'updateFileData',
@@ -830,3 +812,3 @@ payload: {
     return __awaiter(_this, void 0, void 0, /*#__PURE__*/_regeneratorRuntime.mark(function _callee5() {
-      var newData, cloneData, newFileData, key, fileItemKey, cloneAttributes;
+      var newData, cloneData, key, fileItemKey, cloneAttributes;
       return _regeneratorRuntime.wrap(function _callee5$(_context5) {
@@ -859,29 +841,21 @@ while (1) {
               });
-              cloneData = deepClone(newData); //从sessionStorage取
+              cloneData = deepClone(newData);
 
-              newFileData = JSON.parse(sessionStorage.getItem('fileData'));
-              dispatch({
-                type: 'updateFileData',
-                payload: {
-                  fileData: newFileData
+              for (key in mainGeneratorState.fileData) {
+                for (fileItemKey in mainGeneratorState.fileData[key]) {
+                  cloneData[key][fileItemKey] = mainGeneratorState.fileData[key][fileItemKey];
                 }
-              });
-
-              for (key in newFileData) {
-                for (fileItemKey in newFileData[key]) {
-                  cloneData[key][fileItemKey] = newFileData[key][fileItemKey];
-                }
               }
 
               cloneAttributes = deepClone(mainGeneratorState.attributes);
-              _context5.prev = 11;
+              _context5.prev = 9;
               return _context5.abrupt("return", pageFunctionObj[functionName](cloneData, cloneAttributes, propOptions, params));
 
-            case 15:
-              _context5.prev = 15;
-              _context5.t0 = _context5["catch"](11);
+            case 13:
+              _context5.prev = 13;
+              _context5.t0 = _context5["catch"](9);
               console.error("\u8C03\u7528\u65B9\u6CD5:[".concat(functionName, "]\u65F6\u51FA\u9519"));
               throw new Error(_context5.t0);
 
-            case 19:
+            case 17:
             case "end":
@@ -891,3 +865,3 @@ return _context5.stop();
         }
-      }, _callee5, null, [[11, 15]]);
+      }, _callee5, null, [[9, 13]]);
     }));
@@ -894,0 +868,0 @@ }; // 更新cabin对外暴露的方法,如果pageFunctionObj变了就得变

es/widgets/form/Form.js

@@ -74,5 +74,13 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
     formInstance.setFieldsValue(_extends({}, data[name]));
+
+    for (var key in data) {
+      for (var formkey in data[key]) {
+        if (data[key][formkey] && data[key][formkey]._isAMomentObject) {
+          data[key][formkey] = data[key][formkey].format('YYYYMMDD');
+        }
+      }
+    }
+
     sessionStorage.setItem('data', JSON.stringify(data));
-    sessionStorage.setItem('fileData', JSON.stringify(fileData));
-  }, [data, fileData]);
+  }, [data]);
 
@@ -82,2 +90,11 @@ var onFieldsChangeEvent = function onFieldsChangeEvent(changedFields, allFields) {
     var values = formInstance.getFieldsValue();
+
+    for (var key in values) {
+      for (var formkey in values[key]) {
+        if (values[key][formkey] && values[key][formkey]._isAMomentObject) {
+          values[key][formkey] = values[key][formkey].format('YYYYMMDD');
+        }
+      }
+    }
+
     var newData = {};
@@ -97,3 +114,7 @@
 
-      sessionStorage.setItem('fileData', JSON.stringify(newFileData));
+      if (JSON.stringify(newFileData) != JSON.stringify(fileData)) {
+        var _values = formInstance.getFieldsValue();
+
+        onFormDataChange(name, _values);
+      }
     }
@@ -100,0 +121,0 @@ };

lib/MainGenerator.js

@@ -575,16 +575,8 @@ "use strict";
       });
-      var cloneData = (0, _clone["default"])(newData); //从sessionStorage取
+      var cloneData = (0, _clone["default"])(newData);
 
-      var newFileData = JSON.parse(sessionStorage.getItem('fileData'));
-      dispatch({
-        type: 'updateFileData',
-        payload: {
-          fileData: newFileData
+      for (var key in mainGeneratorState.fileData) {
+        for (var fileItemKey in mainGeneratorState.fileData[key]) {
+          cloneData[key][fileItemKey] = mainGeneratorState.fileData[key][fileItemKey];
         }
-      });
-
-      for (var key in newFileData) {
-        for (var fileItemKey in newFileData[key]) {
-          cloneData[key][fileItemKey] = newFileData[key][fileItemKey];
-        }
       }
@@ -796,4 +788,2 @@
   var onFormDataChange = function onFormDataChange(formName, formValues) {
-    var newData = {};
-
     var _parseFileDataStructu = (0, _UIGeneratorUtils.parseFileDataStructureByFormValues)(formValues),
@@ -805,13 +795,5 @@ _parseFileDataStructu2 = _parseFileDataStructu.result,
 
-    newData = _extends(_extends({}, mainGeneratorState.data), _defineProperty({}, formName, _extends({}, formData)));
-
     var newFileData = _extends(_extends({}, mainGeneratorState.fileData), _defineProperty({}, formName, _extends({}, result)));
 
     dispatch({
-      type: 'updateData',
-      payload: {
-        data: newData
-      }
-    });
-    dispatch({
       type: 'updateFileData',
@@ -859,3 +841,3 @@ payload: {
     return __awaiter(_this, void 0, void 0, /*#__PURE__*/_regenerator["default"].mark(function _callee5() {
-      var newData, cloneData, newFileData, key, fileItemKey, cloneAttributes;
+      var newData, cloneData, key, fileItemKey, cloneAttributes;
       return _regenerator["default"].wrap(function _callee5$(_context5) {
@@ -888,29 +870,21 @@ while (1) {
               });
-              cloneData = (0, _clone["default"])(newData); //从sessionStorage取
+              cloneData = (0, _clone["default"])(newData);
 
-              newFileData = JSON.parse(sessionStorage.getItem('fileData'));
-              dispatch({
-                type: 'updateFileData',
-                payload: {
-                  fileData: newFileData
+              for (key in mainGeneratorState.fileData) {
+                for (fileItemKey in mainGeneratorState.fileData[key]) {
+                  cloneData[key][fileItemKey] = mainGeneratorState.fileData[key][fileItemKey];
                 }
-              });
-
-              for (key in newFileData) {
-                for (fileItemKey in newFileData[key]) {
-                  cloneData[key][fileItemKey] = newFileData[key][fileItemKey];
-                }
               }
 
               cloneAttributes = (0, _clone["default"])(mainGeneratorState.attributes);
-              _context5.prev = 11;
+              _context5.prev = 9;
               return _context5.abrupt("return", pageFunctionObj[functionName](cloneData, cloneAttributes, propOptions, params));
 
-            case 15:
-              _context5.prev = 15;
-              _context5.t0 = _context5["catch"](11);
+            case 13:
+              _context5.prev = 13;
+              _context5.t0 = _context5["catch"](9);
               console.error("\u8C03\u7528\u65B9\u6CD5:[".concat(functionName, "]\u65F6\u51FA\u9519"));
               throw new Error(_context5.t0);
 
-            case 19:
+            case 17:
             case "end":
@@ -920,3 +894,3 @@ return _context5.stop();
         }
-      }, _callee5, null, [[11, 15]]);
+      }, _callee5, null, [[9, 13]]);
     }));
@@ -923,0 +897,0 @@ }; // 更新cabin对外暴露的方法,如果pageFunctionObj变了就得变

lib/widgets/form/Form.js

@@ -90,5 +90,13 @@ "use strict";
     formInstance.setFieldsValue(_extends({}, data[name]));
+
+    for (var key in data) {
+      for (var formkey in data[key]) {
+        if (data[key][formkey] && data[key][formkey]._isAMomentObject) {
+          data[key][formkey] = data[key][formkey].format('YYYYMMDD');
+        }
+      }
+    }
+
     sessionStorage.setItem('data', JSON.stringify(data));
-    sessionStorage.setItem('fileData', JSON.stringify(fileData));
-  }, [data, fileData]);
+  }, [data]);
 
@@ -98,2 +106,11 @@ var onFieldsChangeEvent = function onFieldsChangeEvent(changedFields, allFields) {
     var values = formInstance.getFieldsValue();
+
+    for (var key in values) {
+      for (var formkey in values[key]) {
+        if (values[key][formkey] && values[key][formkey]._isAMomentObject) {
+          values[key][formkey] = values[key][formkey].format('YYYYMMDD');
+        }
+      }
+    }
+
     var newData = {};
@@ -113,3 +130,7 @@
 
-      sessionStorage.setItem('fileData', JSON.stringify(newFileData));
+      if (JSON.stringify(newFileData) != JSON.stringify(fileData)) {
+        var _values = formInstance.getFieldsValue();
+
+        onFormDataChange(name, _values);
+      }
     }
@@ -116,0 +137,0 @@ };

package.json

 {
     "name": "sz-mx-cabin",
-    "version": "0.0.9",
+    "version": "0.0.10",
     "description": "reactCabin",
@@ -5,0 +5,0 @@ "main": "lib/index.js",

No alert changes

Worsened metrics

Total package byte prevSize

1167813

decreased by-0.02%

Lines of code

25224

decreased by-0.05%

No dependency changes