bxs-tools-ui 1.3.2 → 1.3.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bxs-tools-ui",
-  "version": "1.3.2",
+  "version": "1.3.4",
   "description": "微易前端业务组件",
   "main": "lib/index.js",
   "files": [

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

@@ -212,7 +212,7 @@ export function initElementValidateRules(ele : IInsElement, productData? : IPbPr
     if (insurance2 && insurance2.eleOrderList) {
       insTitle2 = insurance2.eleOrderList.find(e => e.key === 'title');
       if (insTitle2 && insTitle2.value) {
-        itemValue2 = insurance2.eleOrderList.find(e => e.key === item1[2]);
+        itemValue2 = insurance2.eleOrderList.find(e => e.key === item2[2]);
       }
     }
     if (itemValue1 && itemValue1.value && itemValue2 && itemValue2.value && ele.compareItem[1]) {

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

@@ -721,6 +721,13 @@ export function restrictInsurancesInProduct({
                   }
                 }
               });
+              if (!(curEle.isHide && !curEle.isDisabled) && curEle.opts) {
+                const validOptions = curEle.opts.filter(o => !o.isDisabled && !o.isHide && !o.isInvalid)
+                const activeOption = validOptions.find(o => o.val === curEle.value)
+                if (!activeOption && validOptions.length) {
+                  curEle.value = validOptions[0].val
+                }
+              }
             }
             break;
           }

package/packages/product-info/index.vue

@@ -37,7 +37,7 @@
                 :disabled="ele.isDisabled"
                 :huomian-tag="getInsuranceTitleHmTag(ins)"
                 :huomian-tips="!!$listeners.openCrmPerson && getHuomianTips(ins, ele)"
-                @change="change({ insData: ins, eleData: ele, type: 'change' })"
+                @change="onChange({ insData: ins, eleData: ele })"
                 @openCrmPerson="$emit('openCrmPerson')"
               />
             </bxs-form-item>
@@ -77,7 +77,7 @@
                 "
                 @blur="activeInputKey = ''"
                 @input="numberUnitStr = getAmountUnit(ele)"
-                @change="change({ insData: ins, eleData: ele, type: 'change' })"
+                @change="onChange({ insData: ins, eleData: ele })"
                 @click-icon="onClickIcon(`id_${ins.key}_${ele.key}`)"
               />
               <div v-if="activeInputKey === ins.key + ele.key && numberUnitStr" class="bxt-ins-unit-tips">
@@ -110,9 +110,9 @@
               <bxs-radio-group
                 v-model="ele.value"
                 :disabled="ele.isDisabled"
-                @change="change({ insData: ins, eleData: ele, type: 'change' })"
+                @change="onChange({ insData: ins, eleData: ele })"
               >
-                <template v-for="opt in ele.opts">
+                <template v-for="opt in ele.opts.filter(o => !o.isHide && !o.isDisabled && !o.isInvalid)">
                   <bxs-radio
                     :key="opt.val"
                     type="button"
@@ -139,7 +139,7 @@
               <bxs-radio-group
                 v-model="ele.value"
                 :disabled="ele.isDisabled"
-                @change="change({ insData: ins, eleData: ele, type: 'change' })"
+                @change="onChange({ insData: ins, eleData: ele })"
               >
                 <template v-for="opt in ele.opts">
                   <bxs-radio
@@ -185,7 +185,7 @@
                 :options="ele.opts.filter(o => !o.isHide && !o.isDisabled && !o.isInvalid)"
                 :disabled="isDisabled(ele)"
                 :right-icon="isDisabled(ele) ? '' : 'arrow-right'"
-                @change="change({ insData: ins, eleData: ele, type: 'change' })"
+                @change="onChange({ insData: ins, eleData: ele })"
               />
             </bxs-form-item>
           </template>
@@ -200,6 +200,7 @@
 <script lang="ts">
 import Vue from 'vue';
 import { Component, Prop } from 'vue-property-decorator';
+import { get as _get } from 'lodash';
 import {
   productDataHandler,
   verifyProductRules,
@@ -313,41 +314,46 @@ export default class BxtProductInfo extends Vue {
   }
 
   created() {
-    this.change({
-      ins: null,
-      ele: null,
-      type: 'init'
-    });
+    this.init();
   }
-  change(options) {
-    const self = this;
-    if (!options.eleData || !['title'].includes(options.eleData.key)) {
-      self.requiestRecommendValues();
-    }
-    if (options.type === 'change') {
-      self.$nextTick(() => {
-        self.$emit(
-          'change',
-          self.productData,
-          {
-            ...options,
-            errorMsg: self.changeProduct(self.productData, options)
-          },
-          this
-        );
-      });
-      return;
-    }
-    self.$emit(
+  init() {
+    this.requiestRecommendValues();
+    this.$emit(
       'change',
-      self.productData,
+      this.productData,
       {
-        ...options,
-        errorMsg: self.changeProduct(self.productData, options)
+        errorMsg: this.changeProduct(this.productData, {})
       },
       this
     );
   }
+  onChange(options: any = {}) {
+    options.type = 'change';
+    const { type, insData, eleData } = options;
+    if (!['title'].includes(eleData.key)) {
+      this.requiestRecommendValues();
+    }
+    setTimeout(() => {
+      const refInsuranceForm: any = _get(this.$refs, `insuranceForm${insData.key}[0]`);
+      if (refInsuranceForm) {
+        console.log(this.productForm[insData.key]);
+        refInsuranceForm.validate(eleData.key);
+      }
+    }, 300);
+    this.$nextTick(() => {
+      this.$emit(
+        'change',
+        this.productData,
+        {
+          type,
+          insData,
+          eleData,
+          errorMsg: this.changeProduct(this.productData, options)
+        },
+        this
+      );
+    });
+  }
   onClickIcon(id) {
     const inputDom: any = document.querySelector(`#${id}`);
     inputDom.focus();
@@ -445,16 +451,22 @@ export default class BxtProductInfo extends Vue {
     }
   }
   async validate() {
-    let insKeys: any = this.filterInsuranceList.map(ins => ins.key);
-    let validateInfo: any = [];
-    for (let k of insKeys) {
-      let info = await this.$refs[`insuranceForm${k}`][0].validate();
-      validateInfo.push(info);
-    }
-    if (validateInfo.some(p => !!p)) {
-      return Promise.reject(validateInfo);
-    }
-    return Promise.resolve(validateInfo);
+    const { $refs, filterInsuranceList } = this;
+    const insKeys: any = filterInsuranceList.map(ins => ins.key);
+    return new Promise((resolve, reject) => {
+      setTimeout(() => {
+        const promises = [];
+        for (const k of insKeys) {
+          const _ref = _get($refs, `insuranceForm${k}[0]`);
+          if (_ref) {
+            promises.push(_ref?.validate());
+          }
+        }
+        Promise.all(promises)
+          .then(() => resolve([]))
+          .catch(error => reject(error));
+      }, 200);
+    });
   }
   closeKeyBoard() {
     const activeElement: any = document.activeElement;
@@ -526,10 +538,9 @@ export default class BxtProductInfo extends Vue {
   onClickRecommendValue(value, ins, ele) {
     const self = this;
     ele.value = value;
-    self.change({
+    self.onChange({
       insData: ins,
-      eleData: ele,
-      type: 'change'
+      eleData: ele
     });
 
     self.$nextTick(() => {