bxs-tools-ui 1.0.21 → 1.0.25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bxs-tools-ui",
-  "version": "1.0.21",
+  "version": "1.0.25",
   "description": "微易前端业务组件",
   "main": "lib/index.js",
   "files": [
@@ -18,7 +18,8 @@
     "build": "npm run init && npm run build:docs && npm run build:prod && npm run build:component",
     "test": "echo \"Error: no test specified\" && exit 1",
     "eslint:fix": "eslint --fix '{src,packages,docs}/**/*.{js,vue,ts}'",
-    "precommit": "lint-staged"
+    "precommit": "lint-staged",
+    "prettier": "prettier --write '{src,packages}/**/*.{js,vue}'"
   },
   "lint-staged": {
     "{src,packages}/**/*.{js,vue}": [
@@ -31,17 +32,6 @@
       "git add"
     ]
   },
-  "prettier": {
-    "printWidth": 80,
-    "semi": true,
-    "singleQuote": true,
-    "trailingComma": "none",
-    "bracketSpacing": true,
-    "jsxBracketSameLine": false,
-    "arrowParens": "avoid",
-    "requirePragma": false,
-    "proseWrap": "preserve"
-  },
   "author": "lizh",
   "license": "ISC",
   "devDependencies": {
@@ -66,10 +56,10 @@
     "crypto-js": "^4.0.0",
     "css-loader": "^3.1.0",
     "eslint": "^6.5.1",
-    "eslint-config-prettier": "^6.0.0",
+    "eslint-config-prettier": "^6.15.0",
     "eslint-friendly-formatter": "^4.0.1",
     "eslint-loader": "^4.0.2",
-    "eslint-plugin-prettier": "^3.1.0",
+    "eslint-plugin-prettier": "^3.4.1",
     "eslint-plugin-vue": "^7.1.0",
     "fast-vue-md-loader": "^1.0.3",
     "friendly-errors-webpack-plugin": "^1.7.0",

package/packages/business-card/demo/index.vue

@@ -8,12 +8,7 @@
 -->
 <template>
   <div>
-    <BusinessCard
-      :card-data="cardData"
-      :button-data="buttonData"
-      @click="avatarHandler"
-      @clickBtn="buttonHandler"
-    />
+    <BusinessCard :card-data="cardData" :button-data="buttonData" @click="avatarHandler" @clickBtn="buttonHandler" />
   </div>
 </template>
 <script lang="ts">
@@ -32,8 +27,7 @@ export default class BusinessCardDemo extends Vue {
       '//media.winbaoxian.com/autoUpload/activity/2b3511574077482e0893c816eb56c8019b142d42f3639-CUzkUL_fw658_478c0884c573f5a.jpeg',
     name: 'lizhao11',
     rank: '三联钻代理人',
-    rankIcon:
-      '//media.winbaoxian.com/autoUpload/activity/diamond_362dcf9f4453ded.png',
+    rankIcon: '//media.winbaoxian.com/autoUpload/activity/diamond_362dcf9f4453ded.png',
     mobile: '13023690000'
   };
   buttonData = {

package/packages/business-card/index.vue

@@ -2,48 +2,26 @@
   <div class="bxt-business-card">
     <ul class="bxt-business-card-ul">
       <li @click="avatarHandler" class="bxt-business-card-li">
-        <img
-          :src="cardData.avatar"
-          class="bxt-business-card-avatar"
-          alt="头像"
-        />
+        <img :src="cardData.avatar" class="bxt-business-card-avatar" alt="头像" />
       </li>
       <li @click="avatarHandler" class="bxt-business-card-li">
         <div class="bxt-business-card-container">
           <span class="bxt-business-card-name">
             {{ cardData.name }}
-            <img
-              v-if="cardData.rankIcon"
-              :src="cardData.rankIcon"
-              class="bxt-business-card-diamond"
-            />
+            <img v-if="cardData.rankIcon" :src="cardData.rankIcon" class="bxt-business-card-diamond" />
           </span>
-          <span
-            v-if="cardData.rank"
-            :style="rankStyle"
-            class="bxt-business-card-rank"
-          >
+          <span v-if="cardData.rank" :style="rankStyle" class="bxt-business-card-rank">
             {{ cardData.rank }}
           </span>
         </div>
       </li>
       <li class="bxt-business-card-li">
-        <a
-          v-if="cardData.mobile"
-          :href="`tel:${cardData.mobile}`"
-          class="bxt-business-card-mobile"
-        >
+        <a v-if="cardData.mobile" :href="`tel:${cardData.mobile}`" class="bxt-business-card-mobile">
           {{ cardData.mobile }}
         </a>
       </li>
-      <li
-        v-if="buttonData && buttonData.tx"
-        @click="buttonHandler"
-        class="bxt-business-card-li"
-      >
-        <span :style="buttonStyle" class="bxt-business-card-button">{{
-          buttonData.tx
-        }}</span>
+      <li v-if="buttonData && buttonData.tx" @click="buttonHandler" class="bxt-business-card-li">
+        <span :style="buttonStyle" class="bxt-business-card-button">{{ buttonData.tx }}</span>
       </li>
     </ul>
   </div>

package/packages/bxs-utils/planbook/common.js

@@ -146,8 +146,7 @@ export function deepCopy(obj, hash = new WeakMap()) {
   hash.set(obj, newObj);
   for (let key in obj) {
     if (obj.hasOwnProperty(key)) {
-      newObj[key] =
-        typeof obj[key] === 'object' ? deepCopy(obj[key], hash) : obj[key];
+      newObj[key] = typeof obj[key] === 'object' ? deepCopy(obj[key], hash) : obj[key];
     }
   }
 
@@ -169,8 +168,7 @@ export function getAgeFromBirth(birth, cDate) {
   var age = nowDate.getFullYear() - bDate.getFullYear();
   if (
     nowDate.getMonth() - bDate.getMonth() < 0 ||
-    (nowDate.getMonth() - bDate.getMonth() === 0 &&
-      nowDate.getDate() - bDate.getDate() < 0)
+    (nowDate.getMonth() - bDate.getMonth() === 0 && nowDate.getDate() - bDate.getDate() < 0)
   ) {
     age--;
   }

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

@@ -36,20 +36,10 @@ export function initInsuranceData(insData) {
       }
       if (e.optConf && e.optConf.length) {
         let options = [];
-        for (
-          let i = e.optConf[0];
-          i < e.optConf[1];
-          i += (e.optConf[2] && e.optConf[2] && e.optConf[2].step) || 1
-        ) {
+        for (let 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
+            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
           });
         }
         e.opts = options;
@@ -130,9 +120,7 @@ export function initElementValidateRules(ele, productData) {
       },
       {
         pattern: ele.regExp ? eval(ele.regExp) : /^\d*$/,
-        message:
-          ele.regExpMessage ||
-          (ele.regExp ? '输入不合法，请重新输入' : '请输入整数值')
+        message: ele.regExpMessage || (ele.regExp ? '输入不合法，请重新输入' : '请输入整数值')
       }
     ];
   }
@@ -149,9 +137,7 @@ export function initElementValidateRules(ele, productData) {
   if (min || max) {
     let message = '';
     if (min && max) {
-      message = `请输入${converUnit10000(min)}~${converUnit10000(
-        max
-      )}之间的数值`;
+      message = `请输入${converUnit10000(min)}~${converUnit10000(max)}之间的数值`;
     } else if (!min) {
       message = `请输入不大于${converUnit10000(max)}的数值`;
     } else if (!max) {
@@ -192,12 +178,8 @@ export function initElementValidateRules(ele, productData) {
     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 = productData.mulInsOrderList.find(ins => ins.key + '' === item1[1]);
+      insurance2 = productData.mulInsOrderList.find(ins => ins.key + '' === item2[1]);
     }
     if (insurance1 && insurance1.eleOrderList) {
       // 险种选中时，获取险种对应元素的值
@@ -212,13 +194,7 @@ export function initElementValidateRules(ele, productData) {
         itemValue2 = insurance2.eleOrderList.find(e => e.key === item1[2]);
       }
     }
-    if (
-      itemValue1 &&
-      itemValue1.value &&
-      itemValue2 &&
-      itemValue2.value &&
-      ele.compareItem[1]
-    ) {
+    if (itemValue1 && itemValue1.value && itemValue2 && itemValue2.value && ele.compareItem[1]) {
       rules.push({
         value1: itemValue1.value,
         value2: itemValue2.value,
@@ -264,15 +240,10 @@ export function initElementValidateRules(ele, productData) {
  * - eleData: 必传。元素数据（单个）
  * @return {*} 校验结果
  */
-export function restrictElementsInInsurance({
-  personOrderList,
-  insData,
-  eleData
-}) {
+export function restrictElementsInInsurance({ personOrderList, insData, eleData }) {
   let errorMsg;
   if (insData && eleData && eleData.restrictions) {
-    let insuredInfo =
-      personOrderList && personOrderList.find(p => p.key === 'insuredInfo');
+    let insuredInfo = personOrderList && personOrderList.find(p => p.key === 'insuredInfo');
     let insuranceInfo = convertEleOrderListToObj(insData);
     let verifyData = {
       sex: insuredInfo.sex,
@@ -292,18 +263,15 @@ export function restrictElementsInInsurance({
           // 当前字段是目标元素
           ele === eleData.key ||
           // 当前约束值是字符或者数字，且数据中有该值
-          ((restrict[ele].constructor === String ||
-            restrict[ele].constructor === Number) &&
+          ((restrict[ele].constructor === String || restrict[ele].constructor === Number) &&
             verifyData[ele] == restrict[ele]) ||
           // 当前约束值是数组，且数据中有一项值包含在数组中
-          (restrict[ele].constructor === Array &&
-            restrict[ele].find(r => r == verifyData[ele]))
+          (restrict[ele].constructor === Array && restrict[ele].find(r => r == verifyData[ele]))
         );
       });
     });
 
-    let valRange =
-      eleRestricts && eleRestricts[0] && eleRestricts[0][eleData.key];
+    let valRange = eleRestricts && eleRestricts[0] && eleRestricts[0][eleData.key];
     if (valRange && valRange.length) {
       if (eleData.opts) {
         eleData.opts.filter(o => {
@@ -311,29 +279,15 @@ export function restrictElementsInInsurance({
             o.isInvalid = true;
           }
         });
-        if (
-          !eleData.opts.find(
-            opt =>
-              !opt.isHide &&
-              !opt.isDisabled &&
-              !opt.isInvalid &&
-              opt.val == eleData.value
-          )
-        ) {
+        if (!eleData.opts.find(opt => !opt.isHide && !opt.isDisabled && !opt.isInvalid && opt.val == eleData.value)) {
           let opt = eleData.opts.find(o => o.val == eleData.value);
-          errorMsg = `当前条件下, 没有${eleData.labelName}${
-            opt ? opt.desc : ''
-          }选项, 已自动切换`;
+          errorMsg = `当前条件下, 没有${eleData.labelName}${opt ? opt.desc : ''}选项, 已自动切换`;
         }
       } else if (valRange[0] || valRange[1]) {
         let rangeMsg = `当前条件下, ${insData.name}的${eleData.labelName}值`;
         let minMsg = `不得小于${converUnit10000(valRange[0])}`;
         let maxMsg = `不得大于${converUnit10000(valRange[1])}`;
-        if (
-          valRange[0] &&
-          valRange[1] &&
-          (eleData.value < valRange[0] || eleData.value > valRange[1])
-        ) {
+        if (valRange[0] && valRange[1] && (eleData.value < valRange[0] || eleData.value > valRange[1])) {
           errorMsg = `${rangeMsg}${minMsg}且${maxMsg}`;
         } else if (valRange[0] && eleData.value < valRange[0]) {
           errorMsg = `${rangeMsg}${minMsg}`;

package/packages/bxs-utils/planbook/person.js

@@ -30,11 +30,7 @@ export function initPersonData(inputData, verifyData) {
         if (person.eleOrderList) {
           // 投保人添加元素：投被保人是同一人
           if (person.key === 'applicantInfo') {
-            if (
-              person.eleOrderList.every(
-                e => e.key !== 'applicantAndInsuredSame'
-              )
-            ) {
+            if (person.eleOrderList.every(e => e.key !== 'applicantAndInsuredSame')) {
               person.eleOrderList.splice(1, 0, {
                 key: 'applicantAndInsuredSame',
                 value: 0,
@@ -66,19 +62,14 @@ export function initPersonData(inputData, verifyData) {
           let ageRange = getInsuredAgeRange(inputData, verifyData);
           if (ageRange) {
             personOrderList.forEach(person => {
-              if (
-                person.key === 'insuredInfo' &&
-                ageRange[`${person.key}1`] &&
-                ageRange[`${person.key}1`].length
-              ) {
+              if (person.key === 'insuredInfo' && ageRange[`${person.key}1`] && ageRange[`${person.key}1`].length) {
                 person.eleOrderList.forEach(ele => {
                   if (ele.key === 'age') {
                     ele.opts = ageRange[`${person.key}1`];
                     // 男女年龄取值范围不同
                     if (
                       ageRange[`${person.key}2`].length &&
-                      (ele.opts[0] !== ageRange[`${person.key}2`][0] ||
-                        ele.opts[1] !== ageRange[`${person.key}2`][1])
+                      (ele.opts[0] !== ageRange[`${person.key}2`][0] || ele.opts[1] !== ageRange[`${person.key}2`][1])
                     ) {
                       ele.optsF = ageRange[`${person.key}2`];
                     }
@@ -126,6 +117,7 @@ export function initPersonData(inputData, verifyData) {
                 e.componentName = 'cmCommonSelect';
                 e.placeholder = '请选择年龄';
                 e.options = [];
+                e.iconColor = '#508cee';
                 break;
               }
             }
@@ -155,20 +147,13 @@ export function personDataHandler(allPersonsData, { personKey, eleKey } = {}) {
   if (allPersonsData && allPersonsData.personOrderList) {
     // 生日和年龄联动
     if (personKey && eleKey) {
-      let personData = allPersonsData.personOrderList.find(
-        p => p.key === personKey
-      );
-      let eleData =
-        personData &&
-        personData.eleOrderList &&
-        personData.eleOrderList.find(e => e.key === eleKey);
+      let personData = allPersonsData.personOrderList.find(p => p.key === personKey);
+      let eleData = personData && personData.eleOrderList && personData.eleOrderList.find(e => e.key === eleKey);
       if (eleData) {
         switch (eleData.key) {
           case 'age': {
             // 改变年龄，清空生日
-            let birthday = personData.eleOrderList.find(
-              e => e.key === 'birthday'
-            );
+            let birthday = personData.eleOrderList.find(e => e.key === 'birthday');
             if (birthday) {
               birthday.value = null;
               birthday.defaultValue = null;
@@ -196,19 +181,10 @@ export function personDataHandler(allPersonsData, { personKey, eleKey } = {}) {
       if (person.key === 'insuredInfo' && applicantData) {
         // 关于被保人、投保人是否是同一人的处理
         // 被保人所选年龄不在投保人年龄范围内，强制选中投保人。即被保人年龄不能做投保人
-        let applicantAge = applicantData.eleOrderList.find(
-          e => e.key === 'age'
-        );
-        let applicantTitle = applicantData.eleOrderList.find(
-          e => e.key === 'title'
-        );
-        let applicantSame = applicantData.eleOrderList.find(
-          e => e.key === 'applicantAndInsuredSame'
-        );
-        if (
-          insuredInfo.age >= applicantAge.opts[0] &&
-          insuredInfo.age <= applicantAge.opts[1]
-        ) {
+        let applicantAge = applicantData.eleOrderList.find(e => e.key === 'age');
+        let applicantTitle = applicantData.eleOrderList.find(e => e.key === 'title');
+        let applicantSame = applicantData.eleOrderList.find(e => e.key === 'applicantAndInsuredSame');
+        if (insuredInfo.age >= applicantAge.opts[0] && insuredInfo.age <= applicantAge.opts[1]) {
           if (applicantTitle) {
             applicantTitle.isDisabled = false;
           }
@@ -229,17 +205,13 @@ export function personDataHandler(allPersonsData, { personKey, eleKey } = {}) {
       }
       if (person.key === 'applicantInfo') {
         // 投被保人为是否为同一人的相关逻辑
-        let applicantSame = person.eleOrderList.find(
-          e => e.key === 'applicantAndInsuredSame'
-        );
+        let applicantSame = person.eleOrderList.find(e => e.key === 'applicantAndInsuredSame');
         if (applicantSame) {
           person.eleOrderList.forEach(ele => {
             if (['title', 'applicantAndInsuredSame'].indexOf(ele.key) === -1) {
               ele.isHide = !!applicantSame.value;
               if (applicantSame.value) {
-                let insuredEle = insuredData.eleOrderList.find(
-                  e => e.key === ele.key
-                );
+                let insuredEle = insuredData.eleOrderList.find(e => e.key === ele.key);
                 if (insuredEle) {
                   ele.value = insuredEle.value;
                 }
@@ -301,9 +273,7 @@ export function getInsuredAgeRange(inputData, verifyData) {
               // 险种是否有费率
               if (verifyData[prod.key][ins.key]) {
                 // 产品中是否有必选险种
-                let hasRequiredIns = prod.mulInsOrderList.some(
-                  ins => !!ins.required
-                );
+                let hasRequiredIns = prod.mulInsOrderList.some(ins => !!ins.required);
                 //无必选产品，根据所有产品的最小值，最大值确定；有必选产品, 根据必选产品的最小值，最大值确定
                 //无必选险种，根据所有险种的最小值，最大值确定；如果有必选险种：根据必选险种的最小值，最大值确定
                 if (
@@ -314,25 +284,13 @@ export function getInsuredAgeRange(inputData, verifyData) {
                   verifyData[prod.key][ins.key].forEach(condi => {
                     let currentAgeRange = ageRange[`insuredInfo${condi.sex}`];
                     ageRange[`insuredInfo${condi.sex}`] = [
-                      Math.min(
-                        currentAgeRange[0] === undefined
-                          ? Infinity
-                          : currentAgeRange[0],
-                        condi.minAge
-                      ),
-                      Math.max(
-                        currentAgeRange[1] === undefined
-                          ? -Infinity
-                          : currentAgeRange[1],
-                        condi.maxAge
-                      )
+                      Math.min(currentAgeRange[0] === undefined ? Infinity : currentAgeRange[0], condi.minAge),
+                      Math.max(currentAgeRange[1] === undefined ? -Infinity : currentAgeRange[1], condi.maxAge)
                     ];
                   });
                 }
               } else {
-                console.log(
-                  `${prod.titleName}-${prod.key} -> ${ins.name}-${ins.key}: 当前险种没有费率表`
-                );
+                console.log(`${prod.titleName}-${prod.key} -> ${ins.name}-${ins.key}: 当前险种没有费率表`);
               }
             });
           }
@@ -358,10 +316,7 @@ export function setPersonAgeOptions(personData) {
   personData.eleOrderList.forEach(ele => {
     if (ele.key === 'age') {
       let options = [];
-      let opts =
-        personForm.sex == 2 && ele.optsF && ele.optsF.length
-          ? ele.optsF
-          : ele.opts;
+      let opts = personForm.sex == 2 && ele.optsF && ele.optsF.length ? ele.optsF : ele.opts;
       for (let k = opts[0]; k <= opts[1]; k++) {
         options.push({
           val: k,
@@ -371,7 +326,7 @@ export function setPersonAgeOptions(personData) {
 
       let birthday = personData.eleOrderList.find(e => e.key === 'birthday');
       if (options.length && options.every(o => o.val !== ele.value)) {
-        ele.value = options[0];
+        ele.value = options[0].val;
         if (birthday) {
           birthday.value = null;
         }
@@ -389,11 +344,7 @@ export function setPersonAgeOptions(personData) {
           new Date().getMonth(),
           new Date().getDate() + 1
         );
-        birthday.maxDate = new Date(
-          new Date().getFullYear() - opts[0],
-          new Date().getMonth(),
-          new Date().getDate()
-        );
+        birthday.maxDate = new Date(new Date().getFullYear() - opts[0], new Date().getMonth(), new Date().getDate());
       }
     }
   });
@@ -417,9 +368,7 @@ export function convertPersonData(allPersonsData, type) {
   if (allPersonsData) {
     //转换收件人信息
     if (allPersonsData.recipientInfo) {
-      cPersonData.recipientInfo = convertEleOrderListToObj(
-        allPersonsData.recipientInfo
-      );
+      cPersonData.recipientInfo = convertEleOrderListToObj(allPersonsData.recipientInfo);
     }
     //转换被、投、投保人配偶的信息
     if (allPersonsData.personOrderList) {
@@ -444,8 +393,7 @@ export function convertPersonData(allPersonsData, type) {
     return {
       recipientInfo: cPersonData.recipientInfo,
       personOrderList:
-        allPersonsData.personOrderList &&
-        allPersonsData.personOrderList.map(p => p.key).map(p => cPersonData[p])
+        allPersonsData.personOrderList && allPersonsData.personOrderList.map(p => p.key).map(p => cPersonData[p])
     };
   }
 }