sz-mx-cabin - npm Package Compare versions

Comparing version 0.0.12-beta1 to 0.0.12-beta2

es/MainGenerator.js

@@ -540,9 +540,12 @@ 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 newData = JSON.parse(sessionStorage.getItem('data'));
+
+      var zzdata = _extends(_extends({}, mainGeneratorState.data), newData);
+
       dispatch({
         type: 'updateData',
         payload: {
-          data: newData
+          data: zzdata
         }
       });
-      var cloneData = deepClone(newData);
+      var cloneData = deepClone(zzdata);
 
@@ -603,9 +606,12 @@ for (var key in mainGeneratorState.fileData) {
     var newData = JSON.parse(sessionStorage.getItem('data'));
+
+    var zzdata = _extends(_extends({}, mainGeneratorState.data), newData);
+
     dispatch({
       type: 'updateData',
       payload: {
-        data: newData
+        data: zzdata
       }
     });
-    var cloneData = deepClone(newData);
+    var cloneData = deepClone(zzdata);
 
@@ -811,3 +817,3 @@ for (var _len2 = arguments.length, leftParams = new Array(_len2 > 1 ? _len2 - 1 : 0), _key3 = 1; _key3 < _len2; _key3++) {
     return __awaiter(_this, void 0, void 0, /*#__PURE__*/_regeneratorRuntime.mark(function _callee5() {
-      var newData, cloneData, key, fileItemKey, cloneAttributes;
+      var newData, zzdata, cloneData, key, fileItemKey, cloneAttributes;
       return _regeneratorRuntime.wrap(function _callee5$(_context5) {
@@ -834,9 +840,10 @@ while (1) {
               newData = JSON.parse(sessionStorage.getItem('data'));
+              zzdata = _extends(_extends({}, mainGeneratorState.data), newData);
               dispatch({
                 type: 'updateData',
                 payload: {
-                  data: newData
+                  data: zzdata
                 }
               });
-              cloneData = deepClone(newData);
+              cloneData = deepClone(zzdata);
 
@@ -850,12 +857,12 @@ for (key in mainGeneratorState.fileData) {
               cloneAttributes = deepClone(mainGeneratorState.attributes);
-              _context5.prev = 9;
+              _context5.prev = 10;
               return _context5.abrupt("return", pageFunctionObj[functionName](cloneData, cloneAttributes, propOptions, params));
 
-            case 13:
-              _context5.prev = 13;
-              _context5.t0 = _context5["catch"](9);
+            case 14:
+              _context5.prev = 14;
+              _context5.t0 = _context5["catch"](10);
               console.error("\u8C03\u7528\u65B9\u6CD5:[".concat(functionName, "]\u65F6\u51FA\u9519"));
               throw new Error(_context5.t0);
 
-            case 17:
+            case 18:
             case "end":
@@ -865,3 +872,3 @@ return _context5.stop();
         }
-      }, _callee5, null, [[9, 13]]);
+      }, _callee5, null, [[10, 14]]);
     }));
@@ -868,0 +875,0 @@ }; // 更新cabin对外暴露的方法,如果pageFunctionObj变了就得变

es/widgets/form/Form.js

