bxs-tools-ui 2.0.2 → 2.0.3-0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bxs-tools-ui",
-  "version": "2.0.2",
+  "version": "2.0.3-0",
   "description": "微易前端业务组件",
   "main": "lib/index.js",
   "files": [
@@ -43,23 +43,22 @@
   "author": "lizh",
   "license": "ISC",
   "devDependencies": {
-    "@babel/core": "^7.5.5",
+    "@babel/core": "^7.16.0",
     "@babel/plugin-proposal-class-properties": "^7.10.4",
     "@babel/plugin-proposal-object-rest-spread": "^7.20.7",
     "@babel/plugin-transform-runtime": "^7.12.1",
-    "@babel/preset-env": "^7.5.5",
+    "@babel/preset-env": "^7.16.0",
     "@babel/preset-typescript": "^7.10.4",
     "@commitlint/cli": "^19.3.0",
     "@commitlint/config-conventional": "^19.2.2",
     "@commitlint/parse": "^19.0.3",
     "@types/vue": "^2.0.0",
-    "@typescript-eslint/eslint-plugin": "^4.7.0",
-    "@typescript-eslint/parser": "^4.7.0",
+    "@typescript-eslint/eslint-plugin": "^2.34.0",
+    "@typescript-eslint/parser": "^2.34.0",
     "@vant/doc": "^2.3.6",
     "@vant/touch-emulator": "^1.0.0",
     "@vue/eslint-config-typescript": "^5.0.1",
     "autoprefixer": "^9.6.1",
-    "awesome-typescript-loader": "^5.2.1",
     "babel-loader": "^8.0.6",
     "babel-plugin-component": "^1.1.1",
     "babel-plugin-transform-runtime": "^6.23.0",
@@ -68,7 +67,7 @@
     "crypto": "^1.0.1",
     "crypto-js": "^3.1.9-1",
     "css-loader": "^3.1.0",
-    "eslint": "^6.5.1",
+    "eslint": "^6.8.0",
     "eslint-config-prettier": "^6.15.0",
     "eslint-friendly-formatter": "^4.0.1",
     "eslint-loader": "^4.0.2",
@@ -101,7 +100,7 @@
     "tslint": "^5.20.1",
     "tslint-config-standard": "^9.0.0",
     "tslint-loader": "^3.5.4",
-    "typescript": "^3.7.4",
+    "typescript": "^4.5.0",
     "vconsole": "^3.15.0",
     "vue": "^2.6.12",
     "vue-json-tree": "^0.4.3",
@@ -112,7 +111,7 @@
     "webpack": "^4.38.0",
     "webpack-bundle-analyzer": "^4.1.0",
     "webpack-cli": "^3.3.11",
-    "webpack-dev-server": "^3.7.2"
+    "webpack-dev-server": "^3.11.2"
   },
   "dependencies": {
     "axios": "^0.20.0",

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

@@ -131,6 +131,10 @@ export function insuranceDataHandler(insData : IProdInsurance, productData : IPb
  * @returns {object} 元素的校验规则
  */
 export function initElementValidateRules(ele : IInsElement, productData? : IPbProduct) : any {
+  const mulInsOrderList = productData && productData.mulInsOrderList ? productData.mulInsOrderList : [];
+  const insurance0 = mulInsOrderList && mulInsOrderList.length ? mulInsOrderList.find(ins => ins.key !== 'common') : null;
+  const insurance0Name = insurance0 && insurance0.name ? insurance0.name : '';
+  const isPensionInsurance = insurance0Name.match(/个养|个人养老/)
   let rules : any = [];
   // 必填及正则校验
   if (['cmCommonInput'].indexOf(String(ele.componentName)) !== -1) {
@@ -161,6 +165,10 @@ export function initElementValidateRules(ele : IInsElement, productData? : IPbPr
       message = `请输入${converUnit10000(min)}~${converUnit10000(max)}之间的数值`;
     } else if (!min) {
       message = `请输入不大于${converUnit10000(max)}的数值`;
+      // 个人养老险，保费的最大金额限制，提示文案改成：“个人养老金，最高保费${max}元”。From hyw
+      if (isPensionInsurance && ele.key === 'baof') {
+        message = `个人养老金，最高保费${converUnit10000(max)}元`;
+      }
     } else if (!max) {
       message = `请输入不小于${converUnit10000(min)}的数值`;
     }
@@ -191,16 +199,15 @@ export function initElementValidateRules(ele : IInsElement, productData? : IPbPr
     ele.compareItem &&
     ele.compareItem.length &&
     ele.compareItem.length >= 3 &&
-    productData &&
-    productData.mulInsOrderList
+    mulInsOrderList
   ) {
     const item1 = ele.compareItem[0].match(/(.{1,})\.(.{1,})/);
     const item2 = ele.compareItem[2].match(/(.{1,})\.(.{1,})/);
     let insurance1, insurance2, insTitle1, insTitle2, itemValue1, itemValue2;
     if (item1 && item2) {
       // 查找对应的险种
-      insurance1 = productData.mulInsOrderList.find(ins => ins.key + '' === item1[1]);
-      insurance2 = productData.mulInsOrderList.find(ins => ins.key + '' === item2[1]);
+      insurance1 = mulInsOrderList.find(ins => ins.key + '' === item1[1]);
+      insurance2 = mulInsOrderList.find(ins => ins.key + '' === item2[1]);
     }
     if (insurance1 && insurance1.eleOrderList) {
       // 险种选中时，获取险种对应元素的值

package/packages/planbook-input/components/product-table.vue

@@ -6,14 +6,7 @@
           {{ productData.titleName }}
         </p>
         <div class="bxt-product-header-btn">
-          <van-button
-            v-if="isShowDeleteBtn()"
-            type="danger"
-            size="mini"
-            plain
-            style="width: 50px; border-radius: 50px;"
-            @click="deleteProduct"
-          >
+          <van-button v-if="isShowDeleteBtn()" type="danger" size="mini" plain style="width: 50px; border-radius: 50px;" @click="deleteProduct">
             删除
           </van-button>
           <van-button type="info" size="mini" style="width: 50px; border-radius: 50px;" @click="modify">
@@ -21,10 +14,7 @@
           </van-button>
         </div>
       </header>
-      <div
-        :class="['bxt-product-body', `bxt-product-id-${productData.key}`]"
-        v-if="productData.hadChoice && productData.insShowArr"
-      >
+      <div :class="['bxt-product-body', `bxt-product-id-${productData.key}`]" v-if="productData.hadChoice && productData.insShowArr">
         <h5 class="bxt-product-baof">首年保费：{{ productData.totalBaof }}</h5>
         <table class="bxt-product-table" @click="modify">
           <template v-for="tr in productData.insShowArr">
@@ -118,22 +108,14 @@
         </table>
       </div>
     </div>
-    <CommonPopup
-      v-model="popupConf.prodVisible"
-      :title="popupConf.title"
-      round
-      closeable
-      position="bottom"
-      :z-index="100"
-      @confirm="confirm(productData)"
-    >
+    <CommonPopup v-model="popupConf.prodVisible" :title="popupConf.title" round closeable position="bottom" :z-index="100" @confirm="confirm(productData)">
       <ProductInfo
         ref="productInfo"
         :input-data="inputData"
         :verify-data="verifyData"
         :group-key="params.groupKey"
         :product-key="params.productKey"
-        :showRecommendValue="false"
+        :showRecommendValue="true"
         :params="{
           allowCustomResult: true,
           planbookId: params.planbookId
@@ -293,10 +275,7 @@ export default class BxtProductTable extends Vue {
   addAndTakeTitleMap = ADD_AND_TAKE_TITLE_MAP;
 
   isShowDeleteBtn() {
-    let index =
-      this.groupData &&
-      this.groupData.prodOrderList &&
-      this.groupData.prodOrderList.findIndex(p => p.key === this.params.productKey);
+    let index = this.groupData && this.groupData.prodOrderList && this.groupData.prodOrderList.findIndex(p => p.key === this.params.productKey);
     return this.productData.hadChoice && !this.productData.required && index >= this.groupData.defNum;
   }
   closeProductSheet() {
@@ -514,9 +493,7 @@ export default class BxtProductTable extends Vue {
     if (!insData) {
       return '';
     }
-    return /(\(|\（)([^\(\（]+)(\)|\）)$/.exec(insData.name)
-      ? /(\(|\（)([^\(\（]+)(\)|\）)$/.exec(insData.name)[2]
-      : insData.name;
+    return /(\(|\（)([^\(\（]+)(\)|\）)$/.exec(insData.name) ? /(\(|\（)([^\(\（]+)(\)|\）)$/.exec(insData.name)[2] : insData.name;
   }
 }
 </script>

package/packages/product-info/index.vue

@@ -18,11 +18,7 @@
         :ref="`insuranceForm${ins.key}`"
         :rules="ins.rules || {}"
         :key="ins.key"
-        :class="[
-          'bxt-product-info-form',
-          `bxt-product-insurance-id-${ins.key}`,
-          isNextInsuranceFollow(ins) ? 'bxt-product-info-form-follow' : ''
-        ]"
+        :class="['bxt-product-info-form', `bxt-product-insurance-id-${ins.key}`, isNextInsuranceFollow(ins) ? 'bxt-product-info-form-follow' : '']"
         :model="productForm[ins.key]"
         :is-content-vertical-alignment="true"
         @submit.native.prevent="closeKeyBoard()"
@@ -111,11 +107,7 @@
               :rules="ele.rules"
               :ignoreValidate="isIgnoreValidate(ins, ele)"
             >
-              <bxs-radio-group
-                v-model="ele.value"
-                :disabled="ele.isDisabled"
-                @change="onChange({ insData: ins, eleData: ele })"
-              >
+              <bxs-radio-group v-model="ele.value" :disabled="ele.isDisabled" @change="onChange({ insData: ins, eleData: ele })">
                 <template v-for="opt in ele.opts.filter(o => !o.isHide && !o.isDisabled && !o.isInvalid)">
                   <bxs-radio
                     :key="opt.val"
@@ -140,11 +132,7 @@
               :rules="ele.rules"
               :ignoreValidate="isIgnoreValidate(ins, ele)"
             >
-              <bxs-radio-group
-                v-model="ele.value"
-                :disabled="ele.isDisabled"
-                @change="onChange({ insData: ins, eleData: ele })"
-              >
+              <bxs-radio-group v-model="ele.value" :disabled="ele.isDisabled" @change="onChange({ insData: ins, eleData: ele })">
                 <template v-for="opt in ele.opts">
                   <bxs-radio
                     :id="`${productData.key}_${ins.key}_${ele.key}_${opt.val}`"
@@ -155,15 +143,10 @@
                   >
                     <div class="bxt-ins-form-radio-content">
                       <span v-if="opt.code" class="bxt-ins-form-radio--code">{{ opt.code }}</span>
-                      <span
-                        class="bxt-ins-form-radio--tx"
-                        :class="[genInsuranceHmTag(opt) ? 'bxt-ins-form-radio--width' : '']"
-                      >
+                      <span class="bxt-ins-form-radio--tx" :class="[genInsuranceHmTag(opt) ? 'bxt-ins-form-radio--width' : '']">
                         {{ opt.desc }}
                       </span>
-                      <span v-if="genInsuranceHmTag(opt)" class="bxt-ins-form-radio--tag">{{
-                        genInsuranceHmTag(opt)
-                      }}</span>
+                      <span v-if="genInsuranceHmTag(opt)" class="bxt-ins-form-radio--tag">{{ genInsuranceHmTag(opt) }}</span>
                     </div>
                   </bxs-radio>
                 </template>
@@ -274,18 +257,10 @@ export default class BxtProductInfo extends Vue {
     return this.inputData && this.inputData.personData;
   }
   get groupData() {
-    return (
-      this.inputData &&
-      this.inputData.productGroupList &&
-      this.inputData.productGroupList.find(g => g.key === this.groupKey)
-    );
+    return this.inputData && this.inputData.productGroupList && this.inputData.productGroupList.find(g => g.key === this.groupKey);
   }
   get productData() {
-    return (
-      this.groupData &&
-      this.groupData.prodOrderList &&
-      this.groupData.prodOrderList.find(p => p.key === this.productKey)
-    );
+    return this.groupData && this.groupData.prodOrderList && this.groupData.prodOrderList.find(p => p.key === this.productKey);
   }
   get productForm() {
     let productForm: any = {};
@@ -426,8 +401,7 @@ export default class BxtProductInfo extends Vue {
     const personOrderList = this.inputData.personData.personOrderList;
     const applicationInfo = personOrderList.find(p => p.key === 'applicantInfo');
     const applicationTitle = applicationInfo && applicationInfo.eleOrderList.find(e => e.key === 'title');
-    const applicationSame =
-      applicationInfo && applicationInfo.eleOrderList.find(e => e.key === 'applicantAndInsuredSame');
+    const applicationSame = applicationInfo && applicationInfo.eleOrderList.find(e => e.key === 'applicantAndInsuredSame');
     if (!(['touHuomian', 'shuangHuomian'].includes(insurance.huomian) && element.isDisabled)) {
       return '';
     }
@@ -490,7 +464,8 @@ export default class BxtProductInfo extends Vue {
     return this.recommendValues && this.recommendValues[insurance.isGroup ? insurance.insuranceId : insurance.key];
   }
   async requiestRecommendValues() {
-    const { showRecommendValue, recommendValuesCache, inputData, groupData, productData } = this;
+    const self = this;
+    const { showRecommendValue, recommendValuesCache, inputData, groupData, productData } = self;
     if (!showRecommendValue) {
       return;
     }
@@ -515,7 +490,7 @@ export default class BxtProductInfo extends Vue {
     }
 
     if (recommendValuesCache[JSON.stringify(reqParams)]) {
-      this.recommendValues = recommendValuesCache[JSON.stringify(reqParams)];
+      self.recommendValues = recommendValuesCache[JSON.stringify(reqParams)];
       return;
     }
 
@@ -531,14 +506,35 @@ export default class BxtProductInfo extends Vue {
       .then(response => response.json())
       .then(({ success, data, info }: any) => {
         if (!success || !data) {
-          this.$toast(info);
+          self.$toast(info);
           return Promise.reject();
         }
-        this.recommendValues = data.reduce((obj, ele) => {
-          obj[ele.insuranceId] = ele.valueList;
-          return obj;
+        let recommendValues = data.reduce((obj, ele) => {
+          return Object.assign(obj, {
+            [ele.insuranceId]: ele.valueList
+          });
         }, {});
-        recommendValuesCache[JSON.stringify(reqParams)] = this.recommendValues;
+
+        // 推荐金额，根据最小值和最大值进行过滤。From hyw
+        const mulInsOrderList = productData && productData.mulInsOrderList ? productData.mulInsOrderList : [];
+        mulInsOrderList
+          .filter(ins => ins.eleOrderList && ins.eleOrderList.length)
+          .filter(ins => recommendValues[ins.key])
+          .map(ins => {
+            const calMethod = ins.calMethod || ins.feeType || ins.feeBaseType;
+            const key = calMethod === 'baof2baoe' ? 'baof' : 'baoe';
+            const ele = ins.eleOrderList.find(ele => ele.key === key);
+            if (ele) {
+              if (ele.min && !isNaN(Number(ele.min))) {
+                recommendValues[ins.key] = (recommendValues[ins.key] || []).filter(v => v >= ele.min);
+              }
+              if (ele.max && !isNaN(Number(ele.max))) {
+                recommendValues[ins.key] = (recommendValues[ins.key] || []).filter(v => v <= ele.max);
+              }
+            }
+          });
+        self.recommendValues = recommendValues;
+        recommendValuesCache[JSON.stringify(reqParams)] = recommendValues;
       })
       .catch(error => {
         console.log(error);

package/src/style/base.css

@@ -40,6 +40,7 @@ footer {
 :root {
 	--zIndex: 100;
 	--noWrap: {
+		display: inline-block;
 		width: 100%;
 		white-space: nowrap;
 		overflow: hidden;