cnhis-design-vue 2.1.11 → 2.1.14

package/packages/big-table/src/BigTable.vue

@@ -11,22 +11,20 @@
     <div class="check-wrap" v-if="hasRefresh && !isNestTable">
       <p class="check-wrap-title">
         <span>系统检测到有数据更新,</span>
-        <span class="check-wrap-btn" @click="refreshTable">
-          点击查看
-        </span>
+        <span class="check-wrap-btn" @click="refreshTable">点击查看</span>
       </p>
     </div>
     <!-- 全选 选择框 -->
     <div class="check-wrap" v-show="visibleCheckAllWrap && !isInlineOperating && !isNestTable">
       <p class="check-wrap-title">
-        <span> 已勾选数据共{{ allSelectedLength }}条 </span>
-        <span v-show="visibleCheckAllWrapMore"> （当前页{{ currentPageSelectedLength }}条） </span>
+        <span>已勾选数据共{{ allSelectedLength }}条</span>
+        <span v-show="visibleCheckAllWrapMore">（当前页{{ currentPageSelectedLength }}条）</span>
       </p>
       <template v-if="visibleCheckAllWrapMore">
         ，
         <p v-if="!visibleCancelCheckAllBtn" class="check-wrap-btn" @click="handleCheckAll">
-            <!-- asyncCount 性能模式也可以“勾选全部” -->
-           <span v-if="pageVO.total > MAX_CHECK_SIZE">
+          <!-- asyncCount 性能模式也可以“勾选全部” -->
+          <span v-if="pageVO.total > MAX_CHECK_SIZE">
             <!-- {{ `最大勾选“${tableName}” ${MAX_CHECK_SIZE}条数据` }} -->
             {{ `勾选全部页 ${MAX_CHECK_SIZE}条数据` }}
           </span>
@@ -35,15 +33,13 @@
             {{ `勾选全部页 ${pageVO.total}条数据` }}
           </span>
         </p>
-        <p v-else class="check-wrap-btn" @click="handleCancelAllCheck">
-          取消全部勾选
-        </p>
+        <p v-else class="check-wrap-btn" @click="handleCancelAllCheck">取消全部勾选</p>
       </template>
     </div>
     <!-- 树状表格已选 -->
     <div v-show="visibleTreeCheck && !isInlineOperating && !isNestTable" class="check-wrap">
       <p class="check-wrap-title">
-        <span> 已勾选数据共{{ treeTableLength }}条 </span>
+        <span>已勾选数据共{{ treeTableLength }}条</span>
       </p>
     </div>
     <c-grid
@@ -105,7 +101,11 @@
     >
       <template v-slot:empty>
         <div v-if="isShowEmpty">
-          <NoData :noDataImg="emptyItems.noDataImg" :noDataTip="emptyItems.noDataTip" :showImg="!isNestTable"></NoData>
+          <NoData
+            :noDataImg="emptyItems.noDataImg"
+            :noDataTip="emptyItems.noDataTip"
+            :showImg="!isNestTable"
+          ></NoData>
         </div>
       </template>
       <!-- 修复 vxe-table升级3.x版本 原自定义checkbox样式失效 -->
@@ -148,7 +148,7 @@
 
 <script>
 import Vue from 'vue';
-import VueXss from "vue-xss";
+import VueXss from 'vue-xss';
 import TextOverTooltip from './components/TextOverTooltip.vue';
 import AutoLayoutButton from './components/AutoLayoutButton.vue';
 import { Icon, Tooltip, Progress, Switch, Popover, Button, Dropdown, Menu, Checkbox, Input, Popconfirm } from 'ant-design-vue';