@@ -75,32 +75,42 @@ 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]));
+    var newdata = {};
 
     for (var key in data) {
-      for (var formkey in data[key]) {
-        if (data[key][formkey] && data[key][formkey]._isAMomentObject) {
-          var gs = void 0;
-          var format = attrs[key][formkey].format;
-          var picker = attrs[key][formkey].picker;
+      var formdata = {};
 
-          if (format) {
-            gs = format;
-          } else {
-            if (picker == 'month') {
-              gs = 'YYYY-MM';
-            } else if (picker == 'week') {
-              gs = 'YYYY-wo';
-            } else if (picker == 'quarter') {
-              gs = 'YYYY-\\QQ';
-            } else if (picker == 'year') {
-              gs = 'YYYY';
+      if (!Array.isArray(data[key])) {
+        for (var formkey in data[key]) {
+          if (data[key][formkey] && data[key][formkey]._isAMomentObject) {
+            var gs = void 0;
+            var format = attrs[key][formkey].format;
+            var picker = attrs[key][formkey].picker;
+
+            if (format) {
+              gs = format;
             } else {
-              gs = 'YYYY-MM-DD';
+              if (picker == 'month') {
+                gs = 'YYYY-MM';
+              } else if (picker == 'week') {
+                gs = 'YYYY-wo';
+              } else if (picker == 'quarter') {
+                gs = 'YYYY-\\QQ';
+              } else if (picker == 'year') {
+                gs = 'YYYY';
+              } else {
+                gs = 'YYYY-MM-DD';
+              }
             }
+
+            formdata;
+            formdata[formkey] = data[key][formkey].format(gs);
+          } else {
+            formdata[formkey] = data[key][formkey];
           }
+        }
 
-          data[key][formkey] = data[key][formkey].format(gs);
-        }
+        newdata[key] = formdata;
       }
     }
 
-    sessionStorage.setItem('data', JSON.stringify(data));
+    sessionStorage.setItem('data', JSON.stringify(newdata));
   }, [data]);
@@ -147,5 +157,45 @@
 
-    newData = _extends(_extends({}, newarr), _defineProperty({}, name, _extends({}, formData)));
-    sessionStorage.setItem('data', JSON.stringify(newData));
+    newData = _extends(_extends(_extends({}, data), newarr), _defineProperty({}, name, _extends({}, formData)));
+    var newdata = {};
 
+    for (var _key in newData) {
+      var formdata = {};
+
+      if (!Array.isArray(newData[_key])) {
+        for (var formkey in newData[_key]) {
+          if (newData[_key][formkey] && newData[_key][formkey]._isAMomentObject) {
+            var _gs = void 0;
+
+            var _format = attrs[_key][formkey].format;
+            var _picker = attrs[_key][formkey].picker;
+
+            if (_format) {
+              _gs = _format;
+            } else {
+              if (_picker == 'month') {
+                _gs = 'YYYY-MM';
+              } else if (_picker == 'week') {
+                _gs = 'YYYY-wo';
+              } else if (_picker == 'quarter') {
+                _gs = 'YYYY-\\QQ';
+              } else if (_picker == 'year') {
+                _gs = 'YYYY';
+              } else {
+                _gs = 'YYYY-MM-DD';
+              }
+            }
+
+            formdata;
+            formdata[formkey] = newData[_key][formkey].format(_gs);
+          } else {
+            formdata[formkey] = newData[_key][formkey];
+          }
+        }
+
+        newdata[_key] = formdata;
+      }
+    }
+
+    sessionStorage.setItem('data', JSON.stringify(newdata));
+
     if (result) {
@@ -152,0 +202,0 @@ var newFileData = _extends(_extends({}, fileData), _defineProperty({}, name, _extends({}, result)));

es/widgets/table/TableWidget.js

@@ -48,2 +48,4 @@ function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
+  console.log(data);
+
   var _useState = useState(10),
@@ -402,43 +404,8 @@ _useState2 = _slicedToArray(_useState, 2),
 
-        var newData = _.cloneDeep(newarr);
+        var newData = _.cloneDeep(data);
 
-        var newcurrentData = [];
+        var zzdata = _extends(_extends({}, newData), newarr);
 
-        for (var i = 0; i < newData.length; i++) {
-          var item = newData[i];
-          var arr = {};
-
-          for (var key in item) {
-            if (item[key] && item[key]._isAMomentObject) {
-              var gs = void 0;
-              var sourceMask = attrs[tableName][key].sourceMask;
-              var picker = attrs[tableName][key].picker;
-
-              if (sourceMask) {
-                gs = sourceMask;
-              } else {
-                if (picker == 'month') {
-                  gs = 'YYYY-MM';
-                } else if (picker == 'week') {
-                  gs = 'YYYY-wo';
-                } else if (picker == 'quarter') {
-                  gs = 'YYYY-\\QQ';
-                } else if (picker == 'year') {
-                  gs = 'YYYY';
-                } else {
-                  gs = 'YYYY-MM-DD';
-                }
-              }
-
-              arr[key] = item[key].format(gs);
-            } else {
-              arr[key] = item[key];
-            }
-          }
-
-          newcurrentData.push(arr);
-        }
-
-        newData[tableName] = newcurrentData;
-        setData(newData);
+        zzdata[tableName] = currentData;
+        setData(zzdata);
       },
@@ -445,0 +412,0 @@ ref: tableRef,

lib/MainGenerator.js

@@ -569,9 +569,12 @@ "use strict";
       var newData = JSON.parse(sessionStorage.getItem('data'));
+
+      var zzdata = _extends(_extends({}, mainGeneratorState.data), newData);
+
       dispatch({
         type: 'updateData',
         payload: {
-          data: newData
+          data: zzdata
         }
       });
-      var cloneData = (0, _clone["default"])(newData);
+      var cloneData = (0, _clone["default"])(zzdata);
 
@@ -632,9 +635,12 @@ for (var key in mainGeneratorState.fileData) {
     var newData = JSON.parse(sessionStorage.getItem('data'));
+
+    var zzdata = _extends(_extends({}, mainGeneratorState.data), newData);
+
     dispatch({
       type: 'updateData',
       payload: {
-        data: newData
+        data: zzdata
       }
     });
-    var cloneData = (0, _clone["default"])(newData);
+    var cloneData = (0, _clone["default"])(zzdata);
 
@@ -840,3 +846,3 @@ for (var _len2 = arguments.length, leftParams = new Array(_len2 > 1 ? _len2 - 1 : 0), _key3 = 1; _key3 < _len2; _key3++) {
     return __awaiter(_this, void 0, void 0, /*#__PURE__*/_regenerator["default"].mark(function _callee5() {
-      var newData, cloneData, key, fileItemKey, cloneAttributes;
+      var newData, zzdata, cloneData, key, fileItemKey, cloneAttributes;
       return _regenerator["default"].wrap(function _callee5$(_context5) {
@@ -863,9 +869,10 @@ while (1) {
               newData = JSON.parse(sessionStorage.getItem('data'));
+              zzdata = _extends(_extends({}, mainGeneratorState.data), newData);
               dispatch({
                 type: 'updateData',
                 payload: {
-                  data: newData
+                  data: zzdata
                 }
               });
-              cloneData = (0, _clone["default"])(newData);
+              cloneData = (0, _clone["default"])(zzdata);
 
@@ -879,12 +886,12 @@ for (key in mainGeneratorState.fileData) {
               cloneAttributes = (0, _clone["default"])(mainGeneratorState.attributes);
-              _context5.prev = 9;
+              _context5.prev = 10;
               return _context5.abrupt("return", pageFunctionObj[functionName](cloneData, cloneAttributes, propOptions, params));
 
-            case 13:
-              _context5.prev = 13;
-              _context5.t0 = _context5["catch"](9);
+            case 14:
+              _context5.prev = 14;
+              _context5.t0 = _context5["catch"](10);
               console.error("\u8C03\u7528\u65B9\u6CD5:[".concat(functionName, "]\u65F6\u51FA\u9519"));
               throw new Error(_context5.t0);
 
-            case 17:
+            case 18:
             case "end":
@@ -894,3 +901,3 @@ return _context5.stop();
         }
-      }, _callee5, null, [[9, 13]]);
+      }, _callee5, null, [[10, 14]]);
     }));
@@ -897,0 +904,0 @@ }; // 更新cabin对外暴露的方法,如果pageFunctionObj变了就得变

lib/widgets/form/Form.js

@@ -91,32 +91,42 @@ "use strict";
     formInstance.setFieldsValue(_extends({}, data[name]));
+    var newdata = {};
 
     for (var key in data) {
-      for (var formkey in data[key]) {
-        if (data[key][formkey] && data[key][formkey]._isAMomentObject) {
-          var gs = void 0;
-          var format = attrs[key][formkey].format;
-          var picker = attrs[key][formkey].picker;
+      var formdata = {};
 
-          if (format) {
-            gs = format;
-          } else {
-            if (picker == 'month') {
-              gs = 'YYYY-MM';
-            } else if (picker == 'week') {
-              gs = 'YYYY-wo';
-            } else if (picker == 'quarter') {
-              gs = 'YYYY-\\QQ';
-            } else if (picker == 'year') {
-              gs = 'YYYY';
+      if (!Array.isArray(data[key])) {
+        for (var formkey in data[key]) {
+          if (data[key][formkey] && data[key][formkey]._isAMomentObject) {
+            var gs = void 0;
+            var format = attrs[key][formkey].format;
+            var picker = attrs[key][formkey].picker;
+
+            if (format) {
+              gs = format;
             } else {
-              gs = 'YYYY-MM-DD';
+              if (picker == 'month') {
+                gs = 'YYYY-MM';
+              } else if (picker == 'week') {
+                gs = 'YYYY-wo';
+              } else if (picker == 'quarter') {
+                gs = 'YYYY-\\QQ';
+              } else if (picker == 'year') {
+                gs = 'YYYY';
+              } else {
+                gs = 'YYYY-MM-DD';
+              }
             }
+
+            formdata;
+            formdata[formkey] = data[key][formkey].format(gs);
+          } else {
+            formdata[formkey] = data[key][formkey];
           }
+        }
 
-          data[key][formkey] = data[key][formkey].format(gs);
-        }
+        newdata[key] = formdata;
       }
     }
 
-    sessionStorage.setItem('data', JSON.stringify(data));
+    sessionStorage.setItem('data', JSON.stringify(newdata));
   }, [data]);
@@ -163,5 +173,45 @@
 
-    newData = _extends(_extends({}, newarr), _defineProperty({}, name, _extends({}, formData)));
-    sessionStorage.setItem('data', JSON.stringify(newData));
+    newData = _extends(_extends(_extends({}, data), newarr), _defineProperty({}, name, _extends({}, formData)));
+    var newdata = {};
 
+    for (var _key in newData) {
+      var formdata = {};
+
+      if (!Array.isArray(newData[_key])) {
+        for (var formkey in newData[_key]) {
+          if (newData[_key][formkey] && newData[_key][formkey]._isAMomentObject) {
+            var _gs = void 0;
+
+            var _format = attrs[_key][formkey].format;
+            var _picker = attrs[_key][formkey].picker;
+
+            if (_format) {
+              _gs = _format;
+            } else {
+              if (_picker == 'month') {
+                _gs = 'YYYY-MM';
+              } else if (_picker == 'week') {
+                _gs = 'YYYY-wo';
+              } else if (_picker == 'quarter') {
+                _gs = 'YYYY-\\QQ';
+              } else if (_picker == 'year') {
+                _gs = 'YYYY';
+              } else {
+                _gs = 'YYYY-MM-DD';
+              }
+            }
+
+            formdata;
+            formdata[formkey] = newData[_key][formkey].format(_gs);
+          } else {
+            formdata[formkey] = newData[_key][formkey];
+          }
+        }
+
+        newdata[_key] = formdata;
+      }
+    }
+
+    sessionStorage.setItem('data', JSON.stringify(newdata));
+
     if (result) {
@@ -168,0 +218,0 @@ var newFileData = _extends(_extends({}, fileData), _defineProperty({}, name, _extends({}, result)));

lib/widgets/table/TableWidget.js

@@ -73,2 +73,4 @@ "use strict";
 
+  console.log(data);
+
   var _useState = (0, _react.useState)(10),
@@ -429,43 +431,8 @@ _useState2 = _slicedToArray(_useState, 2),
 
-        var newData = _lodash["default"].cloneDeep(newarr);
+        var newData = _lodash["default"].cloneDeep(data);
 
-        var newcurrentData = [];
+        var zzdata = _extends(_extends({}, newData), newarr);
 
-        for (var i = 0; i < newData.length; i++) {
-          var item = newData[i];
-          var arr = {};
-
-          for (var key in item) {
-            if (item[key] && item[key]._isAMomentObject) {
-              var gs = void 0;
-              var sourceMask = attrs[tableName][key].sourceMask;
-              var picker = attrs[tableName][key].picker;
-
-              if (sourceMask) {
-                gs = sourceMask;
-              } else {
-                if (picker == 'month') {
-                  gs = 'YYYY-MM';
-                } else if (picker == 'week') {
-                  gs = 'YYYY-wo';
-                } else if (picker == 'quarter') {
-                  gs = 'YYYY-\\QQ';
-                } else if (picker == 'year') {
-                  gs = 'YYYY';
-                } else {
-                  gs = 'YYYY-MM-DD';
-                }
-              }
-
-              arr[key] = item[key].format(gs);
-            } else {
-              arr[key] = item[key];
-            }
-          }
-
-          newcurrentData.push(arr);
-        }
-
-        newData[tableName] = newcurrentData;
-        setData(newData);
+        zzdata[tableName] = currentData;
+        setData(zzdata);
       },
@@ -472,0 +439,0 @@ ref: tableRef,

package.json

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

No alert changes

Improved metrics

Total package byte prevSize

1175169

increased by0.11%

Lines of code

25422

increased by0.12%

No dependency changes