npm - @kmkf-fe-packages/basic-components - Versions diffs - 0.21.6-alpha.1 → 0.21.6-alpha.3 - Mend

@kmkf-fe-packages/basic-components 0.21.6-alpha.1 → 0.21.6-alpha.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/dist/index.esm.js CHANGED Viewed

@@ -9766,9 +9766,14 @@ var LogisticsMoreTrajectory = function LogisticsMoreTrajectory(props) {
     _useState8 = _slicedToArray(_useState7, 2),
     changeValue = _useState8[0],
     setChangeValue = _useState8[1];
+  var firstRef = useRef(true);
+  var hasSave = useRef(false);
   useEffect(function () {
-    setInitValue(value);
-  }, []);
+    if (value.length && firstRef.current) {
+      setInitValue(value);
+      firstRef.current = false;
+    }
+  }, [value]);
   useDebounceEffect(function () {
     initHandle({
       initValue: initValue,
@@ -9779,35 +9784,56 @@ var LogisticsMoreTrajectory = function LogisticsMoreTrajectory(props) {
   });
   var initHandle = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
-      var initValue, value, initList, valueList, changeList, hasValue, listValue, requestList, requestValues;
+      var initValue, value, initList, valueList, changeList, initSnapshotList, valueSnapshotList, hasValue, listValue, requestList, requestValues;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             initValue = _ref.initValue, value = _ref.value;
             initList = initValue.map(function (item) {
-              return {
-                trajectoryCompany: item.trajectoryCompany,
-                trajectoryCode: item.trajectoryCode,
-                trajectoryPhone: item.trajectoryPhone
-              };
+              if (item.trajectoryCompany === 'SF') {
+                return {
+                  trajectoryCompany: item.trajectoryCompany,
+                  trajectoryCode: item.trajectoryCode,
+                  trajectoryPhone: item.trajectoryPhone
+                };
+              } else {
+                return {
+                  trajectoryCompany: item.trajectoryCompany,
+                  trajectoryCode: item.trajectoryCode
+                };
+              }
             });
             valueList = value.map(function (item) {
-              return {
-                trajectoryCompany: item.trajectoryCompany,
-                trajectoryCode: item.trajectoryCode,
-                trajectoryPhone: item.trajectoryPhone
-              };
+              if (item.trajectoryCompany === 'SF') {
+                return {
+                  trajectoryCompany: item.trajectoryCompany,
+                  trajectoryCode: item.trajectoryCode,
+                  trajectoryPhone: item.trajectoryPhone
+                };
+              } else {
+                return {
+                  trajectoryCompany: item.trajectoryCompany,
+                  trajectoryCode: item.trajectoryCode
+                };
+              }
             });
             changeList = changeValue.map(function (item) {
-              return {
-                trajectoryCompany: item.trajectoryCompany,
-                trajectoryCode: item.trajectoryCode,
-                trajectoryPhone: item.trajectoryPhone
-              };
+              if (item.trajectoryCompany === 'SF') {
+                return {
+                  trajectoryCompany: item.trajectoryCompany,
+                  trajectoryCode: item.trajectoryCode,
+                  trajectoryPhone: item.trajectoryPhone
+                };
+              } else {
+                return {
+                  trajectoryCompany: item.trajectoryCompany,
+                  trajectoryCode: item.trajectoryCode
+                };
+              }
             }); // 1、初始值没有 传入值有请求快照
             // 2、初始值有 传入值有 其中有不一样的请求快照
             // 3、初始值有 传入值有 都一样的返回初始值
-            // console.log('list', initList, valueList, changeList);
+            console.log('list', initList, valueList, changeList);
             // console.log('old', initValue, value, changeValue);
             // console.log('一样', JSON.stringify(initList) !== JSON.stringify(valueList));
             // console.log(
@@ -9815,23 +9841,39 @@ var LogisticsMoreTrajectory = function LogisticsMoreTrajectory(props) {
             //   JSON.stringify(changeList) !== JSON.stringify(valueList),
             // );
             if (!(JSON.stringify(initList) === JSON.stringify(valueList))) {
-              _context.next = 8;
+              _context.next = 11;
               break;
             }
-            setNewValue(initValue);
-            _context.next = 20;
+            initSnapshotList = initValue.reduce(function (prv, next) {
+              prv += next.trajectorySnapshot;
+              return prv;
+            }, '');
+            valueSnapshotList = value.reduce(function (prv, next) {
+              prv += next.trajectorySnapshot;
+              return prv;
+            }, '');
+            if (initSnapshotList === valueSnapshotList) {
+              hasSave.current = false;
+              setNewValue(value);
+            } else if (!hasSave.current) {
+              hasSave.current = true;
+              setNewValue(initValue);
+              onChange(initValue);
+            }
+            _context.next = 24;
             break;
-          case 8:
+          case 11:
             if (!(JSON.stringify(initList) !== JSON.stringify(valueList) && JSON.stringify(changeList) !== JSON.stringify(valueList))) {
-              _context.next = 20;
+              _context.next = 24;
               break;
             }
+            hasSave.current = false;
             hasValue = valueList.every(function (item) {
               return item.trajectoryCompany && item.trajectoryCode;
             });
             listValue = cloneDeep(value);
             if (!hasValue) {
-              _context.next = 17;
+              _context.next = 21;
               break;
             }
             requestList = valueList.map(function (item) {
@@ -9844,9 +9886,9 @@ var LogisticsMoreTrajectory = function LogisticsMoreTrajectory(props) {
                 }
               });
             });
-            _context.next = 15;
+            _context.next = 19;
             return Promise.allSettled(requestList);
-          case 15:
+          case 19:
             requestValues = _context.sent;
             listValue = cloneDeep(value).map(function (item, index) {
               var _requestValues$index, _requestValues$index$, _requestValues$index$2;
@@ -9854,11 +9896,11 @@ var LogisticsMoreTrajectory = function LogisticsMoreTrajectory(props) {
                 trajectorySnapshot: (_requestValues$index = requestValues[index]) === null || _requestValues$index === void 0 ? void 0 : (_requestValues$index$ = _requestValues$index.value) === null || _requestValues$index$ === void 0 ? void 0 : (_requestValues$index$2 = _requestValues$index$.data) === null || _requestValues$index$2 === void 0 ? void 0 : _requestValues$index$2.logisticsStatusDesc
               });
             });
-          case 17:
+          case 21:
             setChangeValue(listValue);
             setNewValue(listValue);
             onChange(listValue);
-          case 20:
+          case 24:
           case "end":
             return _context.stop();
         }