@@ -197,10 +197,7 @@ export default create({
   mixins: [format, batchEditing, nestTable],
   props: Object.assign({}, bigTableProps),
   beforeCreate() {
-    Vue.use(Button)
-      .use(Checkbox)
-      .use(Input)
-      .use(DomPortal);
+    Vue.use(Button).use(Checkbox).use(Input).use(DomPortal);
     !this.$xss && Vue.use(VueXss);
   },
   mounted() {
@@ -295,10 +292,10 @@ export default create({
       return this.primaryKey || 'theUniqueKey';
     },
     handlePrimaryKey() {
-      return this.isTree > 0 ? this.primaryKey || "theUniqueKey" : "theUniqueKey";
+      return this.isTree > 0 ? this.primaryKey || 'theUniqueKey' : 'theUniqueKey';
     },
     handleName() {
-      return function(item, key = 'name') {
+      return function (item, key = 'name') {
         return item.alias || item[key];
       };
     },
@@ -358,20 +355,20 @@ export default create({
       return { startIndex: startIndex < 0 ? 0 : startIndex };
     },
     isScanMultiTable() {
-      return this.columnConfig?.isScanMultiTable
+      return this.columnConfig?.isScanMultiTable;
     },
-    tableNoSetting(){
+    tableNoSetting() {
       let { noSetting } = this.getOtherConfigInit() || {};
       return noSetting || this.showSettings?.hideSettingBtn == 1 || this.isTableEdit;
     },
     // 行编辑字段map
-    listFormUnionSettingMap(){
+    listFormUnionSettingMap() {
       let paramsList = this?.listFormUnionSetting?.paramsList || {};
       let tableFieldMap = {};
-      paramsList.forEach(v=>{
+      paramsList.forEach(v => {
         tableFieldMap[v.tableField] = v;
-      })
-      return tableFieldMap
+      });
+      return tableFieldMap;
     }
   },
   watch: {
@@ -384,11 +381,11 @@ export default create({
         const newV = {};
         for (let i in v) {
           if (typeof v[i] === 'number') {
-            newV[i] = v[i]
+            newV[i] = v[i];
           } else {
-            newV[i] = JSON.parse(JSON.stringify(v[i] || ""));
+            newV[i] = JSON.parse(JSON.stringify(v[i] || ''));
           }
-          if (newV[i] && typeof v[i] === "string" && !newV[i].includes('security-code')) {
+          if (newV[i] && typeof v[i] === 'string' && !newV[i].includes('security-code')) {
             newV[i] = this.$xss(v[i]);
           }
         }
@@ -397,13 +394,13 @@ export default create({
       this.loadData(list);
     },
     quickSearchConfig: {
-      handler: function() {
+      handler: function () {
         this.setFilterStatus();
       },
       deep: true
     },
     tableDataCache: {
-      handler: function(val) {
+      handler: function (val) {
         this.setAllCheckedRows(val);
       },
       deep: true
@@ -461,7 +458,7 @@ export default create({
           }
         });
       }
-    },
+    }
     // isEditAllRow:{
     //   handler(val){
     //     // 全部行编辑需要隐藏“操作”列
@@ -475,7 +472,7 @@ export default create({
     // }
   },
   methods: {
-    customerInit(){
+    customerInit() {
       this.loadColumn(this.columnConfig);
       this.loadData(this.data);
     },
@@ -571,7 +568,7 @@ export default create({
     resetTableInlineEditStatus() {
       if (!this.checkOperateCurrentTable()) return false;
       // 编辑中，不重置样式
-      if(this.defaultEditAllRow || this.isEditAllRow || this.isInlineEditing|| this.isBatchEditing) return false;
+      if (this.defaultEditAllRow || this.isEditAllRow || this.isInlineEditing || this.isBatchEditing) return false;
       this.handleClickCancelBtnByInline();
     },
     setChecklist(list) {
@@ -616,7 +613,6 @@ export default create({
       this.resetTableInlineEditStatus();
 
       this.isLoadColumn = true;
-
     },
     setTableConfig(config) {
       this.showButtonTop = config.showButtonTop;
@@ -720,15 +716,15 @@ export default create({
     // 日期显示格式化
     getDate(row, item) {
       let obj = row[item.columnName];
-      let style = {}
+      let style = {};
       // fillColor 有值代表背景色
       if (obj?.fillColor) {
-        style.background = obj.fillColor
-        style.color = '#fff'
-        style.padding = "0 2px"
+        style.background = obj.fillColor;
+        style.color = '#fff';
+        style.padding = '0 2px';
       }
       if (obj?.background) {
-        style.color = obj.background
+        style.color = obj.background;
       }
       if (!vexutils.isEmpty(obj)) {
         if (vexutils.isObject(obj) && 'tooltip' in obj) {
@@ -877,18 +873,38 @@ export default create({
           key = temp.tooltip || temp.value; // temp.tooltip 日期的处理
         }
       }
-      let isEdit = (this.isBatchEditing || this.isInlineEditing || this.isInlineAdding);
+      let isEdit = this.isBatchEditing || this.isInlineEditing || this.isInlineAdding;
 
-      let f =  isEdit ? this.listFormUnionSettingMap[item.columnName] ? disabled : true : disabled;
+      let f = isEdit ? (this.listFormUnionSettingMap[item.columnName] ? disabled : true) : disabled;
 
-      function switchClick(e){
-          e.stopPropagation();
+      function switchClick(e) {
+        e.stopPropagation();
       }
-      return [<div onClick={switchClick} style="display: inline-block;"><a-switch checked={key == item.btnLinkSwitchDefVal} disabled={f} on-change={e => this.switchBtnOnChange(e, row, item, index)} /></div>];
+      return [
+        <div onClick={switchClick} style="display: inline-block;">
+          <a-switch checked={key == item.btnLinkSwitchDefVal} disabled={f} on-change={e => this.switchBtnOnChange(e, row, item, index)} />
+        </div>
+      ];
+    },
+    // 提示文案
+    handleValueTips(row, item) {
+      let { columnName } = item;
+      let { __originItem__ } = row;
+      if (__originItem__ && vexutils.isJSON(__originItem__)) {
+        __originItem__ = JSON.parse(__originItem__);
+      }
+      if (!columnName || !__originItem__) return;
+      let originValue = __originItem__[columnName];
+      if (!originValue) return;
+      if (typeof originValue !== 'string' || !originValue.startsWith('###{')) return;
+      let temp = JSON.parse(originValue.replace('###', ''));
+      if (!temp || !temp.tips) return;
+      return temp.tips;
     },
     // 字段显示 jsx
     getField(row, item, index, isLink) {
       const html = formatFieldText(row, item, this.columnConfig.fieldList, this.fieldListOriginal);
+      let tips = this.handleValueTips(row, item);
 
       const content = [isLink && html ? <a on-click={e => this.linkDetail(row, item, index, e)} domPropsInnerHTML={html} /> : <span class="domPropsInnerHTML-span" domPropsInnerHTML={html} />];
 
@@ -907,6 +923,16 @@ export default create({
           </a-popover>
         ];
       } else {
+        if (tips) {
+          return [
+            <a-tooltip>
+              <template slot="title">
+                <span domPropsInnerHTML={tips}> </span>
+              </template>
+              {content}
+            </a-tooltip>
+          ];
+        }
         return [content];
       }
     },
@@ -983,7 +1009,7 @@ export default create({
     },
     // 按钮 jsx
     getFoldBtnList(row, index) {
-      if (this.isRowEditing) return
+      if (this.isRowEditing) return;
       return [
         (row.foldBtnList?.length && (
           <a-dropdown style={{ display: !row.__isInlineEditing ? 'inline-block' : 'none' }} disabled={this.isInlineOperating}>
@@ -1022,30 +1048,16 @@ export default create({
 
       return [
         <span>
-          <a-button
-            style={{ display: row.__isInlineEditing ? 'inline-block' : 'none' }}
-            on-click={this.setBatchSaveRowStatus}
-            title="保存"
-            class="btn-custom-class row-btn"
-            type="link"
-            size="small"
-          >
+          <a-button style={{ display: row.__isInlineEditing ? 'inline-block' : 'none' }} on-click={this.setBatchSaveRowStatus} title="保存" class="btn-custom-class row-btn" type="link" size="small">
             保存
           </a-button>
-          <a-button
-            style={{ display: row.__isInlineEditing ? 'inline-block' : 'none' }}
-            on-click={this.setBatchCancelRowStatus}
-            title="取消"
-            class="btn-custom-class row-btn"
-            type="link"
-            size="small"
-          >
+          <a-button style={{ display: row.__isInlineEditing ? 'inline-block' : 'none' }} on-click={this.setBatchCancelRowStatus} title="取消" class="btn-custom-class row-btn" type="link" size="small">
             取消
           </a-button>
         </span>
       ];
     },
-    setBatchSaveRowStatus(e){
+    setBatchSaveRowStatus(e) {
       e.stopPropagation();
       let { btnName, tipsMsg, isTips } = this.curBatchBtnData || {};
       let _this = this;
@@ -1061,8 +1073,7 @@ export default create({
         onOk: () => {
           _this.$emit('setBatchSaveRowStatus', true);
         },
-        onCancel() {
-        }
+        onCancel() {}
       });
     },
     setBatchCancelRowStatus(e) {
@@ -1071,7 +1082,7 @@ export default create({
     },
     checkOperateCurrentTable() {
       if (this.isNestTable) return false;
-      if(this.defaultEditAllRow) return true;
+      if (this.defaultEditAllRow) return true;
       let id = this.inlineEditCurrentOperateBtnId;
       let find = this.btnList?.find(item => {
         return item?.settingObj?.[0]?.obj_id === id;
@@ -1231,7 +1242,7 @@ export default create({
           );
         }
       };
-      let checkVisible = isBatchSelect == 1 && !this.isNestTable && !isScanMultiTable && !this.isInlineOperating || false;
+      let checkVisible = (isBatchSelect == 1 && !this.isNestTable && !isScanMultiTable && !this.isInlineOperating) || false;
       let columns = [
         {
           fixed: 'left',
@@ -1240,7 +1251,7 @@ export default create({
           width: '50',
           slots: {
             header: () => {
-              return "操作";
+              return '操作';
             },
             default: this.scanMultiOperate
           }
@@ -1268,9 +1279,9 @@ export default create({
           // slots: selectType === 'checkbox' ? checkboxSlot : null,
           // 修复 vxe-table升级3.x版本 原自定义checkbox样式失效
           slots:
-            selectType === "checkbox"
+            selectType === 'checkbox'
               ? {
-                  checkbox: "tooltip_checkbox"
+                  checkbox: 'tooltip_checkbox'
                 }
               : null,
           showOverflow: true
@@ -1293,20 +1304,20 @@ export default create({
         let type = index === 0 && this.showNestTable ? 'expand' : '';
 
         // 扫码打开的table只展示
-        if(isScanMultiTable) {
-          fixed = "";
+        if (isScanMultiTable) {
+          fixed = '';
           sortable = false;
           treeNode = false;
-          type = "";
+          type = '';
         }
         // 行编辑不展示排序
-        if(this.isInlineOperating){
+        if (this.isInlineOperating) {
           sortable = false;
         }
 
         const col = Object.assign(item, {
           // 全部行编辑 隐藏“操作”
-          visible: item.columnName == 'operatorColumn' ? this.isEditAllRow ?  false : showButtonTop == 0 : item.isShow == 1,
+          visible: item.columnName == 'operatorColumn' ? (this.isEditAllRow ? false : showButtonTop == 0) : item.isShow == 1,
           field: item.columnName,
           title: this.handleName(item, 'title'),
           minWidth: item.colWidth,
@@ -1318,7 +1329,7 @@ export default create({
 
           headerClassName: 'mycolumn', // 文本溢出处理('tooltip' vxe-table当前版本存在bug)
           // showHeaderOverflow: "title",
-          showOverflow:  item.columnName == 'operatorColumn'? false: 'title',
+          showOverflow: item.columnName == 'operatorColumn' ? false : 'title',
           treeNode: treeNode,
           type: type,
           slots: {
@@ -1352,7 +1363,6 @@ export default create({
           col.slots.header = this.toolTipTitle(item);
         }
 
-
         if (!isScanMultiTable) {
           col.slots.footer = 'tooltip_footer';
         }
@@ -1417,7 +1427,7 @@ export default create({
     },
     setFilterStatus() {
       // 表头没有过滤字段 不需要设置
-      if(!this.filterFields || !Object.keys(this.filterFields).length) return;
+      if (!this.filterFields || !Object.keys(this.filterFields).length) return;
       let val = this.quickSearchConfig;
 
       if (!val || !val.length) {
@@ -1437,7 +1447,6 @@ export default create({
         let itemKey = item.field_key;
         // 参与搜索的字段必须在 filterFields中
         if (itemKey in this.filterFields) {
-
           if (!this.filterFields[item.field_key]) {
             this.$set(this.filterFields[item.field_key], 'CONVERT', []);
             return false;
@@ -1613,7 +1622,7 @@ export default create({
       return mergeConObj;
     },
     handleFilter(field) {
-      let conObj = this.mergeConObjFn()
+      let conObj = this.mergeConObjFn();
       this.$emit('onSave', conObj, false, [], [], { isBigTable: true });
       field.visible = false;
     },
@@ -1622,33 +1631,56 @@ export default create({
     },
     handleFilterEmpty(field, columnName) {
       this.filterFields[columnName].CONVERT = [];
-      let conObj = this.mergeConObjFn()
+      let conObj = this.mergeConObjFn();
 
       this.$emit('onSave', conObj, false, [], [], { isBigTable: true });
       field.visible = false;
     },
-    toolTipTitle(item, type) {
-      // let feildDescribe =
-      //   (item.fieldSetting && this.$t(item.fieldSetting?.feildDescribeI18n)) ||
-      //   item.fieldSetting?.feildDescribe ||
-      //   "";
+    handleCommonTooltipTitle(item, type) {
       let name = item.formTitle || item.alias || item.title;
-      // let tooltipTitle = feildDescribe || item.alias;
       let tooltipTitle = item.alias;
       let isAlias = false;
       if (this.tableOptions?.dataSourceType == 'guage') {
         tooltipTitle = item.alias || item.title;
       }
-      if (name&& tooltipTitle && name !== tooltipTitle) {
+      if (name && tooltipTitle && name !== tooltipTitle) {
         isAlias = !!tooltipTitle;
       }
-      if (type === 'format') return <text-over-tooltip refName={'item-' + item[this.handleRowId]} tooltipTitle={tooltipTitle} content={name} isAlias={isAlias} />;
-      return () => {
-        return [
+
+      let fieldSetting = item.fieldSetting;
+      if (fieldSetting && vexutils.isJSON(fieldSetting)) {
+        fieldSetting = JSON.parse(fieldSetting);
+      }
+      let { feildDescribeI18n, feildDescribe } = fieldSetting || {};
+
+      let showTitleFeildDescribe = feildDescribe || feildDescribeI18n;
+      let titleFeildDescribe = '';
+      if (showTitleFeildDescribe) {
+        titleFeildDescribe = (feildDescribeI18n && this.$root.$t(feildDescribeI18n)) || feildDescribe;
+      }
+      return (
+        <div class={['table-title-wrap', { 'table-title-wrap-describe': showTitleFeildDescribe }]}>
+          {showTitleFeildDescribe && (
+            <a-tooltip placement="bottom">
+              <template slot="title">
+                <span domPropsInnerHTML={titleFeildDescribe}> </span>
+              </template>
+              <a-icon style="margin-right: 2px" type="question-circle" />
+            </a-tooltip>
+          )}
           <text-over-tooltip refName={'item-' + item[this.handleRowId]} tooltipTitle={tooltipTitle} content={name} isAlias={isAlias}>
-            {item.treeNode && this.isTree == 1 ? <a-icon type={this.isExpand && this.total < 1001 ? 'caret-down' : 'caret-right'} onClick={e => this.triggerExpand(e, this.isExpand)} /> : ''}
+            {type !== 'format' && item.treeNode && this.isTree == 1 ? (
+              <a-icon type={this.isExpand && this.total < 1001 ? 'caret-down' : 'caret-right'} onClick={e => this.triggerExpand(e, this.isExpand)} />
+            ) : (
+              ''
+            )}
           </text-over-tooltip>
-        ];
+        </div>
+      );
+    },
+    toolTipTitle(item) {
+      return () => {
+        return [this.handleCommonTooltipTitle(item)];
       };
     },
 
@@ -1658,7 +1690,7 @@ export default create({
       return () => {
         return [
           <div class="filter-box">
-            {this.toolTipTitle(item, 'format')}
+            {this.handleCommonTooltipTitle(item, 'format')}
             <i
               class={['vxe-filter--icon', 'vxe-filter--btn', 'vxe-icon--funnel', { active: field.visible || field.filterSort }, { checked: field.CONVERT?.length }]}
               onClick={event => this.showFilter(field, item.columnName, event)}
@@ -1707,7 +1739,7 @@ export default create({
                 )}
                 <div class="checkbox-box">
                   <div class="checkbox-wrap js-checkbox-wrap" style={{ height: this.filterHeight + this.distance + 'px' }}>
-                    {!field.searchFilterText ? (
+                    {!field.searchFilterText && (field.advanceOptionSetting) != '0' ? (
                       <div class="ant-checkbox-group">
                         <a-checkbox
                           indeterminate={field.indeterminate}
@@ -1861,8 +1893,10 @@ export default create({
         checkboxWrapEl.scrollTop = tableScrollTop;
       });
     },
-    handleFilterChange(value, name, field) {
+    handleFilterChange(newValue, name, field) {
       this.reScrollFilterWrap();
+      let value = newValue;
+      value = this.getSingleConvert(value,this.filterFields[name].CONVERT,field);
       this.filterFields[name].CONVERT = value;
 
       field.checkAll = value.length === field.setting.showSetting.length;
@@ -1876,7 +1910,12 @@ export default create({
         let addItems = value.filter(item => {
           return !beforeSearchConvert.includes(item);
         });
-        this.filterFields[columnName].CONVERT.push(...addItems);
+        if(field.advanceOptionSetting == '0'){
+          if(Array.isArray(this.filterFields[columnName].CONVERT)){
+            this.filterFields[columnName].CONVERT.length = 0;
+          }
+        }
+          this.filterFields[columnName].CONVERT.push(...addItems);
       } else {
         let removeItems = beforeSearchConvert.filter(item => {
           return !value.includes(item);
@@ -1886,8 +1925,11 @@ export default create({
         });
       }
 
-      field.searchFilterCONVERT = value;
-      beforeSearchConvert = vexutils.clone(value, true);
+      let newValue = value;
+      newValue = this.getSingleConvert(newValue,field.searchFilterCONVERT,field);
+
+      field.searchFilterCONVERT = newValue;
+      beforeSearchConvert = vexutils.clone(newValue, true);
     },
     showFilter(field, columnName, event) {
       if (this.isInlineOperating) return false;
@@ -1909,7 +1951,7 @@ export default create({
         field.left = btnRectLeft + 'px';
       }
 
-      field.top = (btnRectTop + FILTER_BOX_TOP_OFFSET) + (this.filterTopOffset || 0)+ 'px';
+      field.top = btnRectTop + FILTER_BOX_TOP_OFFSET + (this.filterTopOffset || 0) + 'px';
 
       field.visible = !field.visible;
 
@@ -1918,20 +1960,20 @@ export default create({
       field.indeterminate = !!len && len !== field.setting.showSetting.length;
       field.searchFilterText = '';
     },
-    scanMultiOperate(params){
+    scanMultiOperate(params) {
       return [
-        <a-popconfirm ok-text={'确认'} cancel-text={'取消'} title={'是否确认删除？'} on-confirm={() =>this.confirmScanMulti(params)}>
+        <a-popconfirm ok-text={'确认'} cancel-text={'取消'} title={'是否确认删除？'} on-confirm={() => this.confirmScanMulti(params)}>
           <svg-icon class="scan-multi-delete" iconClass="shanchu" />
         </a-popconfirm>
-      ]
+      ];
     },
     /**
      * 删除选中scan数据
      */
-    confirmScanMulti(params){
-      let{row, $rowIndex} = params || {}
-      if(!row) return;
-      this.$emit("scanMultiRemove", $rowIndex, params)
+    confirmScanMulti(params) {
+      let { row, $rowIndex } = params || {};
+      if (!row) return;
+      this.$emit('scanMultiRemove', $rowIndex, params);
       let vxeTable = this.$refs.xGrid;
       vxeTable.remove(row);
     },
@@ -1940,7 +1982,7 @@ export default create({
       let { row, column, $rowIndex } = params;
       let own = column?._own || column?.own || col;
       let attrType = own?.attrType || '';
-      let fieldType = own?.fieldType || ""
+      let fieldType = own?.fieldType || '';
       // 批量行编辑
       let formUnionItem = this.showEditForm(row, column, $rowIndex);
       if (formUnionItem) {
@@ -2012,19 +2054,17 @@ export default create({
         return this.getOrCode(row, own, attrType);
       }
       let value = row[own.columnName];
-      if(attrType === 'MONEY' && fieldType== "NUMBER" && vexutils.isNumber(value)){
+      if (attrType === 'MONEY' && fieldType == 'NUMBER' && vexutils.isNumber(value)) {
         return value.toFixed(2);
       }
 
       if (column.property === 'operatorColumn') {
         if (this.showButtonTop != 0 || (this.isBatchEditing && !this.isRowEditing)) return;
 
-        if(this.rowBtnAutoLayout && !this.isRowEditing){
-      // 行内列表按钮改为自适应。
-        let filterList = Array.isArray(row.btnList)? row.btnList.filter((btn) => btn.isShow == '1' && btn.type != 'LINK') : [];
-        return [
-          <AutoLayoutButton btnList={filterList} row={row} index={$rowIndex} on-clickBtn={(...arg)=>this.clickBtn(...arg)} />
-        ]
+        if (this.rowBtnAutoLayout && !this.isRowEditing) {
+          // 行内列表按钮改为自适应。
+          let filterList = Array.isArray(row.btnList) ? row.btnList.filter(btn => btn.isShow == '1' && btn.type != 'LINK') : [];
+          return [<AutoLayoutButton btnList={filterList} row={row} index={$rowIndex} on-clickBtn={(...arg) => this.clickBtn(...arg)} />];
         }
         // 行编辑
         const inlineBtnList = this.generateInlineBtnList(row, $rowIndex);
@@ -2032,8 +2072,8 @@ export default create({
         const foldBtnList = this.getFoldBtnList(row, $rowIndex);
         return [
           <span>
-            {this.rowBtnAutoLayout? null: tileBtnList}
-            {this.rowBtnAutoLayout? null: foldBtnList}
+            {this.rowBtnAutoLayout ? null : tileBtnList}
+            {this.rowBtnAutoLayout ? null : foldBtnList}
             {inlineBtnList}
           </span>
         ];
@@ -2067,7 +2107,7 @@ export default create({
       if (!imageArr || !imageArr.length) return curSrc;
       let matchItem = imageArr.find(item => item.type === type);
       if (!matchItem) return curSrc;
-      if(matchItem.suffix) return curSrc + matchItem.suffix
+      if (matchItem.suffix) return curSrc + matchItem.suffix;
       let h = matchItem.h;
       let w = matchItem.w;
       if (matchItem.h === 'adaptive' && matchItem.w != 'adaptive') {
@@ -2622,9 +2662,9 @@ export default create({
       this.$emit('setNestTableClick', this.isNestTable);
       this.$emit('setCurRowIndex', index);
       this.$emit('clickBtn', row, btn, row[this.handlePrimaryKey], index);
-      let trigger_type = btn.settingObj?.[0]?.trigger_type
-      if(trigger_type === "EDIT_ROW") {
-        this.checkedRows = [row]
+      let trigger_type = btn.settingObj?.[0]?.trigger_type;
+      if (trigger_type === 'EDIT_ROW') {
+        this.checkedRows = [row];
       }
     },
     recordClickBtnInfo(row, index) {
@@ -2746,13 +2786,21 @@ export default create({
       };
       if (this.isTree == 2) {
         const { tableId, page, pageSize, autograph, isTreeOrList } = this.tableParams;
+        const { extraParams = {} } = this.listCountParams || {};
+        let tempExtra = {};
+        if (vexutils.isJSON(extraParams)) {
+          tempExtra = JSON.parse(extraParams);
+        }
+        // 20220725 测试要求懒加载树请求时带上父级的extraParams
         const params = {
           levelLazyLoadPrimaryKeyValue: row[this.primaryKey],
           tableId,
           page,
           pageSize,
           autograph,
-          isTreeOrList
+          isTreeOrList,
+          extraParams,
+          ...tempExtra
         };
 
         return this.getAsyncTableData(params).then(({ data }) => {
@@ -2827,14 +2875,14 @@ export default create({
       let t = '';
       let IS_MONEY = 'MONEY' === this.getFieldAttrType(column);
       if (vexutils.has(this.sumData, column.property)) {
-      let val =  vexutils.round(Number(this.sumData[column.property]), 4)
+        let val = vexutils.round(Number(this.sumData[column.property]), 4);
         t += `<p class="table-footer-tooltip-label-wrap">
           <span class="table-footer-tooltip-label">求和：</span>
-          ${ IS_MONEY ? val.toFixed(2) : val}
+          ${IS_MONEY ? val.toFixed(2) : val}
         </p>`;
       }
       if (vexutils.has(this.avgData, column.property)) {
-        let val = vexutils.round(Number(this.avgData[column.property]), 4)
+        let val = vexutils.round(Number(this.avgData[column.property]), 4);
         t += `<p class="table-footer-tooltip-label-wrap">
           <span class="table-footer-tooltip-label">平均值：</span>
           ${IS_MONEY ? val.toFixed(2) : val}</p>`;
@@ -2845,7 +2893,7 @@ export default create({
     getFooterTitle(column) {
       let IS_MONEY = 'MONEY' === this.getFieldAttrType(column);
       if (vexutils.has(this.sumData, column.property)) {
-        let val =  vexutils.round(Number(this.sumData[column.property]), 2);
+        let val = vexutils.round(Number(this.sumData[column.property]), 2);
         return IS_MONEY ? val.toFixed(2) : val;
       }
       if (vexutils.has(this.avgData, column.property)) {
@@ -2854,9 +2902,9 @@ export default create({
       }
       return null;
     },
-    getFieldAttrType(column){
+    getFieldAttrType(column) {
       let fieldKeyMap = this?.fieldKeyMap || {};
-      let field =  fieldKeyMap[column.property];
+      let field = fieldKeyMap[column.property];
       return field?.attrType || field?.settingObj?.attr;
     },
     refreshTable() {
@@ -2968,6 +3016,22 @@ export default create({
       vxeTable.loadData(this.originFormatList);
       this.$emit('triggerSpinning', false);
       this.$emit('handlerClickRow', formatData[0], oldIndex);
+    },
+
+    /**
+     * 映射值如果配置了单选，限制只能选一个
+     */
+    getSingleConvert(value,old,field){
+      let cValue = value;
+      if(!Array.isArray(old) || !Array.isArray(value)) return cValue;
+      // 单选
+      if((field.advanceOptionSetting) == '0' && (value?.length || 0)>1){
+        cValue = cValue.filter(v=> !old?.includes?.(v));
+        if(cValue.length > 1){
+          return [cValue[0]]
+        }
+      }
+        return cValue;
     }
   }
 });