bxs-tools-ui 3.2.0-2 → 3.2.0-4

package/lib/product-info/index.js

@@ -9518,7 +9518,7 @@
         max: max || Infinity,
         message: message,
         validator: function validator(value, rule) {
-          return !value || value >= rule.min && value <= rule.max;
+          return (value || value === 0) && value >= rule.min && value <= rule.max;
         }
       });
     }
@@ -9529,7 +9529,7 @@
         multiple: ele.multi,
         message: "\u8BF7\u8F93\u5165".concat(ele.multi, "\u500D\u6570"),
         validator: function validator(value, rule) {
-          return !value || !(value % rule.multiple);
+          return (value || value === 0) && !(value % rule.multiple);
         }
       });
     }
@@ -9762,7 +9762,7 @@
                   var titleEle = (ins.eleOrderList || []).find(function (e) {
                     return e.key === 'title';
                   });
-                  if (titleEle && groupInsuranceIdEle && !Array.isArray(titleEle.value)) {
+                  if (titleEle && groupInsuranceIdEle && !Array.isArray(groupInsuranceIdEle.value)) {
                     titleEle.value = groupInsuranceIdEle.value === ins.key;
                   }
                 });
@@ -10288,6 +10288,14 @@
 
       // 处理组合险中的逻辑，并加入到产品险种列表中
       var _loop = function _loop(k) {
+        var _oldGroupInsurance$el;
+        var oldGroupInsurance = mulInsOrderList.find(function (ins) {
+          return ins.key === k;
+        });
+        var oldGroupTitleElement = oldGroupInsurance ? (_oldGroupInsurance$el = oldGroupInsurance.eleOrderList) === null || _oldGroupInsurance$el === void 0 ? void 0 : _oldGroupInsurance$el.find(function (e) {
+          return e.key === 'title';
+        }) : null;
+        var oldGroupTitleValue = oldGroupTitleElement ? oldGroupTitleElement.value : null;
         var nGroupTitleEle = newGroupInsMap[k].eleOrderList.find(function (e) {
           return e.key === 'title';
         });
@@ -10316,9 +10324,12 @@
           var checkedInsurance = checkedInsurances[0];
           // hasRequiredIns：如果组合险中有一款是必选的，则整个组合险为选中状态
           // 所有险种都不可选，则组合险不可修改且不选中。否则，组合险种可选
-          nGroupTitleEle.value = hasRequiredIns || (nGroupInsuranceIdEle.opts || []).some(function (opt) {
+          nGroupTitleEle.value = oldGroupTitleValue === false ? oldGroupTitleValue : (nGroupInsuranceIdEle.opts || []).some(function (opt) {
             return !opt.isDisabled;
           });
+          if (hasRequiredIns) {
+            nGroupTitleEle.value = hasRequiredIns;
+          }
           nGroupTitleEle.isDisabled = hasRequiredIns || (nGroupInsuranceIdEle.opts || []).every(function (opt) {
             return !!opt.isDisabled;
           });
@@ -11919,12 +11930,6 @@
         if (!['title'].includes(eleData.key)) {
           this.requiestRecommendValues();
         }
-        setTimeout(function () {
-          var refInsuranceForm = lodash.get(_this4.$refs, "insuranceForm".concat(insData.key, "[0]"));
-          if (refInsuranceForm) {
-            refInsuranceForm.validate(eleData.key);
-          }
-        }, 300);
         this.$nextTick(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
           var errorMsg;
           return _regeneratorRuntime.wrap(function (_context2) {
@@ -11956,11 +11961,11 @@
     }, {
       key: "changeProduct",
       value: function () {
-        var _changeProduct = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee3(productData, options) {
+        var _changeProduct = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee4(productData, options) {
           var _this5 = this;
-          var $listeners, inputData, verifyData, personData, groupKey, productKey, params, type, insData, eleData, planbookId, publicPbUuid, productVerifyData, eventTarget, errorMsg, hasRevalidateFlag;
-          return _regeneratorRuntime.wrap(function (_context3) {
-            while (1) switch (_context3.prev = _context3.next) {
+          var $listeners, inputData, verifyData, personData, groupKey, productKey, params, type, insData, eleData, planbookId, publicPbUuid, productVerifyData, eventTarget, errorMsg;
+          return _regeneratorRuntime.wrap(function (_context4) {
+            while (1) switch (_context4.prev = _context4.next) {
               case 0:
                 $listeners = this.$listeners, inputData = this.inputData, verifyData = this.verifyData, personData = this.personData, groupKey = this.groupKey, productKey = this.productKey, params = this.params;
                 type = options.type, insData = options.insData, eleData = options.eleData;
@@ -11975,7 +11980,7 @@
                 if (type === 'change') {
                   clearAddAndTakeAndAdjustBaoeData(productData);
                 }
-                _context3.next = 1;
+                _context4.next = 1;
                 return productDataHandler(productData, productVerifyData, personData, {
                   planbookId: planbookId,
                   eventTarget: eventTarget
@@ -11993,42 +11998,54 @@
                   eleData: eleData
                 });
                 if (errorMsg) {
-                  _context3.next = 3;
-                  break;
-                }
-                hasRevalidateFlag = (lodash.get(productData, 'mulInsOrderList') || []).some(function (ins) {
-                  return ins.revalidateFlag;
-                });
-                if (!(hasRevalidateFlag && $listeners.reCalculate)) {
-                  _context3.next = 3;
+                  _context4.next = 2;
                   break;
                 }
-                _context3.next = 2;
-                return new Promise(function (resolve, reject) {
-                  _this5.$emit('reCalculate', inputData, {
-                    planbookId: planbookId,
-                    publicPbUuid: publicPbUuid,
-                    groupKey: groupKey,
-                    productKey: productKey,
-                    isIgnoreError: true,
-                    eventTarget: eventTarget
-                  }, resolve, reject);
-                }).catch(function (err) {
-                  errorMsg = lodash.get(err, '[0].message') || lodash.get(err, 'message');
-                });
+                _context4.next = 2;
+                return this.validate().then(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
+                  var hasRevalidateFlag;
+                  return _regeneratorRuntime.wrap(function (_context3) {
+                    while (1) switch (_context3.prev = _context3.next) {
+                      case 0:
+                        hasRevalidateFlag = (lodash.get(productData, 'mulInsOrderList') || []).some(function (ins) {
+                          return ins.revalidateFlag;
+                        });
+                        if (!(hasRevalidateFlag && $listeners.reCalculate)) {
+                          _context3.next = 2;
+                          break;
+                        }
+                        _context3.next = 1;
+                        return new Promise(function (resolve, reject) {
+                          _this5.$emit('reCalculate', inputData, {
+                            planbookId: planbookId,
+                            publicPbUuid: publicPbUuid,
+                            groupKey: groupKey,
+                            productKey: productKey,
+                            isIgnoreError: true,
+                            eventTarget: eventTarget
+                          }, resolve, reject);
+                        }).catch(function (err) {
+                          errorMsg = lodash.get(err, '[0].message') || lodash.get(err, 'message');
+                        });
+                      case 1:
+                        _context3.next = 2;
+                        return productDataHandler(productData, productVerifyData, personData, {
+                          planbookId: planbookId,
+                          eventTarget: eventTarget
+                        });
+                      case 2:
+                      case "end":
+                        return _context3.stop();
+                    }
+                  }, _callee3);
+                }))).catch(function () {});
               case 2:
-                _context3.next = 3;
-                return productDataHandler(productData, productVerifyData, personData, {
-                  planbookId: planbookId,
-                  eventTarget: eventTarget
-                });
+                return _context4.abrupt("return", errorMsg);
               case 3:
-                return _context3.abrupt("return", errorMsg);
-              case 4:
               case "end":
-                return _context3.stop();
+                return _context4.stop();
             }
-          }, _callee3, this);
+          }, _callee4, this);
         }));
         function changeProduct(_x, _x2) {
           return _changeProduct.apply(this, arguments);
@@ -12163,16 +12180,16 @@
     }, {
       key: "validate",
       value: function () {
-        var _validate = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
+        var _validate = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee5() {
           var $refs, filterInsuranceList, insKeys;
-          return _regeneratorRuntime.wrap(function (_context4) {
-            while (1) switch (_context4.prev = _context4.next) {
+          return _regeneratorRuntime.wrap(function (_context5) {
+            while (1) switch (_context5.prev = _context5.next) {
               case 0:
                 $refs = this.$refs, filterInsuranceList = this.filterInsuranceList;
                 insKeys = filterInsuranceList.map(function (ins) {
                   return ins.key;
                 });
-                return _context4.abrupt("return", new Promise(function (resolve, reject) {
+                return _context5.abrupt("return", new Promise(function (resolve, reject) {
                   setTimeout(function () {
                     var promises = [];
                     var _iterator = _createForOfIteratorHelper(insKeys),
@@ -12199,9 +12216,9 @@
                 }));
               case 1:
               case "end":
-                return _context4.stop();
+                return _context5.stop();
             }
-          }, _callee4, this);
+          }, _callee5, this);
         }));
         function validate() {
           return _validate.apply(this, arguments);
@@ -12230,27 +12247,27 @@
     }, {
       key: "requiestRecommendValues",
       value: function () {
-        var _requiestRecommendValues = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee5() {
+        var _requiestRecommendValues = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee6() {
           var self, showRecommendValue, recommendValuesCache, inputData, groupData, productData, url, calcData, reqParams, calcInputData, calcProductData;
-          return _regeneratorRuntime.wrap(function (_context5) {
-            while (1) switch (_context5.prev = _context5.next) {
+          return _regeneratorRuntime.wrap(function (_context6) {
+            while (1) switch (_context6.prev = _context6.next) {
               case 0:
                 self = this;
                 showRecommendValue = self.showRecommendValue, recommendValuesCache = self.recommendValuesCache, inputData = self.inputData, groupData = self.groupData, productData = self.productData;
                 if (showRecommendValue) {
-                  _context5.next = 1;
+                  _context6.next = 1;
                   break;
                 }
-                return _context5.abrupt("return");
+                return _context6.abrupt("return");
               case 1:
                 url = "".concat(PLANBOOK_API_HOSTNAME, "/planBook/input/calculate/recommend");
-                _context5.next = 2;
+                _context6.next = 2;
                 return createdProductDataToCalc(inputData, {
                   groupKey: groupData.key,
                   productKey: productData.key
                 }).catch(function () {});
               case 2:
-                calcData = _context5.sent;
+                calcData = _context6.sent;
                 reqParams = [];
                 calcInputData = calcData && JSON.parse(calcData.jd);
                 calcProductData = calcInputData && calcInputData.productGroupList[0].prodOrderList[0];
@@ -12264,13 +12281,13 @@
                   });
                 }
                 if (!recommendValuesCache[JSON.stringify(reqParams)]) {
-                  _context5.next = 3;
+                  _context6.next = 3;
                   break;
                 }
                 self.recommendValues = recommendValuesCache[JSON.stringify(reqParams)];
-                return _context5.abrupt("return");
+                return _context6.abrupt("return");
               case 3:
-                return _context5.abrupt("return", fetch(url, {
+                return _context6.abrupt("return", fetch(url, {
                   method: 'POST',
                   credentials: 'include',
                   headers: {
@@ -12280,10 +12297,10 @@
                   body: JSON.stringify(reqParams)
                 }).then(function (response) {
                   return response.json();
-                }).then(function (_ref3) {
-                  var success = _ref3.success,
-                    data = _ref3.data,
-                    info = _ref3.info;
+                }).then(function (_ref4) {
+                  var success = _ref4.success,
+                    data = _ref4.data,
+                    info = _ref4.info;
                   if (!success || !data) {
                     self.$toast(info);
                     return Promise.reject();
@@ -12324,9 +12341,9 @@
                 }));
               case 4:
               case "end":
-                return _context5.stop();
+                return _context6.stop();
             }
-          }, _callee5, this);
+          }, _callee6, this);
         }));
         function requiestRecommendValues() {
           return _requiestRecommendValues.apply(this, arguments);

package/lib/utils/index.js

@@ -9646,7 +9646,7 @@
         max: max || Infinity,
         message: message,
         validator: function validator(value, rule) {
-          return !value || value >= rule.min && value <= rule.max;
+          return (value || value === 0) && value >= rule.min && value <= rule.max;
         }
       });
     }
@@ -9657,7 +9657,7 @@
         multiple: ele.multi,
         message: "\u8BF7\u8F93\u5165".concat(ele.multi, "\u500D\u6570"),
         validator: function validator(value, rule) {
-          return !value || !(value % rule.multiple);
+          return (value || value === 0) && !(value % rule.multiple);
         }
       });
     }
@@ -9918,7 +9918,7 @@
                   var titleEle = (ins.eleOrderList || []).find(function (e) {
                     return e.key === 'title';
                   });
-                  if (titleEle && groupInsuranceIdEle && !Array.isArray(titleEle.value)) {
+                  if (titleEle && groupInsuranceIdEle && !Array.isArray(groupInsuranceIdEle.value)) {
                     titleEle.value = groupInsuranceIdEle.value === ins.key;
                   }
                 });
@@ -10444,6 +10444,14 @@
 
       // 处理组合险中的逻辑，并加入到产品险种列表中
       var _loop = function _loop(k) {
+        var _oldGroupInsurance$el;
+        var oldGroupInsurance = mulInsOrderList.find(function (ins) {
+          return ins.key === k;
+        });
+        var oldGroupTitleElement = oldGroupInsurance ? (_oldGroupInsurance$el = oldGroupInsurance.eleOrderList) === null || _oldGroupInsurance$el === void 0 ? void 0 : _oldGroupInsurance$el.find(function (e) {
+          return e.key === 'title';
+        }) : null;
+        var oldGroupTitleValue = oldGroupTitleElement ? oldGroupTitleElement.value : null;
         var nGroupTitleEle = newGroupInsMap[k].eleOrderList.find(function (e) {
           return e.key === 'title';
         });
@@ -10472,9 +10480,12 @@
           var checkedInsurance = checkedInsurances[0];
           // hasRequiredIns：如果组合险中有一款是必选的，则整个组合险为选中状态
           // 所有险种都不可选，则组合险不可修改且不选中。否则，组合险种可选
-          nGroupTitleEle.value = hasRequiredIns || (nGroupInsuranceIdEle.opts || []).some(function (opt) {
+          nGroupTitleEle.value = oldGroupTitleValue === false ? oldGroupTitleValue : (nGroupInsuranceIdEle.opts || []).some(function (opt) {
             return !opt.isDisabled;
           });
+          if (hasRequiredIns) {
+            nGroupTitleEle.value = hasRequiredIns;
+          }
           nGroupTitleEle.isDisabled = hasRequiredIns || (nGroupInsuranceIdEle.opts || []).every(function (opt) {
             return !!opt.isDisabled;
           });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bxs-tools-ui",
-  "version": "3.2.0-2",
+  "version": "3.2.0-4",
   "description": "微易前端业务组件",
   "main": "lib/index.js",
   "module": "es/index.js",

package/packages/bxs-utils/planbook/insurance.ts

@@ -184,7 +184,7 @@ export function initElementValidateRules(ele : IInsElement, productData? : IPbPr
       max: max || Infinity,
       message: message,
       validator(value, rule) {
-        return !value || (value >= rule.min && value <= rule.max);
+        return (value || value === 0) && value >= rule.min && value <= rule.max;
       }
     });
   }
@@ -195,7 +195,7 @@ export function initElementValidateRules(ele : IInsElement, productData? : IPbPr
       multiple: ele.multi,
       message: `请输入${ele.multi}倍数`,
       validator(value, rule) {
-        return !value || !(value % rule.multiple);
+        return (value || value === 0) && !(value % rule.multiple);
       }
     });
   }

package/packages/bxs-utils/planbook/product.ts

@@ -78,7 +78,7 @@ export async function productDataHandler(prodData : IPbProduct, prodVerifyData :
       const subInsurances = (prodData.mulInsOrderList || []).filter(ins => ins.groupKey === insuranceKey)
       subInsurances.forEach(ins => {
         const titleEle = (ins.eleOrderList || []).find(e => e.key === 'title')
-        if (titleEle && groupInsuranceIdEle && !Array.isArray(titleEle.value)) {
+        if (titleEle && groupInsuranceIdEle && !Array.isArray(groupInsuranceIdEle.value)) {
           titleEle.value = groupInsuranceIdEle.value === ins.key
         }
       })
@@ -543,6 +543,9 @@ export function setGroupInsurance(prodData : IPbProduct) : IPbProduct {
   
     // 处理组合险中的逻辑，并加入到产品险种列表中
     for (let k in newGroupInsMap) {
+      const oldGroupInsurance = mulInsOrderList.find(ins => ins.key === k)
+      const oldGroupTitleElement = oldGroupInsurance ? oldGroupInsurance.eleOrderList?.find(e => e.key === 'title') : null
+      const oldGroupTitleValue = oldGroupTitleElement ? oldGroupTitleElement.value : null
       const nGroupTitleEle = newGroupInsMap[k].eleOrderList.find(e => e.key === 'title');
       const nGroupInsuranceIdEle = newGroupInsMap[k].eleOrderList.find(e => e.key === 'insuranceId');
       const groupInsList = mulInsOrderList.filter((ins : IProdInsurance) => ins.groupKey == k);
@@ -559,7 +562,10 @@ export function setGroupInsurance(prodData : IPbProduct) : IPbProduct {
         const checkedInsurance = checkedInsurances[0]
         // hasRequiredIns：如果组合险中有一款是必选的，则整个组合险为选中状态
         // 所有险种都不可选，则组合险不可修改且不选中。否则，组合险种可选
-        nGroupTitleEle.value = hasRequiredIns || (nGroupInsuranceIdEle.opts || []).some(opt => !opt.isDisabled)
+        nGroupTitleEle.value = oldGroupTitleValue === false ? oldGroupTitleValue : (nGroupInsuranceIdEle.opts || []).some(opt => !opt.isDisabled)
+        if (hasRequiredIns) {
+          nGroupTitleEle.value = hasRequiredIns
+        }
         nGroupTitleEle.isDisabled = hasRequiredIns || (nGroupInsuranceIdEle.opts || []).every(opt => !!opt.isDisabled)
         nGroupInsuranceIdEle.value = checkedInsurance ? checkedInsurance.key : null
   

package/packages/index.ts

@@ -50,6 +50,6 @@ export {
 }
 
 export default {
-  version: '3.2.0-2',
+  version: '3.2.0-4',
   install
 }

package/packages/product-info/index.vue

@@ -306,12 +306,6 @@ export default class BxtProductInfo extends Vue {
     if (!['title'].includes(eleData.key)) {
       this.requiestRecommendValues();
     }
-    setTimeout(() => {
-      const refInsuranceForm: any = _get(this.$refs, `insuranceForm${insData.key}[0]`);
-      if (refInsuranceForm) {
-        refInsuranceForm.validate(eleData.key);
-      }
-    }, 300);
     this.$nextTick(async () => {
       const errorMsg = await this.changeProduct(this.productData, options);
       this.$emit(
@@ -363,31 +357,35 @@ export default class BxtProductInfo extends Vue {
       eleData
     });
     if (!errorMsg) {
-      const hasRevalidateFlag = (_get(productData, 'mulInsOrderList') || []).some(ins => ins.revalidateFlag);
-      if (hasRevalidateFlag && $listeners.reCalculate) {
-        await new Promise<any>((resolve, reject) => {
-          this.$emit(
-            'reCalculate',
-            inputData,
-            {
+      await this.validate()
+        .then(async () => {
+          const hasRevalidateFlag = (_get(productData, 'mulInsOrderList') || []).some(ins => ins.revalidateFlag);
+          if (hasRevalidateFlag && $listeners.reCalculate) {
+            await new Promise<any>((resolve, reject) => {
+              this.$emit(
+                'reCalculate',
+                inputData,
+                {
+                  planbookId,
+                  publicPbUuid,
+                  groupKey,
+                  productKey,
+                  isIgnoreError: true,
+                  eventTarget
+                },
+                resolve,
+                reject
+              );
+            }).catch(err => {
+              errorMsg = _get(err, '[0].message') || _get(err, 'message');
+            });
+            await productDataHandler(productData, productVerifyData, personData, {
               planbookId,
-              publicPbUuid,
-              groupKey,
-              productKey,
-              isIgnoreError: true,
               eventTarget
-            },
-            resolve,
-            reject
-          );
-        }).catch(err => {
-          errorMsg = _get(err, '[0].message') || _get(err, 'message');
-        });
-        await productDataHandler(productData, productVerifyData, personData, {
-          planbookId,
-          eventTarget
-        });
-      }
+            });
+          }
+        })
+        .catch(() => {});
     }
     return errorMsg;
   }