cloud-business 0.1.120-8 → 0.1.120-9

package/cloud-business.js

@@ -30891,39 +30891,31 @@
               }
             });
           }
-          if (city) {
-            editValues.push({
-              field: "cityName",
-              value: {
-                "id": city,
-                "name": cityName || customerInfo.cityName
-              }
-            });
-          }
-          if (district) {
-            editValues.push({
-              field: "districtName",
-              value: {
-                "id": district,
-                "name": districtName || customerInfo.districtName
-              }
-            });
-          }
-          if (town) {
-            editValues.push({
-              field: "townName",
-              value: {
-                "id": town,
-                "name": townName || customerInfo.townName
-              }
-            });
-          }
-          if (address) {
-            editValues.push({
-              field: "address",
-              value: address
-            });
-          }
+          editValues.push({
+            field: "cityName",
+            value: {
+              "id": city,
+              "name": city ? cityName || customerInfo.cityName : ''
+            }
+          });
+          editValues.push({
+            field: "districtName",
+            value: {
+              "id": district,
+              "name": district ? districtName || customerInfo.districtName : ''
+            }
+          });
+          editValues.push({
+            field: "townName",
+            value: {
+              "id": town,
+              "name": town ? townName || customerInfo.townName : ''
+            }
+          });
+          editValues.push({
+            field: "address",
+            value: address
+          });
           var saveObj = {};
           editValues.forEach(function (item) {
             var _customerInfoOrigin$i = customerInfoOrigin[item.field],
@@ -31210,7 +31202,7 @@
   function renderInfoValue(value) {
     return value || "-";
   }
-  function renderInfoValueSpecial(value, type) {
+  function renderInfoValueSpecial(value, type, infoValue) {
     var tip = {
       type: 1,
       text: value
@@ -31220,7 +31212,7 @@
         className: "customer-info-text-address"
       }, /*#__PURE__*/React__default['default'].createElement(OverLengthTip, {
         tip: tip
-      })), /*#__PURE__*/React__default['default'].createElement(cloudReactV2.Tooltip, {
+      })), infoValue === BASIC_INFO && /*#__PURE__*/React__default['default'].createElement(cloudReactV2.Tooltip, {
         placement: "top",
         content: "\u6B64\u5904\u663E\u793A\u5E73\u53F0\u4FA7\u63D0\u4F9B\u7684\u5BC6\u6587\u6570\u636E\uFF08\u5E73\u53F0\u4FA7\u4E0D\u652F\u6301\u89E3\u5BC6\u64CD\u4F5C\uFF09"
       }, /*#__PURE__*/React__default['default'].createElement(cloudReactV2.Icon, {
@@ -31232,7 +31224,7 @@
         className: "customer-info-text-address"
       }, /*#__PURE__*/React__default['default'].createElement(OverLengthTip, {
         tip: tip
-      })), /*#__PURE__*/React__default['default'].createElement(cloudReactV2.Tooltip, {
+      })), infoValue === BASIC_INFO && /*#__PURE__*/React__default['default'].createElement(cloudReactV2.Tooltip, {
         placement: "top",
         content: "\u6B64\u5904\u663E\u793A\u5E73\u53F0\u4FA7\u63D0\u4F9B\u7684\u5BC6\u6587\u6570\u636E\uFF08\u5E73\u53F0\u4FA7\u4E0D\u652F\u6301\u89E3\u5BC6\u64CD\u4F5C\uFF09"
       }, /*#__PURE__*/React__default['default'].createElement(cloudReactV2.Icon, {
@@ -31276,10 +31268,6 @@
       _useState12 = _slicedToArray(_useState11, 2),
       customerInfoOrigin = _useState12[0],
       setCustomerInfoOrigin = _useState12[1];
-    var _useState13 = React.useState({}),
-      _useState14 = _slicedToArray(_useState13, 2),
-      encryptInfo = _useState14[0],
-      setEncryptInfo = _useState14[1];
     var closeCustomerInfoEdit = /*#__PURE__*/function () {
       var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(type) {
         var v, data;
@@ -31290,7 +31278,7 @@
 
               // 保存成功后重新拉取数据
               if (!(type === 'save')) {
-                _context.next = 8;
+                _context.next = 7;
                 break;
               }
               v = {
@@ -31305,11 +31293,8 @@
               }, v);
             case 5:
               data = _context.sent;
-              setEncryptInfo(data);
-              return _context.abrupt("return");
-            case 8:
-              setCustomerInfo(encryptInfo);
-            case 9:
+              setCustomerInfo(_objectSpread2(_objectSpread2({}, data), v));
+            case 7:
             case "end":
               return _context.stop();
           }
@@ -31404,12 +31389,6 @@
                     }
                   }
                 });
-                if (type) {
-                  // 处理展开隐藏操作
-                  setCustomerInfo(_objectSpread2(_objectSpread2(_objectSpread2({}, customerInfo), v), {}, _defineProperty(_defineProperty({}, "".concat(type, "Temp"), info[type]), type, customerInfo[type])));
-                } else {
-                  setCustomerInfo(_objectSpread2(_objectSpread2({}, info), v));
-                }
                 return info;
               });
             case 2:
@@ -31465,7 +31444,7 @@
               }, v);
             case 8:
               data = _context4.sent;
-              setEncryptInfo(data);
+              setCustomerInfo(_objectSpread2(_objectSpread2({}, data), v));
               if (data) {
                 setInfoValue(id);
               }