package/dist/index.js CHANGED Viewed

@@ -9777,9 +9777,14 @@ var LogisticsMoreTrajectory = function LogisticsMoreTrajectory(props) {
     _useState8 = _slicedToArray(_useState7, 2),
     changeValue = _useState8[0],
     setChangeValue = _useState8[1];
+  var firstRef = React.useRef(true);
+  var hasSave = React.useRef(false);
   React.useEffect(function () {
-    setInitValue(value);
-  }, []);
+    if (value.length && firstRef.current) {
+      setInitValue(value);
+      firstRef.current = false;
+    }
+  }, [value]);
   ahooks.useDebounceEffect(function () {
     initHandle({
       initValue: initValue,
@@ -9790,35 +9795,56 @@ var LogisticsMoreTrajectory = function LogisticsMoreTrajectory(props) {
   });
   var initHandle = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
-      var initValue, value, initList, valueList, changeList, hasValue, listValue, requestList, requestValues;
+      var initValue, value, initList, valueList, changeList, initSnapshotList, valueSnapshotList, hasValue, listValue, requestList, requestValues;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             initValue = _ref.initValue, value = _ref.value;
             initList = initValue.map(function (item) {
-              return {
-                trajectoryCompany: item.trajectoryCompany,
-                trajectoryCode: item.trajectoryCode,
-                trajectoryPhone: item.trajectoryPhone
-              };
+              if (item.trajectoryCompany === 'SF') {
+                return {
+                  trajectoryCompany: item.trajectoryCompany,
+                  trajectoryCode: item.trajectoryCode,
+                  trajectoryPhone: item.trajectoryPhone
+                };
+              } else {
+                return {
+                  trajectoryCompany: item.trajectoryCompany,
+                  trajectoryCode: item.trajectoryCode
+                };
+              }
             });
             valueList = value.map(function (item) {
-              return {
-                trajectoryCompany: item.trajectoryCompany,
-                trajectoryCode: item.trajectoryCode,
-                trajectoryPhone: item.trajectoryPhone
-              };
+              if (item.trajectoryCompany === 'SF') {
+                return {
+                  trajectoryCompany: item.trajectoryCompany,
+                  trajectoryCode: item.trajectoryCode,
+                  trajectoryPhone: item.trajectoryPhone
+                };
+              } else {
+                return {
+                  trajectoryCompany: item.trajectoryCompany,
+                  trajectoryCode: item.trajectoryCode
+                };
+              }
             });
             changeList = changeValue.map(function (item) {
-              return {
-                trajectoryCompany: item.trajectoryCompany,
-                trajectoryCode: item.trajectoryCode,
-                trajectoryPhone: item.trajectoryPhone
-              };
+              if (item.trajectoryCompany === 'SF') {
+                return {
+                  trajectoryCompany: item.trajectoryCompany,
+                  trajectoryCode: item.trajectoryCode,
+                  trajectoryPhone: item.trajectoryPhone
+                };
+              } else {
+                return {
+                  trajectoryCompany: item.trajectoryCompany,
+                  trajectoryCode: item.trajectoryCode
+                };
+              }
             }); // 1、初始值没有 传入值有请求快照
             // 2、初始值有 传入值有 其中有不一样的请求快照
             // 3、初始值有 传入值有 都一样的返回初始值
-            // console.log('list', initList, valueList, changeList);
+            console.log('list', initList, valueList, changeList);
             // console.log('old', initValue, value, changeValue);
             // console.log('一样', JSON.stringify(initList) !== JSON.stringify(valueList));
             // console.log(
@@ -9826,23 +9852,39 @@ var LogisticsMoreTrajectory = function LogisticsMoreTrajectory(props) {
             //   JSON.stringify(changeList) !== JSON.stringify(valueList),
             // );
             if (!(JSON.stringify(initList) === JSON.stringify(valueList))) {
-              _context.next = 8;
+              _context.next = 11;
               break;
             }
-            setNewValue(initValue);
-            _context.next = 20;
+            initSnapshotList = initValue.reduce(function (prv, next) {
+              prv += next.trajectorySnapshot;
+              return prv;
+            }, '');
+            valueSnapshotList = value.reduce(function (prv, next) {
+              prv += next.trajectorySnapshot;
+              return prv;
+            }, '');
+            if (initSnapshotList === valueSnapshotList) {
+              hasSave.current = false;
+              setNewValue(value);
+            } else if (!hasSave.current) {
+              hasSave.current = true;
+              setNewValue(initValue);
+              onChange(initValue);
+            }
+            _context.next = 24;
             break;
-          case 8:
+          case 11:
             if (!(JSON.stringify(initList) !== JSON.stringify(valueList) && JSON.stringify(changeList) !== JSON.stringify(valueList))) {
-              _context.next = 20;
+              _context.next = 24;
               break;
             }
+            hasSave.current = false;
             hasValue = valueList.every(function (item) {
               return item.trajectoryCompany && item.trajectoryCode;
             });
             listValue = lodash.cloneDeep(value);
             if (!hasValue) {
-              _context.next = 17;
+              _context.next = 21;
               break;
             }
             requestList = valueList.map(function (item) {
@@ -9855,9 +9897,9 @@ var LogisticsMoreTrajectory = function LogisticsMoreTrajectory(props) {
                 }
               });
             });
-            _context.next = 15;
+            _context.next = 19;
             return Promise.allSettled(requestList);
-          case 15:
+          case 19:
             requestValues = _context.sent;
             listValue = lodash.cloneDeep(value).map(function (item, index) {
               var _requestValues$index, _requestValues$index$, _requestValues$index$2;
@@ -9865,11 +9907,11 @@ var LogisticsMoreTrajectory = function LogisticsMoreTrajectory(props) {
                 trajectorySnapshot: (_requestValues$index = requestValues[index]) === null || _requestValues$index === void 0 ? void 0 : (_requestValues$index$ = _requestValues$index.value) === null || _requestValues$index$ === void 0 ? void 0 : (_requestValues$index$2 = _requestValues$index$.data) === null || _requestValues$index$2 === void 0 ? void 0 : _requestValues$index$2.logisticsStatusDesc
               });
             });
-          case 17:
+          case 21:
             setChangeValue(listValue);
             setNewValue(listValue);
             onChange(listValue);
-          case 20:
+          case 24:
           case "end":
             return _context.stop();
         }

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "0.21.6-alpha.1",
+  "version": "0.21.6-alpha.3",
   "description": "> TODO: description",
   "homepage": "",
   "license": "ISC",
@@ -20,7 +20,7 @@
     "watch": "nodemon --ignore dist/ --ignore node_modules/ --watch src/ -C -e ts,tsx,less --debug -x 'yarn async'"
   },
   "dependencies": {
-    "@kmkf-fe-packages/kmkf-utils": "^0.21.6-alpha.1",
+    "@kmkf-fe-packages/kmkf-utils": "^0.21.6-alpha.3",
     "ahooks": "^3.7.8",
     "lodash": "^4.17.21",
     "pubsub-js": "^1.9.4",
@@ -62,5 +62,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "d542c40a1e72468eba0e31e0e290460dad5fbc84"
+  "gitHead": "82b6320bc9ae14f532b5aa543d0e6040900c5d78"
 }