bxs-tools-ui 1.1.0-2 → 1.1.0-3

package/lib/add-and-take/index.js

@@ -1180,7 +1180,7 @@ function initInsuranceData(insData) {
         }
         if (e.optConf && e.optConf.length) {
             var options = [];
-            for (var i = e.optConf[0]; i < e.optConf[1]; i += (e.optConf[2] && e.optConf[2] && e.optConf[2].step) || 1) {
+            for (var i = e.optConf[0]; i <= e.optConf[1]; i += (e.optConf[2] && e.optConf[2] && e.optConf[2].step) || 1) {
                 options.push({
                     val: e.optConf[2] && e.optConf[2].valfix ? "" + i + e.optConf[2].valfix : i,
                     desc: e.optConf[2] && e.optConf[2].desc ? e.optConf[2].desc.replace(/{{&&}}/, i) : i
@@ -1354,8 +1354,8 @@ function restrictElementsInInsurance(_a) {
         var valRange_1 = eleRestricts && eleRestricts[0] && eleRestricts[0][eleData.key];
         if (valRange_1 && valRange_1.length) {
             if (eleData.opts) {
-                eleData.opts.filter(function (o) {
-                    if (valRange_1.indexOf(o.val) === -1) {
+                eleData.opts.forEach(function (o) {
+                    if (!valRange_1.find(function (v) { return v.val === o.val; })) {
                         o.isInvalid = true;
                     }
                 });
@@ -1481,6 +1481,15 @@ function initPersonData(inputData, verifyData) {
                         { val: 1, desc: '男' },
                         { val: 2, desc: '女' }
                     ];
+                    if (e.opts && e.opts.length) {
+                        e.options = e.opts.map(function (o) { return ({
+                            val: o.val,
+                            desc: o.desc
+                        }); });
+                    }
+                    if (!e.options.find(function (o) { return o.val === e.value; })) {
+                        e.value = e.options[0].val;
+                    }
                     e.isDisabled = person.key === 'spouseInfo';
                     break;
                 }
@@ -1798,48 +1807,50 @@ function normalizeComponent (
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "h", function() { return _common__WEBPACK_IMPORTED_MODULE_0__["e"]; });
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "i", function() { return _common__WEBPACK_IMPORTED_MODULE_0__["f"]; });
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "j", function() { return _common__WEBPACK_IMPORTED_MODULE_0__["f"]; });
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "k", function() { return _common__WEBPACK_IMPORTED_MODULE_0__["g"]; });
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "l", function() { return _common__WEBPACK_IMPORTED_MODULE_0__["g"]; });
 
 /* harmony import */ var _person__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(7);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "e", function() { return _person__WEBPACK_IMPORTED_MODULE_1__["a"]; });
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "j", function() { return _person__WEBPACK_IMPORTED_MODULE_1__["b"]; });
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "k", function() { return _person__WEBPACK_IMPORTED_MODULE_1__["b"]; });
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "n", function() { return _person__WEBPACK_IMPORTED_MODULE_1__["c"]; });
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "o", function() { return _person__WEBPACK_IMPORTED_MODULE_1__["c"]; });
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "r", function() { return _person__WEBPACK_IMPORTED_MODULE_1__["d"]; });
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "s", function() { return _person__WEBPACK_IMPORTED_MODULE_1__["d"]; });
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "x", function() { return _person__WEBPACK_IMPORTED_MODULE_1__["e"]; });
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "y", function() { return _person__WEBPACK_IMPORTED_MODULE_1__["e"]; });
 
 /* harmony import */ var _product__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(13);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "b", function() { return _product__WEBPACK_IMPORTED_MODULE_2__["a"]; });
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "f", function() { return _product__WEBPACK_IMPORTED_MODULE_2__["b"]; });
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "o", function() { return _product__WEBPACK_IMPORTED_MODULE_2__["c"]; });
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "i", function() { return _product__WEBPACK_IMPORTED_MODULE_2__["c"]; });
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "q", function() { return _product__WEBPACK_IMPORTED_MODULE_2__["d"]; });
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "p", function() { return _product__WEBPACK_IMPORTED_MODULE_2__["d"]; });
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "s", function() { return _product__WEBPACK_IMPORTED_MODULE_2__["e"]; });
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "r", function() { return _product__WEBPACK_IMPORTED_MODULE_2__["e"]; });
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "u", function() { return _product__WEBPACK_IMPORTED_MODULE_2__["f"]; });
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "t", function() { return _product__WEBPACK_IMPORTED_MODULE_2__["f"]; });
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "v", function() { return _product__WEBPACK_IMPORTED_MODULE_2__["g"]; });
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "w", function() { return _product__WEBPACK_IMPORTED_MODULE_2__["h"]; });
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "y", function() { return _product__WEBPACK_IMPORTED_MODULE_2__["i"]; });
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "x", function() { return _product__WEBPACK_IMPORTED_MODULE_2__["i"]; });
+
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "z", function() { return _product__WEBPACK_IMPORTED_MODULE_2__["j"]; });
 
 /* harmony import */ var _insurance__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(6);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "l", function() { return _insurance__WEBPACK_IMPORTED_MODULE_3__["a"]; });
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "m", function() { return _insurance__WEBPACK_IMPORTED_MODULE_3__["a"]; });
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "m", function() { return _insurance__WEBPACK_IMPORTED_MODULE_3__["b"]; });
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "n", function() { return _insurance__WEBPACK_IMPORTED_MODULE_3__["b"]; });
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "p", function() { return _insurance__WEBPACK_IMPORTED_MODULE_3__["c"]; });
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "q", function() { return _insurance__WEBPACK_IMPORTED_MODULE_3__["c"]; });
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "t", function() { return _insurance__WEBPACK_IMPORTED_MODULE_3__["d"]; });
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "u", function() { return _insurance__WEBPACK_IMPORTED_MODULE_3__["d"]; });
 
 
 