@@ -31481,7 +31460,7 @@
     }();
     var changeCustomerInfo = /*#__PURE__*/function () {
       var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(ci, type) {
-        var res, _res, _res2, _res3;
+        var res, _res, _res2, _res3, info;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
@@ -31542,11 +31521,11 @@
               return _context5.abrupt("return");
             case 25:
               if (!(infoValue === MAINTAIN_INFO)) {
-                _context5.next = 30;
+                _context5.next = 32;
                 break;
               }
               if (!(type === 'fullName' && !customerInfo.fullNameTemp || type === 'mobile' && !customerInfo.mobileTemp || type === 'email' && !customerInfo.emailTemp || type === 'address' && !customerInfo.addressTemp)) {
-                _context5.next = 30;
+                _context5.next = 32;
                 break;
               }
               _context5.next = 29;
@@ -31554,10 +31533,13 @@
                 encrypt: false
               }, ci, type);
             case 29:
+              info = _context5.sent;
+              // 处理展开隐藏操作
+              setCustomerInfo(_objectSpread2(_objectSpread2(_objectSpread2({}, customerInfo), ci), {}, _defineProperty(_defineProperty({}, "".concat(type, "Temp"), info[type]), type, customerInfo[type])));
               return _context5.abrupt("return");
-            case 30:
+            case 32:
               setCustomerInfo(_objectSpread2(_objectSpread2({}, customerInfo), ci));
-            case 31:
+            case 33:
             case "end":
               return _context5.stop();
           }
@@ -31650,7 +31632,7 @@
       className: "customer-info"
     }, /*#__PURE__*/React__default['default'].createElement("span", null, "\u59D3\u540D\uFF1A"), /*#__PURE__*/React__default['default'].createElement("span", {
       className: "customer-info-text"
-    }, renderInfoValueSpecial(customerInfo.fullNameV ? customerInfo.fullNameTemp : customerInfo.fullName, 'fullName'), customerInfo.fullName ? !customerInfo.fullNameV ? /*#__PURE__*/React__default['default'].createElement(cloudReactV2.Icon, {
+    }, renderInfoValueSpecial(customerInfo.fullNameV ? customerInfo.fullNameTemp : customerInfo.fullName, 'fullName', infoValue), customerInfo.fullName ? !customerInfo.fullNameV ? /*#__PURE__*/React__default['default'].createElement(cloudReactV2.Icon, {
       type: "view",
       onClick: function onClick() {
         return changeCustomerInfo({
@@ -31672,7 +31654,7 @@
       className: "customer-info"
     }, /*#__PURE__*/React__default['default'].createElement("span", null, "\u6700\u65B0\u624B\u673A\u53F7\uFF1A"), /*#__PURE__*/React__default['default'].createElement("span", {
       className: "customer-info-text customer-info-text-special"
-    }, renderInfoValueSpecial(customerInfo.mobileV ? customerInfo.mobileTemp : customerInfo.mobile, 'mobile'), customerInfo.mobile ? !customerInfo.mobileV ? /*#__PURE__*/React__default['default'].createElement(cloudReactV2.Icon, {
+    }, renderInfoValueSpecial(customerInfo.mobileV ? customerInfo.mobileTemp : customerInfo.mobile, 'mobile', infoValue), customerInfo.mobile ? !customerInfo.mobileV ? /*#__PURE__*/React__default['default'].createElement(cloudReactV2.Icon, {
       type: "view",
       onClick: function onClick() {
         return changeCustomerInfo({
@@ -31716,7 +31698,7 @@
       className: "customer-info"
     }, /*#__PURE__*/React__default['default'].createElement("span", null, "\u5730\u5740\uFF1A"), /*#__PURE__*/React__default['default'].createElement("span", {
       className: "customer-info-text"
-    }, renderInfoValueSpecial("".concat(customerInfo.stateName || '').concat(customerInfo.cityName || '').concat(customerInfo.districtName || '').concat(customerInfo.addressV ? customerInfo.addressTemp : customerInfo.address || ''), 'address'), customerInfo.address ? !customerInfo.addressV ? /*#__PURE__*/React__default['default'].createElement(cloudReactV2.Icon, {
+    }, renderInfoValueSpecial("".concat(customerInfo.stateName || '').concat(customerInfo.cityName || '').concat(customerInfo.districtName || '').concat(customerInfo.addressV ? customerInfo.addressTemp : customerInfo.address || ''), 'address', infoValue), customerInfo.address ? !customerInfo.addressV ? /*#__PURE__*/React__default['default'].createElement(cloudReactV2.Icon, {
       type: "view",
       onClick: function onClick() {
         return changeCustomerInfo({
@@ -146590,7 +146572,7 @@
   }
   // 检验当前运行环境
   if (typeof window === 'undefined') {
-    console.warn('cloud-business@0.1.120-8 仅支持在浏览器环境进行使用!');
+    console.warn('cloud-business@0.1.120-9 仅支持在浏览器环境进行使用!');
   }
   var bodys = document.getElementsByTagName('body')[0];
   var colors = [1, 2, 3, 4, 5, 6, 7];
@@ -146600,7 +146582,7 @@
       bodys.style.setProperty("--shuyunBlue".concat(i$2 + 1), color);
     }
   }
-  var version = '0.1.120-8';
+  var version = '0.1.120-9';
 
   exports.AreaSelector = AreaSelector;
   exports.AreaSelectorNew = AreaSelector$1;