bxs-tools-ui 3.3.1 → 3.3.3

package/es/adjust-baoe/index.js

@@ -9200,9 +9200,8 @@ var request = /*#__PURE__*/function () {
 }();
 
 function validateAdjustBaoe(params) {
-  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   return request({
-    url: "/planBook/".concat(options.publicPbUuid ? 'public' : 'V2', "/validateAccount/-1/low"),
+    url: '/planBook/V2/validateAccount/-1/low',
     method: 'post',
     data: QS.stringify({
       jd: JSON.stringify(params)
@@ -9614,7 +9613,6 @@ var AdjustBaoe = (_dec = Component({}), _dec2 = Prop({
       });
       return validateAdjustBaoe({
         insuranceTypeId: params.planbookId * 1,
-        publicPbUuid: params.publicPbUuid,
         personData: {
           personOrderList: convertPersonData(personData, personData.personOrderList.map(function (p) {
             return p.key;
@@ -9626,8 +9624,6 @@ var AdjustBaoe = (_dec = Component({}), _dec2 = Prop({
             adjustBaoeData: this.adjustBaoeData
           })]
         }]
-      }, {
-        publicPbUuid: params.publicPbUuid
       }).catch(function (err) {
         _this5.adjustBaoeData = cloneAdjustBaoeData;
         if (err) {

package/es/index.js

@@ -9132,10 +9132,6 @@ function getExpressionParamMap(personData, product, ins, options) {
     // 当前险种
     common: {},
     // 通用信息
-    customVariable: null,
-    // 自定义变量
-    cv: null,
-    // 简写，自定义变量
     t: {} // 事件目标
   };
   if (personData) {
@@ -9198,11 +9194,6 @@ function getExpressionParamMap(personData, product, ins, options) {
       map.executeSource = options.executeSource;
     }
   }
-  if (ins && ins.customVariableExp) {
-    var exp = ins.customVariableExp.replace(/(%)(\d+)(\.*\w*)(%)/g, 'map.i$2$3').replace(/(%)(\w*\.*\w*)(%)/g, 'map.$2');
-    map.customVariable = eval(exp);
-    map.cv = map.customVariable;
-  }
   return map;
 }
 function executeElementRule(personData, product, ins, ele) {
@@ -10520,14 +10511,18 @@ function _productDataHandler() {
                 _ret = _loop2();
                 if (_ret === 0) break;
               } while (curCondition && curCondition.key && curCondition[curCondition.key]);
-              if (Array.isArray(ins.eleOrderList)) {
-                ins.eleOrderList.forEach(function (ele) {
-                  var newEleMap = executeElementRule(personData, prodData, ins, ele, parmas);
-                  for (var k in newEleMap) {
-                    ele[k] = newEleMap[k];
-                  }
-                });
-                insuranceDataHandler(ins, prodData);
+              try {
+                if (Array.isArray(ins.eleOrderList)) {
+                  ins.eleOrderList.forEach(function (ele) {
+                    var newEleMap = executeElementRule(personData, prodData, ins, ele, parmas);
+                    for (var k in newEleMap) {
+                      ele[k] = newEleMap[k];
+                    }
+                  });
+                  insuranceDataHandler(ins, prodData);
+                }
+              } catch (error) {
+                console.error(error);
               }
             });
           }
@@ -13974,9 +13969,8 @@ function Watch(path, options) {
 }
 
 function validateAdjustBaoe(params) {
-  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   return request({
-    url: "/planBook/".concat(options.publicPbUuid ? 'public' : 'V2', "/validateAccount/-1/low"),
+    url: '/planBook/V2/validateAccount/-1/low',
     method: 'post',
     data: QS.stringify({
       jd: JSON.stringify(params)
@@ -14205,7 +14199,6 @@ var AdjustBaoe = (_dec$7 = Component({}), _dec2$7 = Prop({
       });
       return validateAdjustBaoe({
         insuranceTypeId: params.planbookId * 1,
-        publicPbUuid: params.publicPbUuid,
         personData: {
           personOrderList: convertPersonData(personData, personData.personOrderList.map(function (p) {
             return p.key;
@@ -14217,8 +14210,6 @@ var AdjustBaoe = (_dec$7 = Component({}), _dec2$7 = Prop({
             adjustBaoeData: this.adjustBaoeData
           })]
         }]
-      }, {
-        publicPbUuid: params.publicPbUuid
       }).catch(function (err) {
         _this5.adjustBaoeData = cloneAdjustBaoeData;
         if (err) {
@@ -46857,7 +46848,7 @@ function _createdProductDataToCalc() {
             productForm.mulInsOrderList = productForm.mulInsOrderList.map(function (ins) {
               var tempIns = {};
               for (var _k2 in ins) {
-                if (!['isFollowing', 'pPeriodDesc', 'baoeDesc', 'baofDesc', 'iDurationDesc', 'payModeDesc', 'payModePremiumDesc', 'accountData', 'reduceBaofData', 'duplicateReduceBaofData', 'isCheckbox', 'groupKey', 'groupName', 'shmInsData', 'totalBaof', 'customVariableExp',
+                if (!['isFollowing', 'pPeriodDesc', 'baoeDesc', 'baofDesc', 'iDurationDesc', 'payModeDesc', 'payModePremiumDesc', 'accountData', 'reduceBaofData', 'duplicateReduceBaofData', 'isCheckbox', 'groupKey', 'groupName', 'shmInsData', 'totalBaof',
                 // 'calcResultExp', // 不能删除，后面有依赖
                 'revalidateFlag'].includes(_k2)) {
                   tempIns[_k2] = ins[_k2];
@@ -46883,7 +46874,6 @@ function _createdProductDataToCalc() {
             productData: productData
           });
           reqData = {
-            publicPbUuid: options.publicPbUuid || null,
             insuranceTypeId: options.planbookId ? options.planbookId * 1 : null,
             personData: {
               personOrderList: convertPersonData(inputData.personData, inputData.personData.personOrderList.map(function (p) {
@@ -47137,14 +47127,13 @@ var BxtProductInfo = (_dec = Component({
     value: function () {
       var _changeProduct = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee4(productData, options) {
         var _this5 = this;
-        var $listeners, user, inputData, verifyData, personData, groupKey, productKey, params, type, insData, eleData, planbookId, publicPbUuid, productVerifyData, eventTarget, errorMsg;
+        var $listeners, user, inputData, verifyData, personData, groupKey, productKey, params, type, insData, eleData, planbookId, productVerifyData, eventTarget, errorMsg;
         return _regeneratorRuntime.wrap(function (_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
               $listeners = this.$listeners, user = this.user, 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;
               planbookId = get$3(params, 'planbookId');
-              publicPbUuid = get$3(params, 'publicPbUuid');
               productVerifyData = get$3(verifyData, "[".concat(productKey, "]"));
               eventTarget = {
                 insuranceKey: get$3(insData, 'key') || null,
@@ -47195,7 +47184,6 @@ var BxtProductInfo = (_dec = Component({
                         _this5.$emit('reCalculate', inputData, {
                           user: user,
                           planbookId: planbookId,
-                          publicPbUuid: publicPbUuid,
                           groupKey: groupKey,
                           productKey: productKey,
                           executeSource: 'userAction',
@@ -48463,7 +48451,7 @@ if (typeof window !== 'undefined' && window.Vue) {
   install(window.Vue);
 }
 const index = {
-  version: '3.3.0',
+  version: '3.3.3',
   install: install
 };
 

package/es/product-info/index.js

@@ -1,10 +1,10 @@
 import Vue from 'vue';
 import { memoize, cloneDeep, findLastIndex, get } from 'lodash';
-import QS from 'qs';
 import 'vant/lib/dialog/index.css';
 import _Dialog from 'vant/lib/dialog';
 import 'vant/lib/toast/index.css';
 import _Toast from 'vant/lib/toast';
+import QS from 'qs';
 import MD5 from 'md5';
 import CryptoJS from 'crypto-js';
 
@@ -9434,10 +9434,6 @@ function getExpressionParamMap(personData, product, ins, options) {
     // 当前险种
     common: {},
     // 通用信息
-    customVariable: null,
-    // 自定义变量
-    cv: null,
-    // 简写，自定义变量
     t: {} // 事件目标
   };
   if (personData) {
@@ -9500,11 +9496,6 @@ function getExpressionParamMap(personData, product, ins, options) {
       map.executeSource = options.executeSource;
     }
   }
-  if (ins && ins.customVariableExp) {
-    var exp = ins.customVariableExp.replace(/(%)(\d+)(\.*\w*)(%)/g, 'map.i$2$3').replace(/(%)(\w*\.*\w*)(%)/g, 'map.$2');
-    map.customVariable = eval(exp);
-    map.cv = map.customVariable;
-  }
   return map;
 }
 function executeElementRule(personData, product, ins, ele) {
@@ -10246,14 +10237,18 @@ function _productDataHandler() {
                 _ret = _loop2();
                 if (_ret === 0) break;
               } while (curCondition && curCondition.key && curCondition[curCondition.key]);
-              if (Array.isArray(ins.eleOrderList)) {
-                ins.eleOrderList.forEach(function (ele) {
-                  var newEleMap = executeElementRule(personData, prodData, ins, ele, parmas);
-                  for (var k in newEleMap) {
-                    ele[k] = newEleMap[k];
-                  }
-                });
-                insuranceDataHandler(ins, prodData);
+              try {
+                if (Array.isArray(ins.eleOrderList)) {
+                  ins.eleOrderList.forEach(function (ele) {
+                    var newEleMap = executeElementRule(personData, prodData, ins, ele, parmas);
+                    for (var k in newEleMap) {
+                      ele[k] = newEleMap[k];
+                    }
+                  });
+                  insuranceDataHandler(ins, prodData);
+                }
+              } catch (error) {
+                console.error(error);
               }
             });
           }
@@ -10999,7 +10994,7 @@ function _createdProductDataToCalc() {
             productForm.mulInsOrderList = productForm.mulInsOrderList.map(function (ins) {
               var tempIns = {};
               for (var _k2 in ins) {
-                if (!['isFollowing', 'pPeriodDesc', 'baoeDesc', 'baofDesc', 'iDurationDesc', 'payModeDesc', 'payModePremiumDesc', 'accountData', 'reduceBaofData', 'duplicateReduceBaofData', 'isCheckbox', 'groupKey', 'groupName', 'shmInsData', 'totalBaof', 'customVariableExp',
+                if (!['isFollowing', 'pPeriodDesc', 'baoeDesc', 'baofDesc', 'iDurationDesc', 'payModeDesc', 'payModePremiumDesc', 'accountData', 'reduceBaofData', 'duplicateReduceBaofData', 'isCheckbox', 'groupKey', 'groupName', 'shmInsData', 'totalBaof',
                 // 'calcResultExp', // 不能删除，后面有依赖
                 'revalidateFlag'].includes(_k2)) {
                   tempIns[_k2] = ins[_k2];
@@ -11025,7 +11020,6 @@ function _createdProductDataToCalc() {
             productData: productData
           });
           reqData = {
-            publicPbUuid: options.publicPbUuid || null,
             insuranceTypeId: options.planbookId ? options.planbookId * 1 : null,
             personData: {
               personOrderList: convertPersonData(inputData.personData, inputData.personData.personOrderList.map(function (p) {
@@ -12068,14 +12062,13 @@ var BxtProductInfo = (_dec = Component({
     value: function () {
       var _changeProduct = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee4(productData, options) {
         var _this5 = this;
-        var $listeners, user, inputData, verifyData, personData, groupKey, productKey, params, type, insData, eleData, planbookId, publicPbUuid, productVerifyData, eventTarget, errorMsg;
+        var $listeners, user, inputData, verifyData, personData, groupKey, productKey, params, type, insData, eleData, planbookId, productVerifyData, eventTarget, errorMsg;
         return _regeneratorRuntime.wrap(function (_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
               $listeners = this.$listeners, user = this.user, 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;
               planbookId = get(params, 'planbookId');
-              publicPbUuid = get(params, 'publicPbUuid');
               productVerifyData = get(verifyData, "[".concat(productKey, "]"));
               eventTarget = {
                 insuranceKey: get(insData, 'key') || null,
@@ -12126,7 +12119,6 @@ var BxtProductInfo = (_dec = Component({
                         _this5.$emit('reCalculate', inputData, {
                           user: user,
                           planbookId: planbookId,
-                          publicPbUuid: publicPbUuid,
                           groupKey: groupKey,
                           productKey: productKey,
                           executeSource: 'userAction',

package/es/utils/index.js

@@ -281,10 +281,6 @@ function getExpressionParamMap(personData, product, ins, options) {
     // 当前险种
     common: {},
     // 通用信息
-    customVariable: null,
-    // 自定义变量
-    cv: null,
-    // 简写，自定义变量
     t: {} // 事件目标
   };
   if (personData) {
@@ -347,11 +343,6 @@ function getExpressionParamMap(personData, product, ins, options) {
       map.executeSource = options.executeSource;
     }
   }
-  if (ins && ins.customVariableExp) {
-    var exp = ins.customVariableExp.replace(/(%)(\d+)(\.*\w*)(%)/g, 'map.i$2$3').replace(/(%)(\w*\.*\w*)(%)/g, 'map.$2');
-    map.customVariable = eval(exp);
-    map.cv = map.customVariable;
-  }
   return map;
 }
 function executeElementRule(personData, product, ins, ele) {
@@ -10420,14 +10411,18 @@ function _productDataHandler() {
                 _ret = _loop2();
                 if (_ret === 0) break;
               } while (curCondition && curCondition.key && curCondition[curCondition.key]);
-              if (Array.isArray(ins.eleOrderList)) {
-                ins.eleOrderList.forEach(function (ele) {
-                  var newEleMap = executeElementRule(personData, prodData, ins, ele, parmas);
-                  for (var k in newEleMap) {
-                    ele[k] = newEleMap[k];
-                  }
-                });
-                insuranceDataHandler(ins, prodData);
+              try {
+                if (Array.isArray(ins.eleOrderList)) {
+                  ins.eleOrderList.forEach(function (ele) {
+                    var newEleMap = executeElementRule(personData, prodData, ins, ele, parmas);
+                    for (var k in newEleMap) {
+                      ele[k] = newEleMap[k];
+                    }
+                  });
+                  insuranceDataHandler(ins, prodData);
+                }
+              } catch (error) {
+                console.error(error);
               }
             });
           }

package/lib/adjust-baoe/index.js

@@ -9197,9 +9197,8 @@
   }();
 
   function validateAdjustBaoe(params) {
-    var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     return request({
-      url: "/planBook/".concat(options.publicPbUuid ? 'public' : 'V2', "/validateAccount/-1/low"),
+      url: '/planBook/V2/validateAccount/-1/low',
       method: 'post',
       data: QS.stringify({
         jd: JSON.stringify(params)
@@ -9611,7 +9610,6 @@
         });
         return validateAdjustBaoe({
           insuranceTypeId: params.planbookId * 1,
-          publicPbUuid: params.publicPbUuid,
           personData: {
             personOrderList: convertPersonData(personData, personData.personOrderList.map(function (p) {
               return p.key;
@@ -9623,8 +9621,6 @@
               adjustBaoeData: this.adjustBaoeData
             })]
           }]
-        }, {
-          publicPbUuid: params.publicPbUuid
         }).catch(function (err) {
           _this5.adjustBaoeData = cloneAdjustBaoeData;
           if (err) {

package/lib/index.js

@@ -9115,10 +9115,6 @@
       // 当前险种
       common: {},
       // 通用信息
-      customVariable: null,
-      // 自定义变量
-      cv: null,
-      // 简写，自定义变量
       t: {} // 事件目标
     };
     if (personData) {
@@ -9181,11 +9177,6 @@
         map.executeSource = options.executeSource;
       }
     }
-    if (ins && ins.customVariableExp) {
-      var exp = ins.customVariableExp.replace(/(%)(\d+)(\.*\w*)(%)/g, 'map.i$2$3').replace(/(%)(\w*\.*\w*)(%)/g, 'map.$2');
-      map.customVariable = eval(exp);
-      map.cv = map.customVariable;
-    }
     return map;
   }
   function executeElementRule(personData, product, ins, ele) {
@@ -10503,14 +10494,18 @@
                   _ret = _loop2();
                   if (_ret === 0) break;
                 } while (curCondition && curCondition.key && curCondition[curCondition.key]);
-                if (Array.isArray(ins.eleOrderList)) {
-                  ins.eleOrderList.forEach(function (ele) {
-                    var newEleMap = executeElementRule(personData, prodData, ins, ele, parmas);
-                    for (var k in newEleMap) {
-                      ele[k] = newEleMap[k];
-                    }
-                  });
-                  insuranceDataHandler(ins, prodData);
+                try {
+                  if (Array.isArray(ins.eleOrderList)) {
+                    ins.eleOrderList.forEach(function (ele) {
+                      var newEleMap = executeElementRule(personData, prodData, ins, ele, parmas);
+                      for (var k in newEleMap) {
+                        ele[k] = newEleMap[k];
+                      }
+                    });
+                    insuranceDataHandler(ins, prodData);
+                  }
+                } catch (error) {
+                  console.error(error);
                 }
               });
             }
@@ -13957,9 +13952,8 @@
   }
 
   function validateAdjustBaoe(params) {
-    var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     return request({
-      url: "/planBook/".concat(options.publicPbUuid ? 'public' : 'V2', "/validateAccount/-1/low"),
+      url: '/planBook/V2/validateAccount/-1/low',
       method: 'post',
       data: QS.stringify({
         jd: JSON.stringify(params)
@@ -14188,7 +14182,6 @@
         });
         return validateAdjustBaoe({
           insuranceTypeId: params.planbookId * 1,
-          publicPbUuid: params.publicPbUuid,
           personData: {
             personOrderList: convertPersonData(personData, personData.personOrderList.map(function (p) {
               return p.key;
@@ -14200,8 +14193,6 @@
               adjustBaoeData: this.adjustBaoeData
             })]
           }]
-        }, {
-          publicPbUuid: params.publicPbUuid
         }).catch(function (err) {
           _this5.adjustBaoeData = cloneAdjustBaoeData;
           if (err) {
@@ -46840,7 +46831,7 @@
               productForm.mulInsOrderList = productForm.mulInsOrderList.map(function (ins) {
                 var tempIns = {};
                 for (var _k2 in ins) {
-                  if (!['isFollowing', 'pPeriodDesc', 'baoeDesc', 'baofDesc', 'iDurationDesc', 'payModeDesc', 'payModePremiumDesc', 'accountData', 'reduceBaofData', 'duplicateReduceBaofData', 'isCheckbox', 'groupKey', 'groupName', 'shmInsData', 'totalBaof', 'customVariableExp',
+                  if (!['isFollowing', 'pPeriodDesc', 'baoeDesc', 'baofDesc', 'iDurationDesc', 'payModeDesc', 'payModePremiumDesc', 'accountData', 'reduceBaofData', 'duplicateReduceBaofData', 'isCheckbox', 'groupKey', 'groupName', 'shmInsData', 'totalBaof',
                   // 'calcResultExp', // 不能删除，后面有依赖
                   'revalidateFlag'].includes(_k2)) {
                     tempIns[_k2] = ins[_k2];
@@ -46866,7 +46857,6 @@
               productData: productData
             });
             reqData = {
-              publicPbUuid: options.publicPbUuid || null,
               insuranceTypeId: options.planbookId ? options.planbookId * 1 : null,
               personData: {
                 personOrderList: convertPersonData(inputData.personData, inputData.personData.personOrderList.map(function (p) {
@@ -47120,14 +47110,13 @@
       value: function () {
         var _changeProduct = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee4(productData, options) {
           var _this5 = this;
-          var $listeners, user, inputData, verifyData, personData, groupKey, productKey, params, type, insData, eleData, planbookId, publicPbUuid, productVerifyData, eventTarget, errorMsg;
+          var $listeners, user, inputData, verifyData, personData, groupKey, productKey, params, type, insData, eleData, planbookId, productVerifyData, eventTarget, errorMsg;
           return _regeneratorRuntime.wrap(function (_context4) {
             while (1) switch (_context4.prev = _context4.next) {
               case 0:
                 $listeners = this.$listeners, user = this.user, 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;
                 planbookId = lodash.get(params, 'planbookId');
-                publicPbUuid = lodash.get(params, 'publicPbUuid');
                 productVerifyData = lodash.get(verifyData, "[".concat(productKey, "]"));
                 eventTarget = {
                   insuranceKey: lodash.get(insData, 'key') || null,
@@ -47178,7 +47167,6 @@
                           _this5.$emit('reCalculate', inputData, {
                             user: user,
                             planbookId: planbookId,
-                            publicPbUuid: publicPbUuid,
                             groupKey: groupKey,
                             productKey: productKey,
                             executeSource: 'userAction',
@@ -48446,7 +48434,7 @@
     install(window.Vue);
   }
   var index = {
-    version: '3.3.0',
+    version: '3.3.3',
     install: install
   };
 

package/lib/product-info/index.js

@@ -1,8 +1,8 @@
 (function (global, factory) {
-  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('vue'), require('lodash'), require('qs'), require('vant/lib/dialog/index.css'), require('vant/lib/dialog'), require('vant/lib/toast/index.css'), require('vant/lib/toast'), require('md5'), require('crypto-js')) :
-  typeof define === 'function' && define.amd ? define(['exports', 'vue', 'lodash', 'qs', 'vant/lib/dialog/index.css', 'vant/lib/dialog', 'vant/lib/toast/index.css', 'vant/lib/toast', 'md5', 'crypto-js'], factory) :
-  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.BXT = {}, global.Vue, global._, global.QS, null, global._Dialog, null, global._Toast, global.md5, global.CryptoJS));
-})(this, (function (exports, Vue, lodash, QS, index_css, _Dialog, index_css$1, _Toast, MD5, CryptoJS) { 'use strict';
+  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('vue'), require('lodash'), require('vant/lib/dialog/index.css'), require('vant/lib/dialog'), require('vant/lib/toast/index.css'), require('vant/lib/toast'), require('qs'), require('md5'), require('crypto-js')) :
+  typeof define === 'function' && define.amd ? define(['exports', 'vue', 'lodash', 'vant/lib/dialog/index.css', 'vant/lib/dialog', 'vant/lib/toast/index.css', 'vant/lib/toast', 'qs', 'md5', 'crypto-js'], factory) :
+  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.BXT = {}, global.Vue, global._, null, global._Dialog, null, global._Toast, global.QS, global.md5, global.CryptoJS));
+})(this, (function (exports, Vue, lodash, index_css, _Dialog, index_css$1, _Toast, QS, MD5, CryptoJS) { 'use strict';
 
   function _typeof$2(o) {
     "@babel/helpers - typeof";
@@ -9430,10 +9430,6 @@
       // 当前险种
       common: {},
       // 通用信息
-      customVariable: null,
-      // 自定义变量
-      cv: null,
-      // 简写，自定义变量
       t: {} // 事件目标
     };
     if (personData) {
@@ -9496,11 +9492,6 @@
         map.executeSource = options.executeSource;
       }
     }
-    if (ins && ins.customVariableExp) {
-      var exp = ins.customVariableExp.replace(/(%)(\d+)(\.*\w*)(%)/g, 'map.i$2$3').replace(/(%)(\w*\.*\w*)(%)/g, 'map.$2');
-      map.customVariable = eval(exp);
-      map.cv = map.customVariable;
-    }
     return map;
   }
   function executeElementRule(personData, product, ins, ele) {
@@ -10242,14 +10233,18 @@
                   _ret = _loop2();
                   if (_ret === 0) break;
                 } while (curCondition && curCondition.key && curCondition[curCondition.key]);
-                if (Array.isArray(ins.eleOrderList)) {
-                  ins.eleOrderList.forEach(function (ele) {
-                    var newEleMap = executeElementRule(personData, prodData, ins, ele, parmas);
-                    for (var k in newEleMap) {
-                      ele[k] = newEleMap[k];
-                    }
-                  });
-                  insuranceDataHandler(ins, prodData);
+                try {
+                  if (Array.isArray(ins.eleOrderList)) {
+                    ins.eleOrderList.forEach(function (ele) {
+                      var newEleMap = executeElementRule(personData, prodData, ins, ele, parmas);
+                      for (var k in newEleMap) {
+                        ele[k] = newEleMap[k];
+                      }
+                    });
+                    insuranceDataHandler(ins, prodData);
+                  }
+                } catch (error) {
+                  console.error(error);
                 }
               });
             }
@@ -10995,7 +10990,7 @@
               productForm.mulInsOrderList = productForm.mulInsOrderList.map(function (ins) {
                 var tempIns = {};
                 for (var _k2 in ins) {
-                  if (!['isFollowing', 'pPeriodDesc', 'baoeDesc', 'baofDesc', 'iDurationDesc', 'payModeDesc', 'payModePremiumDesc', 'accountData', 'reduceBaofData', 'duplicateReduceBaofData', 'isCheckbox', 'groupKey', 'groupName', 'shmInsData', 'totalBaof', 'customVariableExp',
+                  if (!['isFollowing', 'pPeriodDesc', 'baoeDesc', 'baofDesc', 'iDurationDesc', 'payModeDesc', 'payModePremiumDesc', 'accountData', 'reduceBaofData', 'duplicateReduceBaofData', 'isCheckbox', 'groupKey', 'groupName', 'shmInsData', 'totalBaof',
                   // 'calcResultExp', // 不能删除，后面有依赖
                   'revalidateFlag'].includes(_k2)) {
                     tempIns[_k2] = ins[_k2];
@@ -11021,7 +11016,6 @@
               productData: productData
             });
             reqData = {
-              publicPbUuid: options.publicPbUuid || null,
               insuranceTypeId: options.planbookId ? options.planbookId * 1 : null,
               personData: {
                 personOrderList: convertPersonData(inputData.personData, inputData.personData.personOrderList.map(function (p) {
@@ -12064,14 +12058,13 @@
       value: function () {
         var _changeProduct = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee4(productData, options) {
           var _this5 = this;
-          var $listeners, user, inputData, verifyData, personData, groupKey, productKey, params, type, insData, eleData, planbookId, publicPbUuid, productVerifyData, eventTarget, errorMsg;
+          var $listeners, user, inputData, verifyData, personData, groupKey, productKey, params, type, insData, eleData, planbookId, productVerifyData, eventTarget, errorMsg;
           return _regeneratorRuntime.wrap(function (_context4) {
             while (1) switch (_context4.prev = _context4.next) {
               case 0:
                 $listeners = this.$listeners, user = this.user, 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;
                 planbookId = lodash.get(params, 'planbookId');
-                publicPbUuid = lodash.get(params, 'publicPbUuid');
                 productVerifyData = lodash.get(verifyData, "[".concat(productKey, "]"));
                 eventTarget = {
                   insuranceKey: lodash.get(insData, 'key') || null,
@@ -12122,7 +12115,6 @@
                           _this5.$emit('reCalculate', inputData, {
                             user: user,
                             planbookId: planbookId,
-                            publicPbUuid: publicPbUuid,
                             groupKey: groupKey,
                             productKey: productKey,
                             executeSource: 'userAction',

package/lib/utils/index.js

@@ -280,10 +280,6 @@
       // 当前险种
       common: {},
       // 通用信息
-      customVariable: null,
-      // 自定义变量
-      cv: null,
-      // 简写，自定义变量
       t: {} // 事件目标
     };
     if (personData) {
@@ -346,11 +342,6 @@
         map.executeSource = options.executeSource;
       }
     }
-    if (ins && ins.customVariableExp) {
-      var exp = ins.customVariableExp.replace(/(%)(\d+)(\.*\w*)(%)/g, 'map.i$2$3').replace(/(%)(\w*\.*\w*)(%)/g, 'map.$2');
-      map.customVariable = eval(exp);
-      map.cv = map.customVariable;
-    }
     return map;
   }
   function executeElementRule(personData, product, ins, ele) {
@@ -10419,14 +10410,18 @@
                   _ret = _loop2();
                   if (_ret === 0) break;
                 } while (curCondition && curCondition.key && curCondition[curCondition.key]);
-                if (Array.isArray(ins.eleOrderList)) {
-                  ins.eleOrderList.forEach(function (ele) {
-                    var newEleMap = executeElementRule(personData, prodData, ins, ele, parmas);
-                    for (var k in newEleMap) {
-                      ele[k] = newEleMap[k];
-                    }
-                  });
-                  insuranceDataHandler(ins, prodData);
+                try {
+                  if (Array.isArray(ins.eleOrderList)) {
+                    ins.eleOrderList.forEach(function (ele) {
+                      var newEleMap = executeElementRule(personData, prodData, ins, ele, parmas);
+                      for (var k in newEleMap) {
+                        ele[k] = newEleMap[k];
+                      }
+                    });
+                    insuranceDataHandler(ins, prodData);
+                  }
+                } catch (error) {
+                  console.error(error);
                 }
               });
             }

package/package.json

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

package/packages/add-and-take/demo/index.vue

@@ -153,12 +153,10 @@ export default {
     getPlanbookData() {
       const self = this
       const { URL_PARAM } = self
-      const { planbookId, publicPbUuid, uuid } = URL_PARAM
+      const { planbookId, uuid } = URL_PARAM
       return getPlanbookData({
         insuranceTypeId: planbookId || 13767,
-        resultUuid: uuid,
-        publicPbUuid
-        // publicPbUuid: '5d6499946bbb47bb8f6a286e9d4eee77'
+        resultUuid: uuid
       })
         .then(async data => {
           await initPageData(data)
@@ -173,7 +171,7 @@ export default {
     },
     autoImportData() {
       const { URL_PARAM, exportData, inputData } = this
-      const { planbookId, publicPbUuid } = URL_PARAM
+      const { planbookId } = URL_PARAM
       if (inputData) {
         const gPromises = inputData.productGroupList
           .filter(g => g.prodOrderList)
@@ -182,7 +180,6 @@ export default {
               return doubleCalcProductData(inputData, {
                 planbookId: Number(planbookId) || 13767,
                 executeSource: exportData ? 'import' : 'init',
-                publicPbUuid,
                 groupKey: g.key,
                 productKey: p.key,
                 isIgnoreError: true

package/packages/adjust-baoe/index.vue

@@ -246,32 +246,26 @@ export default class AdjustBaoe extends Vue {
         delete ins[ele]
       })
     })
-    return validateAdjustBaoe(
-      {
-        insuranceTypeId: params.planbookId * 1,
-        publicPbUuid: params.publicPbUuid,
-        personData: {
-          personOrderList: convertPersonData(
-            personData,
-            personData.personOrderList.map(p => p.key)
-          )
-        },
-        productGroupList: [
-          {
-            key: params.groupKey,
-            prodOrderList: [
-              {
-                ...cloneProductData,
-                adjustBaoeData: this.adjustBaoeData
-              }
-            ]
-          }
-        ]
+    return validateAdjustBaoe({
+      insuranceTypeId: params.planbookId * 1,
+      personData: {
+        personOrderList: convertPersonData(
+          personData,
+          personData.personOrderList.map(p => p.key)
+        )
       },
-      {
-        publicPbUuid: params.publicPbUuid
-      }
-    ).catch(err => {
+      productGroupList: [
+        {
+          key: params.groupKey,
+          prodOrderList: [
+            {
+              ...cloneProductData,
+              adjustBaoeData: this.adjustBaoeData
+            }
+          ]
+        }
+      ]
+    }).catch(err => {
       this.adjustBaoeData = cloneAdjustBaoeData
       if (err) {
         this.$toast(err)

package/packages/adjust-baoe/readme.md

@@ -114,7 +114,6 @@ export default {
 | `planbookId`   | 计划书 ID                                             | Number          |
 | `groupKey`     | 产品组的 key                                          | String / Number |
 | `productKey`   | 产品的 key                                            | Number          |
-| `publicPbUuid` | 公开计划书的 uuid；传入时调用 public 接口进行保额校验 | String          |
 
 ---
 

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

@@ -255,8 +255,6 @@ export function getExpressionParamMap(personData: IPbPersons, product: IPbProduc
     m: {}, // 主险
     me: {}, // 当前险种
     common: {}, // 通用信息
-    customVariable: null, // 自定义变量
-    cv: null, // 简写，自定义变量
     t: {} // 事件目标
   }
 
@@ -309,12 +307,6 @@ export function getExpressionParamMap(personData: IPbPersons, product: IPbProduc
       map.executeSource = options.executeSource
     }
   }
-
-  if (ins && ins.customVariableExp) {
-    const exp = ins.customVariableExp.replace(/(%)(\d+)(\.*\w*)(%)/g, 'map.i$2$3').replace(/(%)(\w*\.*\w*)(%)/g, 'map.$2')
-    map.customVariable = eval(exp)
-    map.cv = map.customVariable
-  }
   return map
 }
 

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

@@ -259,14 +259,18 @@ export async function productDataHandler(prodData: IPbProduct, prodVerifyData: a
           }
         } while (curCondition && curCondition.key && curCondition[curCondition.key])
   
-        if (Array.isArray(ins.eleOrderList)) {
-          ins.eleOrderList.forEach((ele: IInsElement) => {
-            const newEleMap = executeElementRule(personData, prodData, ins, ele, parmas)
-            for (const k in newEleMap) {
-              ele[k] = newEleMap[k]
-            }
-          })
-          insuranceDataHandler(ins, prodData)
+        try {
+          if (Array.isArray(ins.eleOrderList)) {
+            ins.eleOrderList.forEach((ele: IInsElement) => {
+              const newEleMap = executeElementRule(personData, prodData, ins, ele, parmas)
+              for (const k in newEleMap) {
+                ele[k] = newEleMap[k]
+              }
+            })
+            insuranceDataHandler(ins, prodData)
+          }
+        } catch (error) {
+          console.error(error)
         }
       })
     }

package/packages/index.ts

@@ -50,6 +50,6 @@ export {
 }
 
 export default {
-  version: '3.3.0',
+  version: '3.3.3',
   install
 }

package/packages/person-info/demo/index.vue

@@ -22,9 +22,6 @@ export default class PersonInfoDemo extends Vue {
   verifyData = null
   personData = null
   created() {
-    if (!this.URL_PARAM.publicPbUuid) {
-      this.URL_PARAM.publicPbUuid = '5d6499946bbb47bb8f6a286e9d4eee77'
-    }
     document.body.style.backgroundColor = '#f2f2f2'
     this.getPlanbookData()
   }
@@ -33,7 +30,8 @@ export default class PersonInfoDemo extends Vue {
   }
   getPlanbookData() {
     getPlanbookData({
-      publicPbUuid: this.URL_PARAM.publicPbUuid
+      insuranceTypeId: this.URL_PARAM.planbookId || 13767,
+      resultUuid: this.URL_PARAM.uuid
     })
       .then(async (data: any) => {
         await initPageData(data)

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

@@ -183,7 +183,6 @@
         :input-data="inputData"
         :params="{
           planbookId: params.planbookId,
-          publicPbUuid: params.publicPbUuid,
           groupKey: params.groupKey,
           productKey: params.productKey
         }"

package/packages/planbook-input/helper.js

@@ -239,7 +239,6 @@ export async function createdProductDataToCalc(inputData, options = {}) {
               'groupName',
               'shmInsData',
               'totalBaof',
-              'customVariableExp',
               // 'calcResultExp', // 不能删除，后面有依赖
               'revalidateFlag'
             ].includes(k)
@@ -261,7 +260,6 @@ export async function createdProductDataToCalc(inputData, options = {}) {
         productData
       })
       const reqData = {
-        publicPbUuid: options.publicPbUuid || null,
         insuranceTypeId: options.planbookId ? options.planbookId * 1 : null,
         personData: {
           personOrderList: convertPersonData(
@@ -500,12 +498,11 @@ export function genProductUniqueKeyWithNS(namespace, groupKey, productKey) {
 }
 
 export async function calcProductData(inputData, options, cb) {
-  const { planbookId, publicPbUuid, groupKey, productKey, isIgnoreError, isIgnoreLoading, productCalcNamespace } = options || {}
+  const { planbookId, groupKey, productKey, isIgnoreError, productCalcNamespace } = options || {}
   const productUniqueKey = genProductUniqueKeyWithNS(productCalcNamespace, groupKey, productKey)
   try {
     const params = await createdProductDataToCalc(inputData, {
       planbookId,
-      publicPbUuid,
       groupKey,
       productKey
     })
@@ -525,26 +522,16 @@ export async function calcProductData(inputData, options, cb) {
         })
       }
     }
-    let resData = null
-    if (publicPbUuid) {
-      resData = await calcPlanbookProduct({
-        jd: params.jd
+    const resData = await calcPlanbookProduct(
+      qs.stringify({
+        jd: params.jd,
+        signature: params.signature,
+        clientVersion: params.clientVersion,
+        isIos: params.isIos
       })
-    } else {
-      resData = await calcPlanbookProduct(
-        qs.stringify({
-          jd: params.jd,
-          signature: params.signature,
-          clientVersion: params.clientVersion,
-          isIos: params.isIos
-        }),
-        {
-          isIgnoreLoading
-        }
-      ).catch(err => {
-        return Promise.reject(err)
-      })
-    }
+    ).catch(err => {
+      return Promise.reject(err)
+    })
 
     if (!resData.success || !resData.data) {
       if (resData.code === '002017') {
@@ -585,36 +572,38 @@ export async function calcProductData(inputData, options, cb) {
       }
 
       // 计算结果校验
-      const mulInsOrderList = _get(currentProduct, 'mulInsOrderList') || []
-      const hasCalcResultExp = mulInsOrderList.some(ins => ins.calcResultExp)
-      if (hasCalcResultExp) {
-        let errorMessage = ''
-        mulInsOrderList
-          .filter(ins => ins.calcResultExp)
-          .forEach(ins => {
-            if (!errorMessage) {
-              const paramMap = getExpressionParamMap(inputData.personData, currentProduct, ins, options)
-              if (paramMap) {
-                try {
-                  const exp = ins.calcResultExp.replace(/(%)(\d+)(\.*\w*)(%)/g, 'paramMap.i$2$3').replace(/(%)(\w*\.*\w*)(%)/g, 'paramMap.$2')
-                  errorMessage = eval(exp)
-                  console.log('计算结果约束结果: ', errorMessage)
-                } catch (error) {
-                  errorMessage = '校验公式语法错误！'
-                }
-                if (ins.calcResultExp) {
-                  console.log('计算结果约束公式: ', ins.calcResultExp)
+      try {
+        const mulInsOrderList = _get(currentProduct, 'mulInsOrderList') || []
+        const hasCalcResultExp = mulInsOrderList.some(ins => ins.calcResultExp)
+        if (hasCalcResultExp) {
+          let errorMessage = ''
+          mulInsOrderList
+            .filter(ins => ins.calcResultExp)
+            .forEach(ins => {
+              if (!errorMessage) {
+                const paramMap = getExpressionParamMap(inputData.personData, currentProduct, ins, options)
+                if (paramMap) {
+                  try {
+                    const exp = ins.calcResultExp.replace(/(%)(\d+)(\.*\w*)(%)/g, 'paramMap.i$2$3').replace(/(%)(\w*\.*\w*)(%)/g, 'paramMap.$2')
+                    errorMessage = eval(exp)
+                    console.log('计算结果约束结果: ', errorMessage)
+                  } catch (error) {
+                    console.log('计算结果约束公式: ', ins.calcResultExp)
+                    console.error(error)
+                  }
                 }
               }
-            }
-          })
-        if (errorMessage) {
-          commitProductCalcError(productUniqueKey, errorMessage)
-          return Promise.reject({
-            type: 'calcResultError',
-            message: errorMessage
-          })
+            })
+          if (errorMessage) {
+            commitProductCalcError(productUniqueKey, errorMessage)
+            return Promise.reject({
+              type: 'calcResultError',
+              message: errorMessage
+            })
+          }
         }
+      } catch (error) {
+        console.error(error)
       }
     }
 
@@ -634,7 +623,7 @@ export async function calcProductData(inputData, options, cb) {
 }
 
 export async function doubleCalcProductData(inputData, verifyData, options = {}) {
-  const { user, planbookId, publicPbUuid, groupKey, productKey, isIgnoreError, productCalcNamespace, executeSource } = options
+  const { user, planbookId, groupKey, productKey, isIgnoreError, productCalcNamespace, executeSource } = options
   const personData = inputData && inputData.personData
   const productGroupList = inputData && inputData.productGroupList ? inputData.productGroupList : []
   const productGroup = productGroupList.find(g => g.key === groupKey)
@@ -655,7 +644,6 @@ export async function doubleCalcProductData(inputData, verifyData, options = {})
     await calcProductData(inputData, {
       user,
       planbookId,
-      publicPbUuid,
       groupKey,
       productKey,
       executeSource,
@@ -671,7 +659,6 @@ export async function doubleCalcProductData(inputData, verifyData, options = {})
       await calcProductData(inputData, {
         user,
         planbookId,
-        publicPbUuid,
         groupKey,
         productKey,
         executeSource,
@@ -683,7 +670,7 @@ export async function doubleCalcProductData(inputData, verifyData, options = {})
 }
 
 export function calcAllProductData(inputData, verifyData, options) {
-  const { planbookId, publicPbUuid, userUuid, appid, productCalcNamespace, executeSource } = options
+  const { planbookId, userUuid, appid, productCalcNamespace, executeSource } = options
   const productGroupList = (_get(inputData, 'productGroupList') || []).filter(g => g.prodOrderList)
   const prodOrderList = productGroupList
     .map(g => g.prodOrderList)
@@ -707,7 +694,6 @@ export function calcAllProductData(inputData, verifyData, options) {
             return doubleCalcProductData(inputData, verifyData, {
               planbookId,
               executeSource,
-              publicPbUuid,
               groupKey: g.key,
               productKey: p.key,
               isIgnoreError: true,
@@ -912,7 +898,7 @@ export function cleanNeedlessResultData(resultData) {
           })
           if (Array.isArray(p.mulInsOrderList)) {
             p.mulInsOrderList.forEach(ins => {
-              const noNeedInsuranceKeys = ['isFollowing', 'isCheckbox', 'condotionList', 'customVariableExp', 'calcResultExp', 'revalidateFlag']
+              const noNeedInsuranceKeys = ['isFollowing', 'isCheckbox', 'condotionList', 'calcResultExp', 'revalidateFlag']
               noNeedInsuranceKeys.forEach(k => {
                 if (k in ins) {
                   delete ins[k]
@@ -986,14 +972,15 @@ export function setupUnderwriteRuleToInsuranceList(list) {
     return getUnderwriteEffectiveRules(insuranceIds).then(data => {
       if (Array.isArray(data)) {
         data.forEach(rule => {
-          const { insruanceId, eleRules } = rule
+          const { insruanceId, customVariableExp, eleRules } = rule
           const insurance = list.find(ins => ins.key === insruanceId)
           if (insurance) {
-            const insExpKeys = ['customVariableExp', 'calcResultExp', 'revalidateFlag']
+            const customVariableExpStr = customVariableExp ? `;${customVariableExp};` : ''
+            const insExpKeys = ['calcResultExp', 'revalidateFlag']
             insExpKeys
               .filter(k => k in rule)
               .forEach(key => {
-                insurance[key] = rule[key]
+                insurance[key] = rule[key] && key === 'calcResultExp' ? customVariableExpStr + rule[key] : rule[key]
               })
             const eleOrderList = insurance.eleOrderList || []
             if (eleOrderList && Array.isArray(eleRules)) {
@@ -1004,7 +991,7 @@ export function setupUnderwriteRuleToInsuranceList(list) {
                   eleExpkeys
                     .filter(k => k in eleRule)
                     .forEach(key => {
-                      ele[key] = eleRule[key]
+                      ele[key] = eleRule[key] ? customVariableExpStr + eleRule[key] : eleRule[key]
                     })
                 }
               })

package/packages/planbook-input/index.vue

@@ -2,20 +2,19 @@
   <div class="bxt-planbook" v-if="inputData">
     <div class="bxt-planbook-person">
       <div class="bxt-person-container" v-if="inputData.personData">
-        <template v-for="person in inputData.personData.personOrderList">
-          <PersonInfo
-            :key="person.key"
-            :input-data="inputData"
-            :verify-data="planbookData && planbookData.verifyData"
-            :person-data="person"
-            :is-show-crm-person="true"
-            :params="{
-              brokerFlag: planbookData && planbookData.brokerFlag,
-              planbookId: planbookData && planbookData.pbId
-            }"
-            @change="changePersonInfo"
-          />
-        </template>
+        <PersonInfo
+          v-for="person in inputData.personData.personOrderList"
+          :key="person.key"
+          :input-data="inputData"
+          :verify-data="planbookData && planbookData.verifyData"
+          :person-data="person"
+          :is-show-crm-person="true"
+          :params="{
+            brokerFlag: planbookData && planbookData.brokerFlag,
+            planbookId: planbookData && planbookData.pbId
+          }"
+          @change="changePersonInfo"
+        />
       </div>
     </div>
     <div class="bxt-planbook-product">
@@ -30,7 +29,6 @@
             :verify-data="planbookData && planbookData.verifyData"
             :params="{
               planbookId: Number(URL_PARAM.planbookId),
-              publicPbUuid: URL_PARAM.publicPbUuid,
               groupKey: g.key,
               productKey: p.key,
               interestProductList: planbookData && planbookData.interestProductList
@@ -95,12 +93,10 @@ export default class BxtPlanbookInput extends Vue {
   getPlanbookData() {
     const self = this
     const { URL_PARAM, userInfo } = self
-    const { planbookId, publicPbUuid, uuid } = URL_PARAM
+    const { planbookId, uuid } = URL_PARAM
     return getPlanbookData({
       insuranceTypeId: planbookId || 13767,
-      resultUuid: uuid,
-      publicPbUuid
-      // publicPbUuid: '5d6499946bbb47bb8f6a286e9d4eee77'
+      resultUuid: uuid
     })
       .then(async (data: any) => {
         await initPageData(data, {
@@ -117,7 +113,7 @@ export default class BxtPlanbookInput extends Vue {
   }
   autoImportData() {
     const { URL_PARAM, userInfo, exportData, verifyData, inputData } = this
-    const { planbookId, publicPbUuid } = URL_PARAM
+    const { planbookId } = URL_PARAM
     if (inputData) {
       inputData.productGroupList
         .filter((g: IPbProductGroup) => g.prodOrderList)
@@ -126,7 +122,6 @@ export default class BxtPlanbookInput extends Vue {
             doubleCalcProductData(inputData, verifyData, {
               user: userInfo,
               planbookId: Number(planbookId),
-              publicPbUuid,
               groupKey: g.key,
               productKey: p.key,
               executeSource: exportData ? 'import' : 'init',
@@ -143,7 +138,7 @@ export default class BxtPlanbookInput extends Vue {
   }
   changePersonInfo(person: IPbPerson, ele: any = {}) {
     const { URL_PARAM, userInfo, exportData, verifyData, inputData } = this
-    const { planbookId, publicPbUuid } = URL_PARAM
+    const { planbookId } = URL_PARAM
     if (inputData) {
       inputData.productGroupList
         .filter((g: IPbProductGroup) => g.prodOrderList)
@@ -155,7 +150,6 @@ export default class BxtPlanbookInput extends Vue {
                 user: userInfo,
                 planbookId: Number(planbookId),
                 executeSource: exportData ? 'import' : 'init',
-                publicPbUuid,
                 groupKey: g.key,
                 productKey: p.key,
                 isIgnoreError: true,
@@ -178,7 +172,7 @@ export default class BxtPlanbookInput extends Vue {
   confirmProduct(options: any, inst: any) {
     const self = this
     const { URL_PARAM, userInfo, inputData } = self
-    const { planbookId, publicPbUuid } = URL_PARAM
+    const { planbookId } = URL_PARAM
     const { groupKey, productKey } = options
     inst.$refs.productInfo
       .validate()
@@ -186,7 +180,6 @@ export default class BxtPlanbookInput extends Vue {
         return calcProductData(inputData, {
           user: userInfo,
           planbookId: Number(planbookId),
-          publicPbUuid,
           groupKey,
           productKey,
           executeSource: 'confirm'
@@ -209,11 +202,10 @@ export default class BxtPlanbookInput extends Vue {
       return Promise.reject()
     }
 
-    const { pbType, planbookId, publicPbUuid, userUuid } = URL_PARAM
+    const { pbType, planbookId, userUuid } = URL_PARAM
     const options: any = {
       pbType,
       insuranceTypeId: Number(planbookId) || null,
-      publicPbUuid,
       totalBaof: calcTotalBaof(inputData?.productGroupList),
       userUuid
     }
@@ -223,7 +215,7 @@ export default class BxtPlanbookInput extends Vue {
           theme: inputData?.theme,
           uuid: data
         })
-        location.href = `${PBF_HOSTNAME}/planBook/planBookResult/pages/${publicPbUuid ? 'planbkPurely' : 'planbkTemplatev2'}.html?${urlParam}`
+        location.href = `${PBF_HOSTNAME}/planBook/planBookResult/pages/planbkTemplatev2.html?${urlParam}`
       }
     })
   }

package/packages/planbook-input/readme.md

@@ -175,9 +175,9 @@ import {
 | ------------------------------------------------------- | --------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------- | -------------------------------------- |
 | `initPageData(data)`                                    | 初始化计划书数据，依次处理人员数据和所有产品数据                                                          | `data`：接口返回的原始数据                                                                  | Promise\<data\>                        |
 | `setPageDataBaseOnResult(data)`                         | 将已生成结果中的导出数据（`exportData`）回填到初始化数据中，用于「编辑已有计划书」场景                    | `data`：同上                                                                                | data                                   |
-| `calcProductData(inputData, options)`              | 对指定产品发起一次试算请求，并将结果写回 `inputData`                                                      | `inputData`；`options`：`{ planbookId, publicPbUuid, groupKey, productKey, isIgnoreError }` | Promise                                |
+| `calcProductData(inputData, options)`              | 对指定产品发起一次试算请求，并将结果写回 `inputData`                                                      | `inputData`；`options`：`{ planbookId, groupKey, productKey, isIgnoreError }` | Promise                                |
 | `doubleCalcProductData(inputData, verifyData, options)` | 先执行 `productDataHandler` 再执行 `calcProductData`，对存在 `revalidateFlag` 的产品自动执行二次试算 | 同上，额外需要 `verifyData`                                                                 | Promise                                |
-| `makePlanbook(inputData, options)`       | 生成计划书                                                              | `inputData`；`options`：`{ pbType, insuranceTypeId, publicPbUuid, totalBaof, userUuid }` | Object / null                          |
+| `makePlanbook(inputData, options)`       | 生成计划书                                                              | `inputData`；`options`：`{ pbType, insuranceTypeId, totalBaof, userUuid }` | Object / null                          |
 | `setupUnderwriteRuleToInputData(inputData)`             | 将核保规则（underwrite rule）应用到 inputData，返回处理后的 inputData                                     | `inputData`                                                                                 | Promise\<inputData\>                   |
-| `createdProductDataToCalc(inputData, options)`          | 生成试算接口的请求参数（jd + signature）                                                                  | `inputData`；`options`：`{ planbookId, publicPbUuid, groupKey, productKey }`                | Promise\<{ errorMsg, jd, signature }\> |
+| `createdProductDataToCalc(inputData, options)`          | 生成试算接口的请求参数（jd + signature）                                                                  | `inputData`；`options`：`{ planbookId, groupKey, productKey }`                | Promise\<{ errorMsg, jd, signature }\> |
 | `receiveProductData(inputData, rProductData, options)`  | 将试算接口返回的产品数据写回 `inputData`                                                                  | `inputData`；`rProductData`：接口返回的产品数据；`options`                                  | productData                            |

package/packages/product-info/demo/index.vue

@@ -24,9 +24,6 @@ export default class ProductInfoDemo extends Vue {
   groupKey = null
   productKey = null
   created() {
-    if (!this.URL_PARAM.publicPbUuid) {
-      this.URL_PARAM.publicPbUuid = '5d6499946bbb47bb8f6a286e9d4eee77'
-    }
     document.body.style.backgroundColor = '#f2f2f2'
     this.getPlanbookData()
   }
@@ -35,7 +32,8 @@ export default class ProductInfoDemo extends Vue {
   }
   getPlanbookData() {
     getPlanbookData({
-      publicPbUuid: this.URL_PARAM.publicPbUuid
+      insuranceTypeId: this.URL_PARAM.planbookId || 13767,
+      resultUuid: this.URL_PARAM.uuid
     })
       .then(async (data: any) => {
         await initPageData(data)

package/packages/product-info/index.vue

@@ -328,7 +328,6 @@ export default class BxtProductInfo extends Vue {
     const { $listeners, user, inputData, verifyData, personData, groupKey, productKey, params } = this
     const { type, insData, eleData } = options
     const planbookId = _get(params, 'planbookId')
-    const publicPbUuid = _get(params, 'publicPbUuid')
     const productVerifyData = _get(verifyData, `[${productKey}]`)
     const eventTarget = {
       insuranceKey: _get(insData, 'key') || null,
@@ -368,7 +367,6 @@ export default class BxtProductInfo extends Vue {
                 {
                   user,
                   planbookId,
-                  publicPbUuid,
                   groupKey,
                   productKey,
                   executeSource: 'userAction',

package/packages/product-info/readme.md

@@ -88,7 +88,6 @@ export default {
 | 参数                  | 说明                                                                      | 类型    |
 | --------------------- | ------------------------------------------------------------------------- | ------- |
 | `planbookId`          | 计划书 ID，用于产品联动逻辑                                               | Number  |
-| `publicPbUuid`        | 公开计划书 uuid，传入后使用 public 接口重算                               | String  |
 | `allowCustomResult`   | 是否显示「自定义保费/保额」开关                                           | Boolean |
 | `insuranceSaleStatus` | 险种停售状态映射：`{ [insuranceKey]: number }`；值为 `2` 时展示「停」标签 | Object  |
 

package/src/api/adjust-baoe.js

@@ -1,9 +1,9 @@
 import QS from 'qs'
 import request from './request'
 
-export function validateAdjustBaoe(params, options = {}) {
+export function validateAdjustBaoe(params) {
   return request({
-    url: `/planBook/${options.publicPbUuid ? 'public' : 'V2'}/validateAccount/-1/low`,
+    url: '/planBook/V2/validateAccount/-1/low',
     method: 'post',
     data: QS.stringify({
       jd: JSON.stringify(params)

package/src/api/planbook.js

@@ -1,4 +1,3 @@
-import QS from 'qs'
 import request from './request'
 import { APP_HOSTNAME } from '../js/variables.js'
 
@@ -10,28 +9,13 @@ export function getPlanbookInitData(params) {
   })
 }
 
-export function getPublicPlanbookInitData(params) {
-  return request({
-    url: '/planBook/public/init',
-    method: 'post',
-    data: QS.stringify(params),
-    headers: {
-      Accept: 'application/json, text/plain, */*',
-      'Content-Type': 'application/x-www-form-urlencoded'
-    }
-  })
-}
-
 export function getPlanbookData(params) {
-  if (params && params.publicPbUuid) {
-    return getPublicPlanbookInitData(params)
-  }
   return getPlanbookInitData(params)
 }
 
-export function calcPlanbookProduct(params, options = {}) {
+export function calcPlanbookProduct(params) {
   return request({
-    url: `/planBook/${options.publicPbUuid ? 'public' : 'V2'}/calculate`,
+    url: '/planBook/V2/calculate',
     method: 'post',
     data: params,
     headers: {
@@ -43,9 +27,9 @@ export function calcPlanbookProduct(params, options = {}) {
   })
 }
 
-export function uploadPlanBookResult(params, options = {}) {
+export function uploadPlanBookResult(params) {
   return request({
-    url: `/planBook/${options.publicPbUuid ? 'public/createPb' : 'V2/uploadResult'}`,
+    url: '/planBook/V2/uploadResult',
     method: 'post',
     data: params,
     headers: {