@@ -1856,13 +1867,14 @@ if (document && document.cookie && document.cookie.match('LIZHAO_DEBUG_CONSOLE_F
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "c", function() { return initProductData; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "e", function() { return productDataHandler; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "g", function() { return setCommonInfo; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "h", function() { return setGroupInsurance; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "d", function() { return isHideProduct; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "i", function() { return verifyProductRules; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "f", function() { return restrictInsurancesInProduct; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "d", function() { return initProductData; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "f", function() { return productDataHandler; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "c", function() { return getElementVerifyFromProductVerify; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "h", function() { return setCommonInfo; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "i", function() { return setGroupInsurance; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "e", function() { return isHideProduct; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "j", function() { return verifyProductRules; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "g", function() { return restrictInsurancesInProduct; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return convertProductData; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return clearAddAndTakeAndAdjustBaoeData; });
 /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(0);
@@ -1889,17 +1901,16 @@ function initProductData(prodData) {
     return prodData;
 }
 function productDataHandler(prodData, productVerifyData, personData) {
+    var _a;
+    var hasProduct = prodData && prodData.mulInsOrderList;
+    var hasVerifyData = productVerifyData && Object.keys(productVerifyData).length;
+    var hasPersonData = personData && personData.personOrderList;
     var personOrderList = null;
-    if (prodData &&
-        prodData.mulInsOrderList &&
-        productVerifyData &&
-        Object.keys(productVerifyData).length &&
-        personData &&
-        personData &&
-        personData.personOrderList) {
+    if (hasProduct && hasVerifyData && hasPersonData) {
         personOrderList = Object(_person__WEBPACK_IMPORTED_MODULE_2__[/* convertPersonData */ "a"])(personData, personData.personOrderList.map(function (p) { return p.key; }));
         setCommonInfo(prodData);
-        prodData.mulInsOrderList.forEach(function (ins, ii, insList) {
+        (_a = prodData.mulInsOrderList) === null || _a === void 0 ? void 0 : _a.forEach(function (ins, ii, insList) {
+            var _a, _b, _c;
             Object(_insurance__WEBPACK_IMPORTED_MODULE_3__[/* insuranceDataHandler */ "c"])(ins, prodData);
             var insuranceVerifyData = productVerifyData[ins.key];
             if (!insuranceVerifyData) {
@@ -1908,40 +1919,37 @@ function productDataHandler(prodData, productVerifyData, personData) {
                 }
                 return;
             }
-            var isTouHuomianIns = ins.huomian == 'touHuomian' || ins.huomian == 'shuangHuomian';
+            var isTouHuomianIns = ins.huomian === 'touHuomian' || ins.huomian === 'shuangHuomian';
             var insuredInfo = personOrderList.find(function (p) { return p.key === 'insuredInfo'; });
             var applicantInfo = personOrderList.find(function (p) { return p.key === 'applicantInfo'; });
             var personType = isTouHuomianIns ? 'applicantInfo' : 'insuredInfo';
             if (isTouHuomianIns && ins.allowSamePerson) {
                 personType = applicantInfo && applicantInfo.title ? 'applicantInfo' : 'insuredInfo';
             }
-            var curPersonInfo = personOrderList.find(function (p) { return p.key === personType; });
-            var curCondition = null;
-            if (curPersonInfo) {
-                curCondition = insuranceVerifyData.find(function (verify) {
-                    return verify.sex === curPersonInfo.sex && curPersonInfo.age >= verify.minAge && curPersonInfo.age <= verify.maxAge;
+            var targetPerson = personOrderList.find(function (p) { return p.key === personType; });
+            var personCondition = null;
+            if (targetPerson) {
+                personCondition = insuranceVerifyData.find(function (v) {
+                    return targetPerson.sex === v.sex && targetPerson.age >= v.minAge && targetPerson.age <= v.maxAge;
                 });
-                if (curCondition) {
-                    curCondition = curCondition.conditionData;
-                    if (isTouHuomianIns && ins.allowSamePerson && curCondition.key === 'samePerson') {
-                        curCondition = curCondition.samePerson.find(function (verify) { return verify.value == (applicantInfo.title ? 0 : 1); });
+                if (personCondition) {
+                    personCondition = personCondition.conditionData;
+                    var isSamePerson = isTouHuomianIns && ins.allowSamePerson && personCondition.key === 'samePerson';
+                    if (isSamePerson) {
+                        personCondition = personCondition.samePerson.find(function (c) { return c.value == (applicantInfo.title ? 0 : 1); });
                     }
                 }
             }
-            var eleTitle = ins.eleOrderList.find(function (e) { return e.key === 'title'; });
-            var backupCondi = null;
+            var curCondition = personCondition;
+            var eleTitle = (_a = ins.eleOrderList) === null || _a === void 0 ? void 0 : _a.find(function (e) { return e.key === 'title'; });
             var _loop_1 = function () {
-                if (!curCondition ||
-                    (isTouHuomianIns && !ins.allowSamePerson && (!curPersonInfo.title || curPersonInfo.applicantAndInsuredSame))) {
+                var isNotAllowSelect = !curCondition ||
+                    (isTouHuomianIns && !ins.allowSamePerson && (!targetPerson.title || targetPerson.applicantAndInsuredSame));
+                if (isNotAllowSelect) {
                     eleTitle.isDisabled = true;
                     eleTitle.value = false;
                     if (window.DEBUG_TEMP_CONSOLE_FLAG) {
-                        if (curCondition) {
-                            console.log(eleTitle.labelName + "-" + ins.key + ": \u8D39\u7387\u5B58\u5728\uFF01\u4F46\u6295\u4FDD\u4EBA\u672A\u9009\u4E2D\u6216\u6295\u88AB\u4FDD\u4EBA\u4E3A\u540C\u4E00\u4EBA\uFF0C\u8BE5\u8C41\u514D\u9669\uFF08\u4E0D\u80FD\u9644\u52A0\u5230\u88AB\u4FDD\u4EBA\uFF09\u4E0D\u53EF\u9009");
-                        }
-                        else {
-                            console.log(eleTitle.labelName + "-" + ins.key + ": \u8D39\u7387\u4E0D\u5B58\u5728\uFF01");
-                        }
+                        console.log(curCondition ? eleTitle.labelName + "-" + ins.key + ": \u8D39\u7387\u5B58\u5728\uFF01\u4F46\u6295\u4FDD\u4EBA\u672A\u9009\u4E2D\u6216\u6295\u88AB\u4FDD\u4EBA\u4E3A\u540C\u4E00\u4EBA\uFF0C\u8BE5\u8C41\u514D\u9669\uFF08\u4E0D\u80FD\u9644\u52A0\u5230\u88AB\u4FDD\u4EBA\uFF09\u4E0D\u53EF\u9009" : eleTitle.labelName + "-" + ins.key + ": \u8D39\u7387\u4E0D\u5B58\u5728\uFF01");
                     }
                 }
                 else {
@@ -1954,111 +1962,116 @@ function productDataHandler(prodData, productVerifyData, personData) {
                         }
                     }
                 }
-                if (curCondition) {
-                    var eleData_1 = ins.eleOrderList.find(function (e) { return e.key === curCondition.key; });
-                    var commonData = prodData.mulInsOrderList.find(function (ins) { return ins.key === 'common'; });
-                    if (!eleData_1 && commonData && commonData.eleOrderList) {
-                        eleData_1 = commonData.eleOrderList.find(function (e) { return e.key === curCondition.key; });
+                if (!curCondition) {
+                    return "break";
+                }
+                var eleData = (_b = ins.eleOrderList) === null || _b === void 0 ? void 0 : _b.find(function (e) { return e.key === curCondition.key; });
+                var commonData = insList.find(function (ins) { return ins.key === 'common'; });
+                if (!eleData && commonData && commonData.eleOrderList) {
+                    eleData = commonData.eleOrderList.find(function (e) { return e.key === curCondition.key; });
+                }
+                if (!eleData) {
+                    if (window.DEBUG_TEMP_CONSOLE_FLAG) {
+                        console.log(ins.name + " - " + (curCondition && curCondition.key) + "\u5143\u7D20\u4E0D\u5B58\u5728\uFF1A");
                     }
-                    var eleCondi = curCondition[curCondition.key];
-                    if (eleData_1) {
-                        if (eleData_1.isHide && !eleData_1.isDisabled && ins.refInsuranceId && ins.refInsuranceId != -2) {
-                            var refInsData = null;
-                            if (ins.refInsuranceId === -1) {
-                                refInsData = insList[0].key === 'common' ? insList[1] : insList[0];
-                            }
-                            else {
-                                refInsData = insList.find(function (ins) { return ins.key === ins.refInsuranceId; });
-                            }
-                            if (refInsData) {
-                                var refEleData = refInsData.eleOrderList && refInsData.eleOrderList.find(function (e) { return e.key === eleData_1.key; });
-                                if (refEleData) {
-                                    var refTitleData = refInsData.eleOrderList && refInsData.eleOrderList.find(function (e) { return e.key === 'title'; });
-                                    if (refInsData && refTitleData.isDisabled) {
-                                        eleTitle.isDisabled = true;
-                                    }
-                                    if (ins.huomian && eleData_1.key == 'pPeriod') {
-                                        eleData_1.value = Object(_common__WEBPACK_IMPORTED_MODULE_1__[/* getHuomianPeriodValue */ "f"])(refEleData.value, ins.pMinus, ins.huomian === 'touHuomian' ? insuredInfo.age : curPersonInfo.age);
-                                    }
-                                    else {
-                                        eleData_1.value = refEleData.value;
-                                    }
-                                }
-                                else {
-                                    if (window.DEBUG_TEMP_CONSOLE_FLAG) {
-                                        console.log(ins.name + "-" + ins.key + "\uFF1A\u5173\u8054\u9669\u79CD" + ins.refInsuranceId + "\u4E0D\u5B58\u5728");
-                                    }
-                                }
-                            }
+                    curCondition = null;
+                    return "break";
+                }
+                var eleCondi = curCondition[curCondition.key];
+                var isBeGovernedEle = eleData.isHide && !eleData.isDisabled && ins.refInsuranceId && Number(ins.refInsuranceId) !== -2;
+                if (isBeGovernedEle) {
+                    var refInsData = null;
+                    if (Number(ins.refInsuranceId) === -1) {
+                        refInsData = insList[0].key === 'common' ? insList[1] : insList[0];
+                    }
+                    else {
+                        refInsData = insList.find(function (ins) { return ins.key == ins.refInsuranceId; });
+                    }
+                    var refEleData = refInsData && refInsData.eleOrderList && refInsData.eleOrderList.find(function (e) { return e.key === eleData.key; });
+                    if (refEleData) {
+                        if (ins.huomian && eleData.key == 'pPeriod') {
+                            eleData.value = Object(_common__WEBPACK_IMPORTED_MODULE_1__[/* getHuomianPeriodValue */ "f"])(refEleData.value, ins.pMinus, ins.huomian === 'touHuomian' ? insuredInfo.age : targetPerson.age);
                         }
                         else {
-                            var backupOpts_1 = [];
-                            if (eleData_1.opts && eleData_1.opts.length) {
-                                backupOpts_1 = eleData_1.opts.slice(0);
-                            }
-                            eleData_1.opts = [];
-                            eleCondi.forEach(function (condi) {
-                                if (condi.value !== undefined && condi.desc !== undefined) {
-                                    var backupOpt = backupOpts_1.find(function (o) { return o.val == condi.value; });
-                                    eleData_1.opts.push({
-                                        val: condi.value,
-                                        desc: condi.desc,
-                                        isHide: (backupOpt && backupOpt.isHide) || null,
-                                        isDisabled: (backupOpt && backupOpt.isDisabled) || null,
-                                        isInvalid: null
-                                    });
-                                }
-                            });
-                            if (eleData_1.opts.length) {
-                                if (eleData_1.opts.every(function (ele) { return ele.val != eleData_1.value; })) {
-                                    if (eleData_1.key === 'pPeriod') {
-                                        var filterOpts = eleData_1.opts.filter(function (opt) { return !opt.isHide && !opt.isDisabled; });
-                                        if (filterOpts.length) {
-                                            eleData_1.value = eleData_1.opts[filterOpts.length - 1].val;
-                                        }
-                                    }
-                                    else {
-                                        eleData_1.value = eleData_1.opts[0].val;
-                                    }
-                                }
-                            }
+                            eleData.value = refEleData.value;
+                        }
+                    }
+                    else {
+                        if (window.DEBUG_TEMP_CONSOLE_FLAG) {
+                            console.log(ins.name + "-" + ins.key + "\uFF1A\u5173\u8054\u9669\u79CD" + ins.refInsuranceId + "\u4E0D\u5B58\u5728");
                         }
-                        curCondition = eleCondi.find(function (eleCondi) { return eleCondi.value === eleData_1.value; });
-                        var eleIndex = ins.eleOrderList.findIndex(function (ele) { return ele.key === eleData_1.key; });
-                        if (!curCondition && backupCondi && eleData_1 && eleIndex >= 1) {
-                            var preCondi = backupCondi.find(function (preCondi) { return preCondi[eleData_1.key] && preCondi[eleData_1.key].some(function (condi) { return condi.value === eleData_1.value; }); });
-                            if (preCondi) {
-                                curCondition = preCondi[eleData_1.key];
-                                ins.eleOrderList[eleIndex - 1].value = preCondi.value;
+                    }
+                }
+                else {
+                    var backupOpts_1 = eleData.opts && eleData.opts.length ? eleData.opts.slice(0) : [];
+                    eleData.opts = eleCondi.filter(function (c) { return c.value !== undefined && c.desc !== undefined; }).map(function (c) {
+                        var option = backupOpts_1.find(function (o) { return o.val == c.value; });
+                        return {
+                            val: c.value,
+                            desc: c.desc,
+                            isHide: (option && option.isHide) || null,
+                            isDisabled: (option && option.isDisabled) || null,
+                            isInvalid: null
+                        };
+                    });
+                    var isNoOption = eleData.opts && eleData.opts.length && eleData.opts.every(function (ele) { return ele.val != eleData.value; });
+                    if (isNoOption) {
+                        if (eleData.key === 'pPeriod') {
+                            var filterOpts = (_c = eleData.opts) === null || _c === void 0 ? void 0 : _c.filter(function (opt) { return !opt.isHide && !opt.isDisabled; });
+                            if (filterOpts && filterOpts.length) {
+                                eleData.value = filterOpts[filterOpts.length - 1].val;
                             }
                         }
-                        if (eleData_1 && eleData_1.isHide && !eleData_1.isDisabled && eleIndex >= 1 && backupCondi) {
-                            var preEleData = ins.eleOrderList[eleIndex - 1];
-                            if (preEleData && preEleData.opts && preEleData.opts.length) {
-                                var opts_1 = [];
-                                backupCondi.forEach(function (condi) {
-                                    if (curCondition && condi[eleData_1.key] && condi[eleData_1.key].some(function (c) { return c.value == eleData_1.value; })) {
-                                        opts_1.push({
-                                            val: condi.value,
-                                            desc: condi.desc
-                                        });
-                                    }
-                                });
-                                preEleData.opts = opts_1;
+                        else {
+                            if (eleData.opts && eleData.opts.length) {
+                                eleData.value = eleData.opts[0].val;
                             }
                         }
-                        backupCondi = eleCondi;
                     }
-                    else {
-                        if (window.DEBUG_TEMP_CONSOLE_FLAG) {
-                            console.log(ins.name + " - " + (curCondition && curCondition.key) + "\u5143\u7D20\u4E0D\u5B58\u5728\uFF1A");
+                }
+                curCondition = eleCondi.find(function (eleCondi) { return eleCondi.value == eleData.value; });
+                var eleIndex = ins.eleOrderList.findIndex(function (ele) { return ele.key === eleData.key; });
+                var prevElement;
+                if (eleIndex >= 1) {
+                    prevElement = ins.eleOrderList[eleIndex - 1];
+                }
+                if (prevElement) {
+                    if (!curCondition) {
+                        var prevEleVerify = getElementVerifyFromProductVerify(personCondition, insList, { insuranceKey: ins.key, elementKey: prevElement.key });
+                        var onePrevEleVerify = prevEleVerify === null || prevEleVerify === void 0 ? void 0 : prevEleVerify.find(function (v) { return v[eleData.key] && v[eleData.key].some(function (condi) { return condi.value === eleData.value; }); });
+                        if (onePrevEleVerify) {
+                            prevElement.value = onePrevEleVerify.value;
+                            curCondition = onePrevEleVerify[eleData.key];
+                        }
+                    }
+                    var isNeedReverseFilter = eleData.isHide && !eleData.isDisabled && prevElement.opts && prevElement.opts.length;
+                    if (isNeedReverseFilter) {
+                        var prevEleVerify = getElementVerifyFromProductVerify(personCondition, insList, { insuranceKey: ins.key, elementKey: prevElement.key });
+                        if (prevEleVerify) {
+                            prevElement.opts = prevEleVerify.filter(function (v) {
+                                var _a;
+                                var elementVerify = getElementVerifyFromProductVerify(personCondition, insList, (_a = {
+                                        insuranceKey: ins.key,
+                                        elementKey: eleData.key
+                                    },
+                                    _a[prevElement.key] = v.value,
+                                    _a));
+                                return elementVerify && elementVerify.some(function (c) { return c.value == eleData.value; });
+                            }).map(function (v) { return ({
+                                val: v.value,
+                                desc: v.desc,
+                                isHide: null,
+                                isDisabled: null,
+                                isInvalid: null
+                            }); });
                         }
-                        curCondition = null;
                     }
                 }
             };
             do {
-                _loop_1();
+                var state_1 = _loop_1();
+                if (state_1 === "break")
+                    break;
             } while (curCondition && curCondition.key && curCondition[curCondition.key]);
         });
     }
@@ -2066,6 +2079,26 @@ function productDataHandler(prodData, productVerifyData, personData) {
     isHideProduct(prodData, productVerifyData, personOrderList);
     return prodData;
 }
+function getElementVerifyFromProductVerify(verify, insurances, option) {
+    if (!verify || !verify.key || !verify[verify.key] || !insurances || !option) {
+        return verify;
+    }
+    var insuranceInfo = {};
+    insurances.forEach(function (ins) {
+        if (['common', option.insuranceKey].includes(ins.key)) {
+            insuranceInfo = Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __assign */ "a"])(Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __assign */ "a"])({}, insuranceInfo), Object(_common__WEBPACK_IMPORTED_MODULE_1__[/* convertEleOrderListToObj */ "c"])(ins));
+        }
+    });
+    insuranceInfo = Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __assign */ "a"])(Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __assign */ "a"])({}, insuranceInfo), option);
+    var temp = verify;
+    while (temp && temp.key && temp.key !== option.elementKey) {
+        temp = temp[temp.key].find(function (v) { return v.value == insuranceInfo[temp.key]; });
+    }
+    if (temp && temp[option.elementKey]) {
+        return temp[option.elementKey];
+    }
+    return temp;
+}
 function setCommonInfo(prodData) {
     if (!prodData || !prodData.mulInsOrderList) {
         return prodData;
@@ -2140,6 +2173,7 @@ function setGroupInsurance(prodData) {
             var insuranceIdEle = newGroupInsMap[ins.groupKey].eleOrderList.find(function (e) { return e.key === 'insuranceId'; });
             insuranceIdEle.opts.push({
                 val: ins.key,
+                code: ins.code,
                 desc: titleEle.labelName,
                 isDisabled: titleEle.isDisabled
             });
@@ -2218,7 +2252,15 @@ function setGroupInsurance(prodData) {
                 }
             }
         }
-        prodData.mulInsOrderList.push(newGroupInsMap[k]);
+        var index = -1;
+        prodData.mulInsOrderList.forEach(function (ins, i) {
+            if (ins.groupKey === k) {
+                index = i;
+            }
+        });
+        if (index >= 0) {
+            prodData.mulInsOrderList.splice(index + 1, 0, newGroupInsMap[k]);
+        }
     };
     for (var k in newGroupInsMap) {
         _loop_2(k);
@@ -6836,14 +6878,14 @@ module.exports = baseIsSet;
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/add-and-take/index.vue?vue&type=template&id=5a4c9adc&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/add-and-take/index.vue?vue&type=template&id=d319ce72&
 var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return (_vm.initAddAndTakeData && _vm.initAddAndTakeData.data && _vm.initAddAndTakeData.data.length)?_c('div',{class:{
     'bxt-add-and-take': true,
     'bxt-add-and-take--footer': _vm.footer
   }},[(_vm.mName === 'Table')?_c('div',{staticClass:"bxt-aat-table"},[(['addAndTake', 'add', 'take'].includes(_vm.type))?_c('div',{staticClass:"bxt-aat-bonus"},[_c('p',{staticClass:"bxt-aat-bonus-tips"},[_vm._v("\n        因合规需求，低档收益下账户金额足够才能设置领取：\n      ")]),_c('ul',{staticClass:"bxt-aat-bonus-type"},[_vm._l((['bonus', 'rate']),function(field){return [(_vm.initAddAndTakeData[field] && _vm.initAddAndTakeData[field].opts)?_c('li',{key:field},[_c('SelectItem',{attrs:{"options":_vm.initAddAndTakeData[field].opts.map(function (o) { return ({
                   val: o.value,
                   desc: field === 'bonus' ? o.description : _vm.getBonusDesc(o)
-                }); }),"disabled":"true","right-icon":"arrow-right"},model:{value:(_vm.initAddAndTakeData[field].value),callback:function ($$v) {_vm.$set(_vm.initAddAndTakeData[field], "value", _vm._n($$v))},expression:"initAddAndTakeData[field].value"}})],1):_vm._e()]})],2)]):_vm._e(),_c('table',{staticClass:"bxt-aat-table-content"},[_c('thead',[_c('tr',[_c('th',[_vm._v("年度")]),_c('th',[_vm._v("年龄")]),(['addAndTake', 'add'].includes(_vm.type))?_c('th',[_vm._v("当年追加")]):_vm._e(),(['addAndTake', 'take', 'reduceBaof'].includes(_vm.type))?_c('th',[_vm._v("\n            "+_vm._s(_vm.type === 'reduceBaof' ? '领取金额' : '当年领取')+"\n          ")]):_vm._e(),_c('th',[_vm._v(_vm._s(_vm.type === 'reduceBaof' ? '现金价值' : '账户价值'))])])]),_c('tbody',_vm._l((_vm.addAndTakeTable),function(tr){return _c('tr',{key:JSON.stringify(tr)},[_c('td',[_c('span',[_vm._v(_vm._s(tr[0] + _vm.initAddAndTakeData.startPolicyNo - 1))])]),_c('td',[_c('span',[_vm._v(_vm._s(tr[1]))])]),(['addAndTake', 'add'].includes(_vm.type))?_c('td',{staticClass:"bxt-aat-table-cell-amount",on:{"click":function($event){return _vm.onClickToForm('add', tr)}}},[_c('span',{class:{ 'value-unequal-zero': tr[2] !== 0 }},[_vm._v(_vm._s(tr[2]))]),(tr[2] !== 0)?_c('i',{staticClass:"iconfont icon-close_circle_surface",on:{"click":function($event){$event.stopPropagation();return _vm.updateData({
+                }); }),"disabled":"true","right-icon":"arrow-right"},model:{value:(_vm.initAddAndTakeData[field].opts[0].value),callback:function ($$v) {_vm.$set(_vm.initAddAndTakeData[field].opts[0], "value", _vm._n($$v))},expression:"initAddAndTakeData[field].opts[0].value"}})],1):_vm._e()]})],2)]):_vm._e(),_c('table',{staticClass:"bxt-aat-table-content"},[_c('thead',[_c('tr',[_c('th',[_vm._v("年度")]),_c('th',[_vm._v("年龄")]),(['addAndTake', 'add'].includes(_vm.type))?_c('th',[_vm._v("当年追加")]):_vm._e(),(['addAndTake', 'take', 'reduceBaof'].includes(_vm.type))?_c('th',[_vm._v("\n            "+_vm._s(_vm.type === 'reduceBaof' ? '领取金额' : '当年领取')+"\n          ")]):_vm._e(),_c('th',[_vm._v(_vm._s(_vm.type === 'reduceBaof' ? '现金价值' : '账户价值'))])])]),_c('tbody',_vm._l((_vm.addAndTakeTable),function(tr){return _c('tr',{key:JSON.stringify(tr)},[_c('td',[_c('span',[_vm._v(_vm._s(tr[0] + _vm.initAddAndTakeData.startPolicyNo - 1))])]),_c('td',[_c('span',[_vm._v(_vm._s(tr[1]))])]),(['addAndTake', 'add'].includes(_vm.type))?_c('td',{staticClass:"bxt-aat-table-cell-amount",on:{"click":function($event){return _vm.onClickToForm('add', tr)}}},[_c('span',{class:{ 'value-unequal-zero': tr[2] !== 0 }},[_vm._v(_vm._s(tr[2]))]),(tr[2] !== 0)?_c('i',{staticClass:"iconfont icon-close_circle_surface",on:{"click":function($event){$event.stopPropagation();return _vm.updateData({
                   type: 'add',
                   beginYear: tr[0],
                   endYear: tr[0]
@@ -6862,7 +6904,7 @@ var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._sel
 var staticRenderFns = []
 
 
-// CONCATENATED MODULE: ./packages/add-and-take/index.vue?vue&type=template&id=5a4c9adc&
+// CONCATENATED MODULE: ./packages/add-and-take/index.vue?vue&type=template&id=d319ce72&
 
 // EXTERNAL MODULE: ./node_modules/tslib/tslib.es6.js
 var tslib_es6 = __webpack_require__(0);
@@ -7228,15 +7270,16 @@ var add_and_takevue_type_script_lang_ts_AddAndTake = (function (_super) {
     };
     AddAndTake.prototype.getAddAndTakeData = function (values) {
         var _this = this;
+        var _a;
         if (values === void 0) { values = null; }
-        var _a = this, params = _a.params, type = _a.type, IS_PRODUCT_ENV = _a.IS_PRODUCT_ENV, personData = _a.personData, productData = _a.productData, insuranceData = _a.insuranceData, bonusType = _a.bonusType, accountDataKey = _a.accountDataKey, accountData = _a.accountData;
+        var _b = this, params = _b.params, type = _b.type, IS_PRODUCT_ENV = _b.IS_PRODUCT_ENV, personData = _b.personData, productData = _b.productData, insuranceData = _b.insuranceData, bonusType = _b.bonusType, accountDataKey = _b.accountDataKey, accountData = _b.accountData;
         var cloneProductData = Object(planbook["f" /* convertProductData */])(cloneDeep_default()(productData));
         var caclAccountData = rebuildAccountData(values, cloneDeep_default()(accountData));
-        var deleteProdKeys = ['hadChoice', 'hide', 'totalBaof', 'insShowArr', 'autoImport'];
+        var deleteProdKeys = ['hadChoice', 'hide', 'totalBaof', 'insShowArr', 'autoImport', 'adjustBaoeData'];
         deleteProdKeys.forEach(function (ele) {
             delete cloneProductData[ele];
         });
-        cloneProductData.mulInsOrderList.forEach(function (ins) {
+        (_a = cloneProductData.mulInsOrderList) === null || _a === void 0 ? void 0 : _a.forEach(function (ins) {
             var deleteInsKeys = [
                 'isFollowing',
                 'pPeriodDesc',