bxs-tools-ui 3.0.0-2 → 3.0.0-3

package/es/add-and-take/index.css

@@ -1 +1 @@
-.bxt_common_field_radio{padding-bottom:11px;padding-top:11px}.bxt_common_field_radio .van-field__control--right .bxt_common_form_radio.disabled .bxt_common_form_radio_item{padding-right:0}.bxt_common_field_radio .bxt_common_form_radio{font-size:13px;margin-bottom:-8px;margin-right:-8px}.bxt_common_field_radio .bxt_common_form_radio .bxt_common_form_radio_item{background:#f2f2f2;border:1px solid #f2f2f2;border-radius:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;color:#999;display:inline-block;font-weight:400;line-height:13px;margin-bottom:6px;margin-right:8px;min-width:60px;padding:6px 9px;text-align:center}.bxt_common_field_radio .bxt_common_form_radio .bxt_common_form_radio_item.active{background:rgba(2,92,234,.1);border-color:#0a64fe;color:#0a64fe;font-weight:700;font-weight:500}.bxt_common_field_radio .bxt_common_form_radio .bxt_common_form_radio_item.disabled{color:#999}.bxt_common_field_radio .bxt_common_form_radio .van-radio-group .van-radio .van-radio__icon{font-size:16px}.bxt_common_field_radio .bxt_common_form_radio.disabled .bxt_common_form_radio_item{border-color:transparent;color:#ccc;padding-left:0;padding-right:0}.bxt_common_field_radio .bxt_common_form_radio.disabled .bxt_common_form_radio_item.active{background:0;border-color:transparent;color:#ccc}.bxt_common_field_radio.bxt_border .bxt_common_form_radio{margin-bottom:0}.bxt_aat_interest_form{color:#333;font-size:16px;line-height:24px}.bxt_aat_interest_form .bxt_aatif_adjust{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:0 16px}.bxt_aat_interest_form .bxt_aatif_adjust table{border-collapse:collapse;font-size:12px;font-weight:700;font-weight:500;line-height:12px;width:100%}.bxt_aat_interest_form .bxt_aatif_adjust table tr td{background:#f8f8f8;border-bottom:1px solid #fff;border-left:1px solid #fff;line-height:normal;min-width:32px;padding:6px;text-align:center}.bxt_aat_interest_form .bxt_aatif_adjust table tr td:first-child,.bxt_aat_interest_form .bxt_aatif_adjust table tr td:nth-child(2){width:32px}.bxt_aat_interest_form .bxt_aatif_adjust table tr td:nth-child(3),.bxt_aat_interest_form .bxt_aatif_adjust table tr td:nth-child(4),.bxt_aat_interest_form .bxt_aatif_adjust table tr td:nth-child(5){min-width:50px}.bxt_aat_interest_form .bxt_aatif_adjust table tr td:last-child{border-right:1px solid #fff;width:32px}.bxt_aat_interest_form .bxt_aatif_adjust table tr:first-child td{background:#e6f0ff}.bxt_aat_interest_form .bxt_aatif_form input{padding-right:9px;text-align:right}.bxt_aat_interest_form .bxt_aatif_form input::-webkit-input-placeholder{font-size:14px}.bxt_aat_interest_form .bxt_aatif_form .van-cell:after{right:0}.bxt_aat_interest_form .bxt_aatif_form .bxt_select{font-weight:700;position:relative;text-align:right;width:100%}.bxt_aat_interest_form .bxt_aatif_form .bxt_select .bxt_content{display:inline-block}.bxt_aat_interest_form .bxt_aatif_form .bxt_select .bxt_van-icon-arrow{color:#fffeed}.bxt_aat_interest_form .bxt_aatif_form .bxt_aatif_form_item{position:relative}.bxt_aat_interest_form .bxt_aatif_form .bxt_aatif_form_item .van-cell:after{border-bottom:0}.bxt_aat_interest_form .bxt_aatif_form .bxt_aatif_form_item.purpose .bxt_custom_purpose{padding-top:6px}.bxt_aat_interest_form .bxt_aatif_form .bxt_aatif_form_item.baof .bxt_max_baof{color:#ff752a;font-size:12px;font-weight:700;font-weight:500;line-height:18px;padding:0 16px 14px}.bxt_aat_interest_form .bxt_aatif_form .bxt_aatif_form_item:after{border-bottom:1px solid #ebedf0;bottom:0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;content:" ";left:1rem;pointer-events:none;position:absolute;right:0;-webkit-transform:scaleY(.5);transform:scaleY(.5)}.bxt_aat_interest_form .bxt_aatif_form .bxt_aatif_form_item__extra{font-size:16px;font-weight:700;font-weight:500;line-height:24px}.bxt_aat_interest_form .bxt_take_limit{color:#666;font-size:14px;padding:10px 16px}.bxt_aat_interest_form .bxt_take_limit .bxt_take_limit_title{font-size:15px;font-weight:700}.bxt_aat_interest_form .bxt_take_limit .bxt_take_limit_tx{color:#999}.aat_interest_form .aatif_add_button .add-disabled{background:rgba(2,92,234,.3);border:.0625rem solid transparent;color:#fff}.bxt_aat_interest_items{font-size:13px}.bxt_aat_interest_items input{-webkit-appearance:none;-moz-appearance:none;appearance:none;background:0 0;border:none;vertical-align:middle}.bxt_aat_interest_items .bxt_aatii_item{border-radius:6px;display:-webkit-box;display:-webkit-flex;display:-moz-box;display:-ms-flexbox;display:flex;margin-bottom:9px;margin-right:10px}.bxt_aat_interest_items .bxt_aatii_item .bxt_aatii_item_left{-webkit-box-flex:0;-moz-box-flex:0;color:#999;-webkit-flex:0 0 5em;-ms-flex:0 0 5em;flex:0 0 5em;margin-bottom:12px;margin-right:7px;margin-top:3px;text-align:right}.bxt_aat_interest_items .bxt_aatii_item .bxt_aatii_item_right{-webkit-box-flex:1;-moz-box-flex:1;-webkit-flex:1;-ms-flex:1;flex:1}.bxt_aat_interest_items .bxt_aatii_item .bxt_aatii_item_right .bxt_aatii_item_right_options>span{background:rgba(0,0,0,.04);border-radius:50px;display:inline-block;margin:0 9px 9px 0;overflow:hidden;padding:3px 6px;text-align:center;white-space:nowrap;width:42%}.bxt_aat_interest_items .bxt_aatii_item .bxt_aatii_item_right .bxt_aatii_item_right_options>span.active{background:#e6effe;color:#0a64fe;font-weight:700}.bxt_aat_interest_items .bxt_aatii_item .bxt_aatii_item_right .bxt_aatii_item_right_custom{background:#f4f8ff;border-radius:6px;margin-bottom:9px;padding:12px;position:relative}.bxt_aat_interest_items .bxt_aatii_item .bxt_aatii_item_right .bxt_aatii_item_right_custom .bxt_aatii_item_right_custom_input input{background:#fff;border:1px solid #e6e6e6;border-radius:50px;margin-right:6px;padding:3px 9px;vertical-align:middle;width:110px}.bxt_aat_interest_items .bxt_aatii_item .bxt_aatii_item_right .bxt_aatii_item_right_custom .bxt_aatii_item_right_custom_input span{vertical-align:middle}.bxt_aat_interest_items .bxt_aatii_item .bxt_aatii_item_right .bxt_aatii_item_right_custom .bxt_aatii_item_right_custom_tips span{background:#f5f5f5;border:1px solid #d3d3d3;border-radius:50px;color:#666;display:inline-block;margin-top:12px;padding:3px 9px}.bxt_aat_interest_table table{border-collapse:collapse;border-spacing:0;color:#333;font-size:12px;table-layout:fixed;text-align:left;width:100%}.bxt_aat_interest_table table tr td{border:1px solid #e5e5e5;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;padding:6px}.bxt_aat_interest_table table tr td .bxt_aatit_purpose{background:rgba(10,100,254,.1);border-radius:2px;color:#0a64fe;display:inline-block;line-height:100%;margin-left:2px;padding:2px;-webkit-transform:scale(.8333);transform:scale(.8333);-webkit-transform-origin:left center;transform-origin:left center;white-space:nowrap}.bxt_aat_interest_table table tr td:first-child,.bxt_aat_interest_table table tr td:nth-child(2){color:#999;text-align:center;width:1.8em}.bxt_aat_interest_table table tr td:nth-child(3),.bxt_aat_interest_table table tr td:nth-child(4){width:5.5em}.bxt_aat_interest_table table tr td.edit{color:#0a64fe;text-decoration:underline}.bxt_aat_interest_table table tr td.disabled{color:#ccc;text-decoration:none}.bxt_aat_interest_table table tr:first-child{position:-webkit-sticky;position:sticky;top:0;will-change:scroll-position;z-index:1}.bxt_aat_interest_table table tr:first-child td{background-color:#f2f3f5;border:0;font-weight:700;text-align:center}*{margin:0;padding:0}body{color:#333}dl,ul{list-style:none}img{max-width:100%}a{color:#333;display:block;text-decoration:none}em{font-style:normal}article,aside,footer,header,nav,section{display:block}.bxt_add_and_take{background:#fff}.bxt_add_and_take.bxt_add_and_take__footer:after{content:"";display:block;height:constant(safe-area-inset-bottom);height:env(safe-area-inset-bottom)}.bxt_add_and_take.bxt_add_and_take__footer{margin-bottom:64px}.bxt_add_and_take .bxt_add_and_take_tips{color:#999;font-size:13px;margin-bottom:8px;text-align:center}.bxt_add_and_take .bxt_add_and_take_footer:after{content:"";display:block;height:constant(safe-area-inset-bottom);height:env(safe-area-inset-bottom)}.bxt_add_and_take .bxt_add_and_take_footer{background:#fff;bottom:0;-webkit-box-shadow:0 -6px 10px 0 rgba(23,32,77,.05);box-shadow:0 -6px 10px 0 rgba(23,32,77,.05);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;left:0;padding:7px 16px;position:fixed;width:100%}.bxt_add_and_take .bxt_add_and_take_footer .bxt_add_and_take_footer_wrapper{display:-webkit-box;display:-webkit-flex;display:-moz-box;display:-ms-flexbox;display:flex;font-size:14px;line-height:20px}.bxt_add_and_take .bxt_add_and_take_footer .bxt_add_and_take_footer_wrapper .bxt_item{-webkit-box-flex:1;-moz-box-flex:1;background:#fff;border:1px solid #e5e5e5;border-radius:8px;color:#333;-webkit-flex:1;-ms-flex:1;flex:1;margin-right:12px;padding:7px 0;text-align:center}.bxt_add_and_take .bxt_add_and_take_footer .bxt_add_and_take_footer_wrapper .bxt_item.primary{background:#0a64fe;border:1px solid #0a64fe;color:#fff}.bxt_add_and_take .bxt_add_and_take_footer .bxt_add_and_take_footer_wrapper .bxt_item.minor{background:#fff;border:1px solid #0a64fe;color:#0a64fe}.bxt_add_and_take .bxt_add_and_take_footer .bxt_add_and_take_footer_wrapper .bxt_item.disabled{background:rgba(2,92,234,.3);border:1px solid transparent;color:#fff}.bxt_add_and_take .bxt_add_and_take_footer .bxt_add_and_take_footer_wrapper .bxt_item:last-child{margin-right:0}
+.bxt_common_field_radio{padding-bottom:11px;padding-top:11px}.bxt_common_field_radio .van-field__control--right .bxt_common_form_radio.disabled .bxt_common_form_radio_item{padding-right:0}.bxt_common_field_radio .bxt_common_form_radio{font-size:13px;margin-bottom:-8px;margin-right:-8px}.bxt_common_field_radio .bxt_common_form_radio .bxt_common_form_radio_item{background:#f2f2f2;border:1px solid #f2f2f2;border-radius:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;color:#999;display:inline-block;font-weight:400;line-height:13px;margin-bottom:6px;margin-right:8px;min-width:60px;padding:6px 9px;text-align:center}.bxt_common_field_radio .bxt_common_form_radio .bxt_common_form_radio_item.active{background:rgba(2,92,234,.1);border-color:#0a64fe;color:#0a64fe;font-weight:700;font-weight:500}.bxt_common_field_radio .bxt_common_form_radio .bxt_common_form_radio_item.disabled{color:#999}.bxt_common_field_radio .bxt_common_form_radio .van-radio-group .van-radio .van-radio__icon{font-size:16px}.bxt_common_field_radio .bxt_common_form_radio.disabled .bxt_common_form_radio_item{border-color:transparent;color:#ccc;padding-left:0;padding-right:0}.bxt_common_field_radio .bxt_common_form_radio.disabled .bxt_common_form_radio_item.active{background:0;border-color:transparent;color:#ccc}.bxt_common_field_radio.bxt_border .bxt_common_form_radio{margin-bottom:0}.bxt_aat_interest_form{color:#333;font-size:16px;line-height:24px}.bxt_aat_interest_form .bxt_aatif_adjust{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:0 16px}.bxt_aat_interest_form .bxt_aatif_adjust table{border-collapse:collapse;font-size:12px;font-weight:700;font-weight:500;line-height:12px;width:100%}.bxt_aat_interest_form .bxt_aatif_adjust table tr td{background:#f8f8f8;border-bottom:1px solid #fff;border-left:1px solid #fff;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;line-height:normal;min-width:32px;padding:6px;text-align:center}.bxt_aat_interest_form .bxt_aatif_adjust table tr td:first-child,.bxt_aat_interest_form .bxt_aatif_adjust table tr td:nth-child(2){width:32px}.bxt_aat_interest_form .bxt_aatif_adjust table tr td:nth-child(3),.bxt_aat_interest_form .bxt_aatif_adjust table tr td:nth-child(4),.bxt_aat_interest_form .bxt_aatif_adjust table tr td:nth-child(5){min-width:50px}.bxt_aat_interest_form .bxt_aatif_adjust table tr td:last-child{border-right:1px solid #fff;width:32px}.bxt_aat_interest_form .bxt_aatif_adjust table tr:first-child td{background:#e6f0ff}.bxt_aat_interest_form .bxt_aatif_form input{padding-right:9px;text-align:right}.bxt_aat_interest_form .bxt_aatif_form input::-webkit-input-placeholder{font-size:14px}.bxt_aat_interest_form .bxt_aatif_form .van-cell:after{right:0}.bxt_aat_interest_form .bxt_aatif_form .bxt_select{font-weight:700;position:relative;text-align:right;width:100%}.bxt_aat_interest_form .bxt_aatif_form .bxt_select .bxt_content{display:inline-block}.bxt_aat_interest_form .bxt_aatif_form .bxt_select .bxt_van-icon-arrow{color:#fffeed}.bxt_aat_interest_form .bxt_aatif_form .bxt_aatif_form_item{position:relative}.bxt_aat_interest_form .bxt_aatif_form .bxt_aatif_form_item .van-cell:after{border-bottom:0}.bxt_aat_interest_form .bxt_aatif_form .bxt_aatif_form_item.purpose .bxt_custom_purpose{padding-top:6px}.bxt_aat_interest_form .bxt_aatif_form .bxt_aatif_form_item.baof .bxt_max_baof{color:#ff752a;font-size:12px;font-weight:700;font-weight:500;line-height:18px;padding:0 16px 14px}.bxt_aat_interest_form .bxt_aatif_form .bxt_aatif_form_item:after{border-bottom:1px solid #ebedf0;bottom:0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;content:" ";left:1rem;pointer-events:none;position:absolute;right:0;-webkit-transform:scaleY(.5);transform:scaleY(.5)}.bxt_aat_interest_form .bxt_aatif_form .bxt_aatif_form_item__extra{font-size:16px;font-weight:700;font-weight:500;line-height:24px}.bxt_aat_interest_form .bxt_take_limit{color:#666;font-size:14px;padding:10px 16px}.bxt_aat_interest_form .bxt_take_limit .bxt_take_limit_title{font-size:15px;font-weight:700}.bxt_aat_interest_form .bxt_take_limit .bxt_take_limit_tx{color:#999}.aat_interest_form .aatif_add_button .add-disabled{background:rgba(2,92,234,.3);border:.0625rem solid transparent;color:#fff}.bxt_aat_interest_items{font-size:13px}.bxt_aat_interest_items input{-webkit-appearance:none;-moz-appearance:none;appearance:none;background:0 0;border:none;vertical-align:middle}.bxt_aat_interest_items .bxt_aatii_item{border-radius:6px;display:-webkit-box;display:-webkit-flex;display:-moz-box;display:-ms-flexbox;display:flex;margin-bottom:9px;margin-right:10px}.bxt_aat_interest_items .bxt_aatii_item .bxt_aatii_item_left{-webkit-box-flex:0;-moz-box-flex:0;color:#999;-webkit-flex:0 0 5em;-ms-flex:0 0 5em;flex:0 0 5em;margin-bottom:12px;margin-right:7px;margin-top:3px;text-align:right}.bxt_aat_interest_items .bxt_aatii_item .bxt_aatii_item_right{-webkit-box-flex:1;-moz-box-flex:1;-webkit-flex:1;-ms-flex:1;flex:1}.bxt_aat_interest_items .bxt_aatii_item .bxt_aatii_item_right .bxt_aatii_item_right_options>span{background:rgba(0,0,0,.04);border-radius:50px;display:inline-block;margin:0 9px 9px 0;overflow:hidden;padding:3px 6px;text-align:center;white-space:nowrap;width:42%}.bxt_aat_interest_items .bxt_aatii_item .bxt_aatii_item_right .bxt_aatii_item_right_options>span.active{background:#e6effe;color:#0a64fe;font-weight:700}.bxt_aat_interest_items .bxt_aatii_item .bxt_aatii_item_right .bxt_aatii_item_right_custom{background:#f4f8ff;border-radius:6px;margin-bottom:9px;padding:12px;position:relative}.bxt_aat_interest_items .bxt_aatii_item .bxt_aatii_item_right .bxt_aatii_item_right_custom .bxt_aatii_item_right_custom_input input{background:#fff;border:1px solid #e6e6e6;border-radius:50px;margin-right:6px;padding:3px 9px;vertical-align:middle;width:110px}.bxt_aat_interest_items .bxt_aatii_item .bxt_aatii_item_right .bxt_aatii_item_right_custom .bxt_aatii_item_right_custom_input span{vertical-align:middle}.bxt_aat_interest_items .bxt_aatii_item .bxt_aatii_item_right .bxt_aatii_item_right_custom .bxt_aatii_item_right_custom_tips span{background:#f5f5f5;border:1px solid #d3d3d3;border-radius:50px;color:#666;display:inline-block;margin-top:12px;padding:3px 9px}.bxt_aat_interest_table{overflow-x:auto;overflow-y:hidden}.bxt_aat_interest_table table{border-collapse:collapse;border-spacing:0;color:#333;font-size:12px;table-layout:fixed;text-align:left;width:100%}.bxt_aat_interest_table table tr td{border:1px solid #e5e5e5;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;padding:6px 4px;white-space:nowrap}.bxt_aat_interest_table table tr td .bxt_aatit_purpose,.bxt_aat_interest_table table tr td .bxt_aatit_purpose2{background:rgba(10,100,254,.1);border-radius:2px;color:#0a64fe;display:inline-block;line-height:100%;margin-left:2px;padding:2px;-webkit-transform:scale(.8333);transform:scale(.8333);-webkit-transform-origin:left center;transform-origin:left center;white-space:nowrap}.bxt_aat_interest_table table tr td:first-child,.bxt_aat_interest_table table tr td:nth-child(2){color:#999;text-align:center;width:1.8em}.bxt_aat_interest_table table tr td:nth-child(3),.bxt_aat_interest_table table tr td:nth-child(4){width:5.5em}.bxt_aat_interest_table table tr td.edit{color:#0a64fe;text-decoration:underline}.bxt_aat_interest_table table tr td.disabled{color:#ccc;text-decoration:none}.bxt_aat_interest_table table tr:first-child{position:-webkit-sticky;position:sticky;top:0;will-change:scroll-position;z-index:1}.bxt_aat_interest_table table tr:first-child td{background-color:#f2f3f5;border:0;font-weight:700;text-align:center;white-space:normal}*{margin:0;padding:0}body{color:#333}dl,ul{list-style:none}img{max-width:100%}a{color:#333;display:block;text-decoration:none}em{font-style:normal}article,aside,footer,header,nav,section{display:block}.bxt_add_and_take{background:#fff}.bxt_add_and_take.bxt_add_and_take__footer:after{content:"";display:block;height:constant(safe-area-inset-bottom);height:env(safe-area-inset-bottom)}.bxt_add_and_take.bxt_add_and_take__footer{margin-bottom:64px}.bxt_add_and_take .bxt_add_and_take_tips{color:#999;font-size:13px;margin-bottom:8px;text-align:center}.bxt_add_and_take .bxt_add_and_take_footer:after{content:"";display:block;height:constant(safe-area-inset-bottom);height:env(safe-area-inset-bottom)}.bxt_add_and_take .bxt_add_and_take_footer{background:#fff;bottom:0;-webkit-box-shadow:0 -6px 10px 0 rgba(23,32,77,.05);box-shadow:0 -6px 10px 0 rgba(23,32,77,.05);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;left:0;padding:7px 16px;position:fixed;width:100%}.bxt_add_and_take .bxt_add_and_take_footer .bxt_add_and_take_footer_wrapper{display:-webkit-box;display:-webkit-flex;display:-moz-box;display:-ms-flexbox;display:flex;font-size:14px;line-height:20px}.bxt_add_and_take .bxt_add_and_take_footer .bxt_add_and_take_footer_wrapper .bxt_item{-webkit-box-flex:1;-moz-box-flex:1;background:#fff;border:1px solid #e5e5e5;border-radius:8px;color:#333;-webkit-flex:1;-ms-flex:1;flex:1;margin-right:12px;padding:7px 0;text-align:center}.bxt_add_and_take .bxt_add_and_take_footer .bxt_add_and_take_footer_wrapper .bxt_item.primary{background:#0a64fe;border:1px solid #0a64fe;color:#fff}.bxt_add_and_take .bxt_add_and_take_footer .bxt_add_and_take_footer_wrapper .bxt_item.minor{background:#fff;border:1px solid #0a64fe;color:#0a64fe}.bxt_add_and_take .bxt_add_and_take_footer .bxt_add_and_take_footer_wrapper .bxt_item.disabled{background:rgba(2,92,234,.3);border:1px solid transparent;color:#fff}.bxt_add_and_take .bxt_add_and_take_footer .bxt_add_and_take_footer_wrapper .bxt_item:last-child{margin-right:0}

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

@@ -1794,12 +1794,14 @@ function rebuildAccountDataBySetting(values, accountData) {
   }
   return accountData;
 }
-function rebuildAccountDataByResult(detailsData, accountData, popupType) {
+function rebuildAccountDataByResult(detailsData, accountData) {
+  var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   if (!detailsData || !accountData || !accountData.addAndTakeData) {
     return accountData;
   }
+  var columnKey = get(options, 'columnKey');
   accountData.addAndTakeData.forEach(function (item) {
-    var correspondingDetailsDataKey = popupType === 'reduceBaof' && item.key === 'take' ? 'draw_value' : item.key;
+    var correspondingDetailsDataKey = columnKey || item.key;
     var detailData = detailsData.find(function (e) {
       return e.key === correspondingDetailsDataKey;
     });
@@ -1839,34 +1841,42 @@ function calcColumnsWidth(tableData) {
     var keys = Object.keys(tableData[0]).filter(function (k) {
       return !['year', 'age'].includes(k);
     });
-    keys.push('purpose');
+    keys.push('purpose', 'purpose2');
     keys.forEach(function (k) {
-      if (['purpose'].includes(k)) {
-        widthObj[k] = 0;
-        return;
-      }
-      if (['take', 'add'].includes(k)) {
-        widthObj[k] = 3;
-        return;
-      }
-      widthObj[k] = 5.5;
+      widthObj[k] = 0;
     });
     keys.forEach(function (k) {
-      tableData.forEach(function (ele, eleIndex) {
-        if (eleIndex === 0) {
-          return;
-        }
+      tableData.filter(function (e, i) {
+        return i !== 0;
+      }).forEach(function (e, i) {
         var contentCount = 0;
         if (k === 'purpose') {
-          if (ele.purpose) {
-            contentCount = ele[k].length * 10 / 12;
+          if (e.purpose) {
+            contentCount = e[k].length * 10 / 12 + 0.5;
+          }
+        } else if (k === 'purpose2') {
+          if (e.purpose2) {
+            contentCount = e[k].length * 10 / 12 + 0.5;
           }
         } else {
-          contentCount = formatNumberToThousand(ele[k]).length * 0.5 + 1.5;
+          contentCount = formatNumberToThousand(e[k]).length * 0.5 + 0.5;
         }
         widthObj[k] = Math.max(contentCount, widthObj[k]);
       });
     });
+    for (var k in widthObj) {
+      if (['take', 'draw_value'].includes(k)) {
+        widthObj[k] += widthObj.purpose || 0;
+      }
+      if (['draw_value2'].includes(k)) {
+        widthObj[k] += widthObj.purpose2 || 0;
+      }
+    }
+    for (var _k in widthObj) {
+      if (!['purpose', 'purpose2'].includes(_k)) {
+        widthObj[_k] = Math.max(5, widthObj[_k]);
+      }
+    }
   }
   return widthObj;
 }
@@ -2217,7 +2227,7 @@ const script$1 = {
       };
       detailData.forEach(function (d, i) {
         // 为解决接口返回的数组中key相同的问题
-        if (!['add', 'take', 'draw_value'].includes(d.key)) {
+        if (!['add', 'take', 'draw_value', 'draw_value2'].includes(d.key)) {
           d.uniKey = "".concat(d.key, "_").concat(i);
         }
         tableHeaderData[d.uniKey || d.key] = (d.name || '').replace(/([(（](.*)[)）])$/, '<br/>$1');
@@ -2240,7 +2250,11 @@ const script$1 = {
             record[item.uniKey || item.key] = formatNumberToThousand(item.values[i] || 0);
           }
           if (item.details) {
-            record.purpose = item.details[i] || '';
+            if (item.key === 'draw_value2') {
+              record.purpose2 = item.details[i] || '';
+            } else {
+              record.purpose = item.details[i] || '';
+            }
           }
         });
         tableData.push(record);
@@ -2279,30 +2293,31 @@ var __vue_render__$1 = function __vue_render__() {
         top: _vm.headFixedTop + "px"
       } : {}
     }, _vm._l(['year', 'age'].concat(Object.keys(record).filter(function (k) {
-      return !['year', 'age', 'purpose'].includes(k);
+      return !['year', 'age', 'purpose', 'purpose2'].includes(k);
     })), function (key) {
+      var _obj;
       return _c('td', {
         key: key,
-        class: {
-          key: true,
-          disabled: recordIndex > 0 && ['take', 'draw_value'].includes(key) && record.year < _vm.minTakeYear,
-          edit: recordIndex !== 0 && ['take', 'draw_value'].includes(key)
-        },
+        class: (_obj = {}, _obj[key] = true, _obj.purpose = ['take', 'draw_value', 'draw_value2'].includes(key) && (record.purpose || record.purpose2), _obj.disabled = recordIndex > 0 && ['take', 'draw_value', 'draw_value2'].includes(key) && record.year < _vm.minTakeYear, _obj.edit = recordIndex !== 0 && ['add', 'take', 'draw_value', 'draw_value2'].includes(key), _obj),
         style: {
-          'min-width': (_vm.columnWidthObj[key] || 3) + (['take', 'draw_value'].includes(key) ? _vm.columnWidthObj.purpose : 0) + "em"
+          'min-width': _vm.columnWidthObj[key] + "em",
+          'max-width': _vm.columnWidthObj[key] + "em",
+          width: _vm.columnWidthObj[key] + "em"
         },
         on: {
           "click": function click($event) {
             return _vm.$emit('clickTableCell', key, record, recordIndex);
           }
         }
-      }, [recordIndex !== 0 && !(['take', 'draw_value'].includes(key) && _vm.columnWidthObj.purpose && record.purpose) ? [_vm._v("\n          " + _vm._s(record[key]) + "\n        ")] : [_c('span', {
+      }, [recordIndex !== 0 && !(['take', 'draw_value', 'draw_value2'].includes(key) && (_vm.columnWidthObj.purpose && record.purpose || _vm.columnWidthObj.purpose2 && record.purpose2)) ? [_vm._v("\n          " + _vm._s(record[key]) + "\n        ")] : [_c('span', {
         domProps: {
           "innerHTML": _vm._s(record[key])
         }
-      }), record.purpose ? _c('span', {
+      }), record.purpose && ['take', 'draw_value'].includes(key) ? _c('span', {
         staticClass: "bxt_aatit_purpose"
-      }, [_vm._v("\n            " + _vm._s(record.purpose) + "\n          ")]) : _vm._e()]], 2);
+      }, [_vm._v("\n            " + _vm._s(record.purpose) + "\n          ")]) : _vm._e(), record.purpose2 && ['draw_value2'].includes(key) ? _c('span', {
+        staticClass: "bxt_aatit_purpose2"
+      }, [_vm._v("\n            " + _vm._s(record.purpose2) + "\n          ")]) : _vm._e()]], 2);
     }), 0);
   }), 0), _vm.footer ? _c('footer', {
     staticClass: "bxt_add_and_take_footer"
@@ -2391,6 +2406,7 @@ const script = {
     accountData: Object,
     accountInsuranceId: Number,
     reduceBaofData: Object,
+    reduceBaofData2: Object,
     reduceBaofInsuranceId: Number,
     interestData: Object,
     footer: {
@@ -2403,6 +2419,7 @@ const script = {
       subName: '',
       currentAccountData: cloneDeep(this.accountData),
       currentReduceBaofData: cloneDeep(this.reduceBaofData),
+      currentReduceBaofData2: cloneDeep(this.reduceBaofData2),
       addAndTakeRecordData: null,
       interestInitData: null,
       addAndTakeDetailData: null,
@@ -2491,7 +2508,8 @@ const script = {
         resultUuid = this.resultUuid,
         productKey = this.productKey,
         insuranceKey = this.insuranceKey,
-        interestData = this.interestData;
+        interestData = this.interestData,
+        currentReduceBaofData2 = this.currentReduceBaofData2;
       var reqParams = {
         uuid: resultUuid,
         pbData: resultUuid ? '' : JSON.stringify(this.getPureInputDataForRequest()),
@@ -2504,6 +2522,11 @@ const script = {
         if (data) {
           _this.interestInitData = initInterestData(data);
           _this.interestFormValue = initInterestFormValues(interestData, _this.interestInitData);
+          if (data.duplicateFlag) {
+            if (!get(currentReduceBaofData2, 'addAndTakeData.length')) {
+              _this.currentReduceBaofData2 = initDefaultAddAndTakeData('take');
+            }
+          }
           _this.getAddAndTakeData();
         }
       }).catch(function (error) {
@@ -2521,14 +2544,16 @@ const script = {
       var _arguments = arguments,
         _this2 = this;
       return _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-        var newRecordData, oFormValue, self, scene, resultUuid, productKey, insuranceKey, reduceBaofData, reduceBaofInsuranceId, accountInsuranceId, type, currentAccountData, currentReduceBaofData, addAndTakeRecordData, interestInitData, _formValus, bonus, bonusTake, takeType, customRate, rate, pensionTake, yearBonusRate, latestYearBonusRate, bonusRealRate, bonusShowSelector, yearRate, monthRate, effectAccountData, isReduceBaof, reqParams;
+        var newRecordData, oFormValue, params, self, columnKey, scene, resultUuid, productKey, insuranceKey, reduceBaofData, reduceBaofData2, reduceBaofInsuranceId, accountInsuranceId, type, currentAccountData, currentReduceBaofData, currentReduceBaofData2, addAndTakeRecordData, interestInitData, _formValus, bonus, bonusTake, takeType, customRate, rate, pensionTake, yearBonusRate, latestYearBonusRate, bonusRealRate, bonusShowSelector, yearRate, monthRate, effectAddAndTakeData, reduceAddAndTakeData, reduce2AddAndTakeData, isReduceBaof, reqParams;
         return _regeneratorRuntime.wrap(function (_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               newRecordData = _arguments.length > 0 && _arguments[0] !== undefined ? _arguments[0] : null;
               oFormValue = _arguments.length > 1 ? _arguments[1] : undefined;
+              params = _arguments.length > 2 && _arguments[2] !== undefined ? _arguments[2] : {};
               self = _this2;
-              scene = self.scene, resultUuid = self.resultUuid, productKey = self.productKey, insuranceKey = self.insuranceKey, reduceBaofData = self.reduceBaofData, reduceBaofInsuranceId = self.reduceBaofInsuranceId, accountInsuranceId = self.accountInsuranceId, type = self.type, currentAccountData = self.currentAccountData, currentReduceBaofData = self.currentReduceBaofData, addAndTakeRecordData = self.addAndTakeRecordData, interestInitData = self.interestInitData;
+              columnKey = get(params, 'columnKey');
+              scene = self.scene, resultUuid = self.resultUuid, productKey = self.productKey, insuranceKey = self.insuranceKey, reduceBaofData = self.reduceBaofData, reduceBaofData2 = self.reduceBaofData2, reduceBaofInsuranceId = self.reduceBaofInsuranceId, accountInsuranceId = self.accountInsuranceId, type = self.type, currentAccountData = self.currentAccountData, currentReduceBaofData = self.currentReduceBaofData, currentReduceBaofData2 = self.currentReduceBaofData2, addAndTakeRecordData = self.addAndTakeRecordData, interestInitData = self.interestInitData;
               _context.next = 1;
               return self.validateInterestFormValues().catch(function () {});
             case 1:
@@ -2538,9 +2563,11 @@ const script = {
                 break;
               }
               bonus = _formValus.bonus, bonusTake = _formValus.bonusTake, takeType = _formValus.takeType, customRate = _formValus.customRate, rate = _formValus.rate, pensionTake = _formValus.pensionTake, yearBonusRate = _formValus.yearBonusRate, latestYearBonusRate = _formValus.latestYearBonusRate, bonusRealRate = _formValus.bonusRealRate, bonusShowSelector = _formValus.bonusShowSelector, yearRate = _formValus.yearRate, monthRate = _formValus.monthRate;
-              effectAccountData = newRecordData || addAndTakeRecordData;
+              effectAddAndTakeData = get(newRecordData || addAndTakeRecordData, 'addAndTakeData') || null;
+              reduceAddAndTakeData = get(addAndTakeRecordData, 'addAndTakeData') || null;
+              reduce2AddAndTakeData = get(currentReduceBaofData2, 'addAndTakeData') || null;
               isReduceBaof = type === 'reduceBaof';
-              reqParams = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({
+              reqParams = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({
                 uuid: resultUuid,
                 pbData: resultUuid ? '' : JSON.stringify(_this2.getPureInputDataForRequest()),
                 productId: productKey,
@@ -2562,9 +2589,26 @@ const script = {
                 },
                 yearBonusRate: yearBonusRate,
                 latestYearBonusRate: latestYearBonusRate
-              }, isReduceBaof ? 'drawData' : 'addAndTakeData', effectAccountData ? effectAccountData.addAndTakeData : null), isReduceBaof ? 'drawInsuranceId' : 'accountInsuranceId', isReduceBaof ? reduceBaofInsuranceId : accountInsuranceId), "bonusRealRate", bonusRealRate), "bonusShowSelector", bonusShowSelector), "yearRate", yearRate), "monthRate", monthRate);
+              }, isReduceBaof ? 'drawInsuranceId' : 'accountInsuranceId', isReduceBaof ? reduceBaofInsuranceId : accountInsuranceId), "bonusRealRate", bonusRealRate), "bonusShowSelector", bonusShowSelector), "yearRate", yearRate), "monthRate", monthRate); // 这里是为支持双减保领取，即保证和红利两档都可以领取
+              if (isReduceBaof) {
+                if (!columnKey) {
+                  reqParams.drawData = effectAddAndTakeData;
+                  reqParams.duplicateDrawData = reduce2AddAndTakeData;
+                }
+                if (columnKey === 'draw_value') {
+                  reqParams.drawData = effectAddAndTakeData;
+                  reqParams.duplicateDrawData = reduce2AddAndTakeData;
+                }
+                if (columnKey === 'draw_value2') {
+                  reqParams.drawData = reduceAddAndTakeData;
+                  reqParams.duplicateDrawData = get(newRecordData || currentReduceBaofData2, 'addAndTakeData') || null;
+                }
+              } else {
+                reqParams.addAndTakeData = effectAddAndTakeData;
+              }
               if (!isReduceBaof && reduceBaofData) {
                 reqParams.drawData = reduceBaofData.addAndTakeData;
+                reqParams.duplicateDrawData = get(reduceBaofData2, 'addAndTakeData');
                 reqParams.drawInsuranceId = reduceBaofInsuranceId;
               }
               return _context.abrupt("return", getInsuranceInterestDetail(reqParams, {
@@ -2573,7 +2617,12 @@ const script = {
               }).then(function (data) {
                 if (data) {
                   self.addAndTakeDetailData = data;
-                  self.addAndTakeRecordData = rebuildAccountDataByResult(data, cloneDeep(addAndTakeRecordData), type);
+                  self.addAndTakeRecordData = rebuildAccountDataByResult(data, cloneDeep(addAndTakeRecordData), {
+                    columnKey: isReduceBaof ? 'draw_value' : null
+                  });
+                  self.currentReduceBaofData2 = rebuildAccountDataByResult(data, cloneDeep(currentReduceBaofData2), {
+                    columnKey: 'draw_value2'
+                  });
                   return Promise.resolve(data);
                 }
                 return Promise.reject();
@@ -2585,7 +2634,7 @@ const script = {
                       title: '温馨提示',
                       message: '切换演示情形后，不满足领取设置要求（将出现余额不足或超过最大领取金额限制），请确认是否清空已设置的领取金额重新进行领取设置？如不清空，则本演示情形不展示领取后数据。'
                     }).then(function () {
-                      var _addAndTakeData = get(cloneDeep(effectAccountData), 'addAndTakeData') || [];
+                      var _addAndTakeData = get(cloneDeep(effectAddAndTakeData), 'addAndTakeData') || [];
                       var _hasTakeData = _addAndTakeData.some(function (e) {
                         return e.adjustData && e.adjustData.length;
                       });
@@ -2602,6 +2651,7 @@ const script = {
                       } else {
                         if (currentReduceBaofData) {
                           self.currentReduceBaofData = initDefaultAddAndTakeData(currentReduceBaofData.accountPart);
+                          self.currentReduceBaofData2 = initDefaultAddAndTakeData('take');
                         }
                       }
                       resolve();
@@ -2645,6 +2695,7 @@ const script = {
         'baoeDesc', 'baofDesc', 'baseBaof', 'bonusTypeDesc', 'calcResultRules', 'calculatorType', 'eleOrderInResult', 'iDurationDesc', 'multipleInsured', 'isFollowing', 'isCheckbox', 'pPeriodDesc',
         // 'reduceBaof',
         // 'reduceBaofData',
+        // 'duplicateReduceBaofData',
         'saleStatus'];
         NONEED_PROD_KEYS.forEach(function (k) {
           delete _productData[k];
@@ -2670,16 +2721,17 @@ const script = {
         interestInitData = this.interestInitData,
         addAndTakeDetailData = this.addAndTakeDetailData,
         minTakeYear = this.minTakeYear;
-      if (index <= 0 || !['add', 'take', 'draw_value'].includes(key) || !(interestInitData && addAndTakeDetailData)) {
+      if (index <= 0 || !['add', 'take', 'draw_value', 'draw_value2'].includes(key) || !(interestInitData && addAndTakeDetailData)) {
         return;
       }
       var purposeOption = PURPOSE_OPTIONS.find(function (o) {
         return o.val === item.purpose;
       });
-      this.formData = {
+      var formData = {
         // WYJHS-13, 追加领取、减保领取并存，利益结果中的 take key 拆分为 take / draw_value，后者用于减保领取
         // 提交时的类型数据在外层区分，为 addAndTakeData: [{key: take},...], drawData: [{key: take}, ...]，因此 formData.type 仍是 take
-        type: key === 'draw_value' ? 'take' : key,
+        columnKey: key,
+        type: ['draw_value2', 'draw_value'].includes(key) ? 'take' : key,
         beginYear: item.year,
         endYear: item.year,
         baof: Number(item[key].replace(/,/g, '')) || null,
@@ -2687,7 +2739,7 @@ const script = {
         customPurpose: item.purpose
       };
       var startIndex = interestInitData.startIndex || 0;
-      if (['take'].includes(this.formData.type)) {
+      if (['take'].includes(formData.type)) {
         var maxLength = addAndTakeDetailData.reduce(function (a, b) {
           return Math.max(a, b.values.length);
         }, 0);
@@ -2698,17 +2750,37 @@ const script = {
           return;
         }
       }
+      this.formData = formData;
       this.subName = 'Form';
     },
     deleteAllData: function deleteAllData() {
-      this.addAndTakeRecordData.addAndTakeData.forEach(function (d) {
-        d.adjustData = [];
-      });
+      var addAndTakeRecordData = this.addAndTakeRecordData,
+        currentReduceBaofData2 = this.currentReduceBaofData2,
+        formData = this.formData;
+      var _columnKey = get(formData, 'columnKey');
+      if (_columnKey === 'draw_value2') {
+        if (currentReduceBaofData2) {
+          currentReduceBaofData2.addAndTakeData.forEach(function (d) {
+            d.adjustData = [];
+          });
+        }
+      } else {
+        addAndTakeRecordData.addAndTakeData.forEach(function (d) {
+          d.adjustData = [];
+        });
+      }
       this.getAddAndTakeData();
     },
     updateAdjustData: function updateAdjustData(values, callback) {
-      var newRecordData = rebuildAccountDataBySetting(values, cloneDeep(this.addAndTakeRecordData));
-      return this.getAddAndTakeData(newRecordData).then(function () {
+      var addAndTakeRecordData = this.addAndTakeRecordData,
+        currentReduceBaofData2 = this.currentReduceBaofData2,
+        formData = this.formData;
+      var _columnKey = get(formData, 'columnKey');
+      var _currentReduceBaofData2 = currentReduceBaofData2 || initDefaultAddAndTakeData('take');
+      var _newRecordData = rebuildAccountDataBySetting(values, cloneDeep(_columnKey === 'draw_value2' ? _currentReduceBaofData2 : addAndTakeRecordData));
+      return this.getAddAndTakeData(_newRecordData, null, {
+        columnKey: _columnKey
+      }).then(function () {
         return callback();
       }).catch(function () {});
     },
@@ -2736,11 +2808,11 @@ const script = {
     tableConfirm: function tableConfirm() {
       var _this3 = this;
       return _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-        var type, accountData, accountInsuranceId, reduceBaofInsuranceId, currentReduceBaofData, addAndTakeRecordData, _formValues, isReduceBaof, takeDataKey, responseData;
+        var type, accountData, reduceBaofData2, accountInsuranceId, reduceBaofInsuranceId, currentReduceBaofData, currentReduceBaofData2, addAndTakeRecordData, _formValues, isReduceBaof, takeDataKey, responseData;
         return _regeneratorRuntime.wrap(function (_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              type = _this3.type, accountData = _this3.accountData, accountInsuranceId = _this3.accountInsuranceId, reduceBaofInsuranceId = _this3.reduceBaofInsuranceId, currentReduceBaofData = _this3.currentReduceBaofData, addAndTakeRecordData = _this3.addAndTakeRecordData;
+              type = _this3.type, accountData = _this3.accountData, reduceBaofData2 = _this3.reduceBaofData2, accountInsuranceId = _this3.accountInsuranceId, reduceBaofInsuranceId = _this3.reduceBaofInsuranceId, currentReduceBaofData = _this3.currentReduceBaofData, currentReduceBaofData2 = _this3.currentReduceBaofData2, addAndTakeRecordData = _this3.addAndTakeRecordData;
               _context2.next = 1;
               return _this3.validateInterestFormValues().catch(function () {});
             case 1:
@@ -2753,14 +2825,15 @@ const script = {
             case 2:
               isReduceBaof = type === 'reduceBaof';
               takeDataKey = isReduceBaof ? 'reduceBaofData' : 'accountData';
-              responseData = _defineProperty(_defineProperty(_defineProperty(_defineProperty({
+              responseData = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({
                 type: type
-              }, takeDataKey, addAndTakeRecordData), "accountInsuranceId", accountInsuranceId), "reduceBaofInsuranceId", reduceBaofInsuranceId), "interestData", _formValues);
+              }, takeDataKey, addAndTakeRecordData), "reduceBaofData2", get(reduceBaofData2, 'addAndTakeData.length') || get(currentReduceBaofData2, 'addAndTakeData[0].adjustData.length') ? currentReduceBaofData2 : null), "accountInsuranceId", accountInsuranceId), "reduceBaofInsuranceId", reduceBaofInsuranceId), "interestData", _formValues);
               if (isReduceBaof) {
                 // 减保领取，清空账户领取的数据
                 responseData.accountData = accountInsuranceId && accountData ? initDefaultAddAndTakeData(accountData.accountPart) : null;
               } else {
                 responseData.reduceBaofData = currentReduceBaofData;
+                responseData.reduceBaofData2 = reduceBaofData2;
               }
               _this3.$emit('confirm', responseData, _this3);
               return _context2.abrupt("return", responseData);
@@ -2847,7 +2920,7 @@ var __vue_render__ = function __vue_render__() {
       "insured-age": _vm.insuredAge,
       "minTakeYear": _vm.minTakeYear,
       "rate": _vm.interestFormValue.rate === '_custom' ? _vm.interestFormValue.customRate : _vm.interestFormValue.rate,
-      "addAndTakeRecordData": _vm.addAndTakeRecordData,
+      "addAndTakeRecordData": _vm.formData.columnKey === 'draw_value2' ? _vm.currentReduceBaofData2 : _vm.addAndTakeRecordData,
       "interest-init-data": _vm.interestInitData,
       "add-and-take-detail-data": _vm.addAndTakeDetailData,
       "knowledgeData": _vm.knowledgeData