bxs-tools-ui 1.4.0 → 1.4.1

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

@@ -1343,8 +1343,8 @@ module.exports = function GetIntrinsic(name, allowMissing) {
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_f6a871c8_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(108);
-/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_f6a871c8_prod_lang_css___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_mini_css_extract_plugin_dist_loader_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_f6a871c8_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_ba01e47c_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(108);
+/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_ba01e47c_prod_lang_css___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_mini_css_extract_plugin_dist_loader_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_ba01e47c_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__);
 /* unused harmony reexport * */
 
 
@@ -3345,11 +3345,11 @@ __webpack_require__.r(__webpack_exports__);
 var defineProperty = __webpack_require__(26);
 var defineProperty_default = /*#__PURE__*/__webpack_require__.n(defineProperty);
 
-// CONCATENATED MODULE: ./node_modules/babel-loader/lib??ref--1!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/vue-loader/lib??vue-loader-options!./packages/add-and-take/index.vue?vue&type=template&id=f6a871c8&
+// CONCATENATED MODULE: ./node_modules/babel-loader/lib??ref--1!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/vue-loader/lib??vue-loader-options!./packages/add-and-take/index.vue?vue&type=template&id=ba01e47c&
 
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { defineProperty_default()(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-var add_and_takevue_type_template_id_f6a871c8_render = function render() {
+var add_and_takevue_type_template_id_ba01e47c_render = function render() {
   var _vm = this,
     _c = _vm._self._c,
     _setup = _vm._self._setupProxy;
@@ -3645,7 +3645,7 @@ var add_and_takevue_type_template_id_f6a871c8_render = function render() {
 };
 var staticRenderFns = [];
 
-// CONCATENATED MODULE: ./packages/add-and-take/index.vue?vue&type=template&id=f6a871c8&
+// CONCATENATED MODULE: ./packages/add-and-take/index.vue?vue&type=template&id=ba01e47c&
 
 // EXTERNAL MODULE: ./node_modules/tslib/tslib.es6.js
 var tslib_es6 = __webpack_require__(0);
@@ -3897,13 +3897,14 @@ function rebuildAccountDataBySetting(values, accountData) {
   }
   return accountData;
 }
-function rebuildAccountDataByResult(detailsData, accountData) {
+function rebuildAccountDataByResult(detailsData, accountData, popupType) {
   if (!detailsData || !accountData || !accountData.addAndTakeData) {
     return accountData;
   }
   accountData.addAndTakeData.forEach(function (item) {
+    var correspondingDetailsDataKey = popupType === 'reduceBaof' && item.key === 'take' ? 'draw_value' : item.key;
     var detailData = detailsData.find(function (e) {
-      return e.key === item.key;
+      return e.key === correspondingDetailsDataKey;
     });
     var values = detailData && detailData.values;
     var details = detailData && detailData.details;
@@ -4701,7 +4702,7 @@ var add_and_takevue_type_script_lang_ts_AddAndTake = (function (_super) {
                                     d.values = d.values && d.values.map(function (v) { return (v ? Math.round(v) : v); });
                                 });
                                 _this.addAndTakeDetailData = data;
-                                _this.accountData = rebuildAccountDataByResult(data, Object(lodash["cloneDeep"])(accountData));
+                                _this.accountData = rebuildAccountDataByResult(data, Object(lodash["cloneDeep"])(accountData), type);
                                 return Promise.resolve(data);
                             })
                                 .catch(function (error) {
@@ -4810,7 +4811,7 @@ var add_and_takevue_type_script_lang_ts_AddAndTake = (function (_super) {
                 _detail.values = _detail.recommendValues;
             }
         });
-        this.accountData = rebuildAccountDataByResult(_addAndTakeDetailData, Object(lodash["cloneDeep"])(this.accountData));
+        this.accountData = rebuildAccountDataByResult(_addAndTakeDetailData, Object(lodash["cloneDeep"])(this.accountData), this.type);
         this.getAddAndTakeData();
     };
     AddAndTake.prototype.deleteAllData = function () {
@@ -4973,8 +4974,8 @@ var add_and_takevue_type_script_lang_ts_AddAndTake = (function (_super) {
 
 // CONCATENATED MODULE: ./packages/add-and-take/index.vue?vue&type=script&lang=ts&
  /* harmony default export */ var packages_add_and_takevue_type_script_lang_ts_ = (add_and_takevue_type_script_lang_ts_); 
-// EXTERNAL MODULE: ./packages/add-and-take/index.vue?vue&type=style&index=0&id=f6a871c8&prod&lang=css&
-var add_and_takevue_type_style_index_0_id_f6a871c8_prod_lang_css_ = __webpack_require__(137);
+// EXTERNAL MODULE: ./packages/add-and-take/index.vue?vue&type=style&index=0&id=ba01e47c&prod&lang=css&
+var add_and_takevue_type_style_index_0_id_ba01e47c_prod_lang_css_ = __webpack_require__(137);
 
 // CONCATENATED MODULE: ./packages/add-and-take/index.vue
 
@@ -4987,7 +4988,7 @@ var add_and_takevue_type_style_index_0_id_f6a871c8_prod_lang_css_ = __webpack_re
 
 var add_and_take_component = Object(componentNormalizer["a" /* default */])(
   packages_add_and_takevue_type_script_lang_ts_,
-  add_and_takevue_type_template_id_f6a871c8_render,
+  add_and_takevue_type_template_id_ba01e47c_render,
   staticRenderFns,
   false,
   null,

package/lib/index.js

@@ -27225,8 +27225,8 @@ module.exports = function (str, opts) {
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_f6a871c8_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(56);
-/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_f6a871c8_prod_lang_css___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_mini_css_extract_plugin_dist_loader_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_f6a871c8_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_ba01e47c_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(56);
+/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_ba01e47c_prod_lang_css___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_mini_css_extract_plugin_dist_loader_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_ba01e47c_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__);
 /* unused harmony reexport * */
 
 
@@ -34084,11 +34084,11 @@ __webpack_require__.d(__webpack_exports__, "ProductInfo", function() { return /*
 var defineProperty = __webpack_require__(8);
 var defineProperty_default = /*#__PURE__*/__webpack_require__.n(defineProperty);
 
-// CONCATENATED MODULE: ./node_modules/babel-loader/lib??ref--1!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/vue-loader/lib??vue-loader-options!./packages/add-and-take/index.vue?vue&type=template&id=f6a871c8&
+// CONCATENATED MODULE: ./node_modules/babel-loader/lib??ref--1!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/vue-loader/lib??vue-loader-options!./packages/add-and-take/index.vue?vue&type=template&id=ba01e47c&
 
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { defineProperty_default()(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-var add_and_takevue_type_template_id_f6a871c8_render = function render() {
+var add_and_takevue_type_template_id_ba01e47c_render = function render() {
   var _vm = this,
     _c = _vm._self._c,
     _setup = _vm._self._setupProxy;
@@ -34384,7 +34384,7 @@ var add_and_takevue_type_template_id_f6a871c8_render = function render() {
 };
 var staticRenderFns = [];
 
-// CONCATENATED MODULE: ./packages/add-and-take/index.vue?vue&type=template&id=f6a871c8&
+// CONCATENATED MODULE: ./packages/add-and-take/index.vue?vue&type=template&id=ba01e47c&
 
 // EXTERNAL MODULE: ./node_modules/tslib/tslib.es6.js
 var tslib_es6 = __webpack_require__(0);
@@ -35253,13 +35253,14 @@ function rebuildAccountDataBySetting(values, accountData) {
   }
   return accountData;
 }
-function rebuildAccountDataByResult(detailsData, accountData) {
+function rebuildAccountDataByResult(detailsData, accountData, popupType) {
   if (!detailsData || !accountData || !accountData.addAndTakeData) {
     return accountData;
   }
   accountData.addAndTakeData.forEach(function (item) {
+    var correspondingDetailsDataKey = popupType === 'reduceBaof' && item.key === 'take' ? 'draw_value' : item.key;
     var detailData = detailsData.find(function (e) {
-      return e.key === item.key;
+      return e.key === correspondingDetailsDataKey;
     });
     var values = detailData && detailData.values;
     var details = detailData && detailData.details;
@@ -36306,7 +36307,7 @@ var add_and_takevue_type_script_lang_ts_AddAndTake = (function (_super) {
                                     d.values = d.values && d.values.map(function (v) { return (v ? Math.round(v) : v); });
                                 });
                                 _this.addAndTakeDetailData = data;
-                                _this.accountData = rebuildAccountDataByResult(data, Object(lodash["cloneDeep"])(accountData));
+                                _this.accountData = rebuildAccountDataByResult(data, Object(lodash["cloneDeep"])(accountData), type);
                                 return Promise.resolve(data);
                             })
                                 .catch(function (error) {
@@ -36415,7 +36416,7 @@ var add_and_takevue_type_script_lang_ts_AddAndTake = (function (_super) {
                 _detail.values = _detail.recommendValues;
             }
         });
-        this.accountData = rebuildAccountDataByResult(_addAndTakeDetailData, Object(lodash["cloneDeep"])(this.accountData));
+        this.accountData = rebuildAccountDataByResult(_addAndTakeDetailData, Object(lodash["cloneDeep"])(this.accountData), this.type);
         this.getAddAndTakeData();
     };
     AddAndTake.prototype.deleteAllData = function () {
@@ -36578,8 +36579,8 @@ var add_and_takevue_type_script_lang_ts_AddAndTake = (function (_super) {
 
 // CONCATENATED MODULE: ./packages/add-and-take/index.vue?vue&type=script&lang=ts&
  /* harmony default export */ var packages_add_and_takevue_type_script_lang_ts_ = (add_and_takevue_type_script_lang_ts_); 
-// EXTERNAL MODULE: ./packages/add-and-take/index.vue?vue&type=style&index=0&id=f6a871c8&prod&lang=css&
-var add_and_takevue_type_style_index_0_id_f6a871c8_prod_lang_css_ = __webpack_require__(110);
+// EXTERNAL MODULE: ./packages/add-and-take/index.vue?vue&type=style&index=0&id=ba01e47c&prod&lang=css&
+var add_and_takevue_type_style_index_0_id_ba01e47c_prod_lang_css_ = __webpack_require__(110);
 
 // CONCATENATED MODULE: ./packages/add-and-take/index.vue
 
@@ -36592,7 +36593,7 @@ var add_and_takevue_type_style_index_0_id_f6a871c8_prod_lang_css_ = __webpack_re
 
 var add_and_take_component = normalizeComponent(
   packages_add_and_takevue_type_script_lang_ts_,
-  add_and_takevue_type_template_id_f6a871c8_render,
+  add_and_takevue_type_template_id_ba01e47c_render,
   staticRenderFns,
   false,
   null,

package/package.json

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

package/packages/add-and-take/handler.js

@@ -187,12 +187,13 @@ export function rebuildAccountDataBySetting(values, accountData) {
   return accountData;
 }
 
-export function rebuildAccountDataByResult(detailsData, accountData) {
+export function rebuildAccountDataByResult(detailsData, accountData, popupType) {
   if (!detailsData || !accountData || !accountData.addAndTakeData) {
     return accountData;
   }
   accountData.addAndTakeData.forEach(item => {
-    const detailData = detailsData.find(e => e.key === item.key);
+    const correspondingDetailsDataKey = popupType === 'reduceBaof' && item.key === 'take' ? 'draw_value' : item.key;
+    const detailData = detailsData.find(e => e.key === correspondingDetailsDataKey);
     const values = detailData && detailData.values;
     const details = detailData && detailData.details;
     if (!(values && values.length)) {

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

@@ -625,7 +625,7 @@ export default class AddAndTake extends Vue {
           d.values = d.values && d.values.map(v => (v ? Math.round(v) : v));
         });
         this.addAndTakeDetailData = data;
-        this.accountData = rebuildAccountDataByResult(data, cloneDeep(accountData));
+        this.accountData = rebuildAccountDataByResult(data, cloneDeep(accountData), type);
         return Promise.resolve(data);
       })
       .catch(error => {
@@ -733,7 +733,7 @@ export default class AddAndTake extends Vue {
         _detail.values = _detail.recommendValues;
       }
     });
-    this.accountData = rebuildAccountDataByResult(_addAndTakeDetailData, cloneDeep(this.accountData));
+    this.accountData = rebuildAccountDataByResult(_addAndTakeDetailData, cloneDeep(this.accountData), this.type);
     this.getAddAndTakeData();
   }
   deleteAllData() {