fix: eta1.8.9条件格式

src/api/modules/chartApi.js

@@ -1060,8 +1060,31 @@ const dataBaseInterface = {
 	//从社区撤回
 	chartWithdrawFromForum:params=>{
 		return http.post('/datamanage/chart_info/forum/delete',params)
-	}
-	
+	},
+	// 管理规则列表
+	getRuleList:params=>{
+		return http.get('/datamanage/excel_info/rule/list',params)
+	},
+	//添加管理规则
+	excelRuleAdd:params=>{
+		return http.post('/datamanage/excel_info/rule/add',params)
+	},
+	//编辑管理规则
+	excelRuleEdit:params=>{
+		return http.post('/datamanage/excel_info/rule/edit',params)
+	},
+	// 管理规则详情
+	ruleDetail:params=>{
+		return http.get('/datamanage/excel_info/rule/detail',params)
+	},
+	//删除管理规则
+	excelRuleDelete:params=>{
+		return http.post('/datamanage/excel_info/rule/delete',params)
+	},
+	//批量设置保存获取
+	moreSetGetList:params=>{
+		return http.post('/datamanage/excel_info/table/batch_edb_data_list',params)
+	},
 }
 
 /* 我的图库 */

src/lang/modules/ETATables/En.js

@@ -1,7 +1,6 @@
 export default {
   /* 在线EXCEL */
   OnlineExcelPage: {
-    conditional_format:'Conditional format',
     add_excel_btn: "Add excel spreadsheet",
     add_timeline_table_btn: "Add a timeline table",
     add_mixed_table_btn: "Add mixed table",
@@ -96,7 +95,13 @@ export default {
     y_limit:'Vertical axis limits',
     time_serial:'Time Series',
     value_serial:'numerical sequence',
-    not_allow_edit:'Currently not editable'
+    not_allow_edit:'Currently not editable',
+    batch_settings:'Batch settings',
+    metrics:'Metrics',
+    forecast_metrics:'Forecast Metrics',
+    please_select_metric_name:'Please select a metric name',
+    move_successful:'Move successful',
+    no_found_search:'The indicator was not found in the search',
   },
 
   /* 自定义分析  */
@@ -139,7 +144,6 @@ export default {
   },
 
   ETableChildren: {
-    save_btn:'save',
     date_calculation_btn: "Date calculation",
     select_date_pld: "Select Date",
     add_more_dates: "Add more dates",
@@ -195,4 +199,54 @@ export default {
     save_static_table:'Save as a static table',
     only_edit:'Editable',
   },
+
+  /* 混合表  */
+  MixSheet:{
+    save_btn:'save',
+    font_color:'Font color',
+    fill_color:'Fill color',
+    conditional_format:'Conditional formatting',
+    greater_than:'Greater than',
+    less_than:'Less than',
+    between:'Between',
+    equal_to:'Equal to',
+    occurrence_date:'Occurrence date',
+    manage_rules:'Manage rules',
+    enter_number:'Enter number/Select numeric cell',
+    set_to:'Set to',
+    lrf_drt:'Light red fill with dark red text',
+    yf_dyt:'Yellow fill with dark yellow text',
+    gf_dgt:'Green fill with dark green text',
+    lrf:'Light red fill',
+    rt:'Red text',
+    custom:'Custom',
+    apply_selection:'Apply selection',
+    background_color:'Fill color',
+    text_color:'Font color',
+    cancel_btn:'Cancel',
+    and:'and',
+    today:'Today',
+    tomorrow:'Tomorrow',
+    last_7_days:'Last 7 days',
+    last_week:'Last week',
+    this_week:'This week',
+    next_week:'Next week',
+    last_month:'Last month',
+    this_month:'This month',
+    next_month:'Next month',
+    rule:'Rule',
+    operation:'Operation',
+    edit:'Edit',
+    delete:'Delete',
+    please_choose:'Please choose',
+    please_c_or_i:'Please input or choose apply selection',
+    please_set:'Please set',
+    add_sheet_format:'After saving the spreadsheet, you can use the conditional formatting feature',
+    add_text:'Add success',
+    edit_text:'Edit success',
+    delete_text:'Delete success',
+    apply_selection_error:'There is an issue with the selected range settings, please check',
+    parameter_error:'Parameter settings are abnormal, please check',
+    please_select_the_area:'Please select the area'
+  }
 };

src/lang/modules/ETATables/Zh.js

@@ -1,7 +1,6 @@
 export default {
   /* 在线EXCEL */
   OnlineExcelPage: {
-    conditional_format:'条件格式',
     add_excel_btn: "添加Excel表格",
     add_timeline_table_btn: "添加时间序列表格",
     add_mixed_table_btn: "添加混合表格",
@@ -96,7 +95,13 @@ export default {
     y_limit:'纵轴上下限',
     time_serial:'时间序列',
     value_serial:'数值序列',
-    not_allow_edit:'当前不可编辑'
+    not_allow_edit:'当前不可编辑',
+    batch_settings:'批量设置',
+    metrics:'指标',
+    forecast_metrics:'预测指标',
+    please_select_metric_name:'请选择指标名称',
+    move_successful:'移动成功',
+    no_found_search:'未搜索到该指标',
   },
 
   /* 自定义分析  */
@@ -139,7 +144,6 @@ export default {
   },
 
   ETableChildren: {
-    save_btn:'保存',
     date_calculation_btn: "日期计算",
     select_date_pld: "选择日期",
     add_more_dates: "添加更多日期",
@@ -208,4 +212,54 @@ export default {
     only_edit:'只看可编辑',
     
   },
+
+  /* 混合表  */
+  MixSheet:{
+    save_btn:'保存',
+    font_color:'字体颜色',
+    fill_color:'颜色填充',
+    conditional_format:'条件格式',
+    greater_than:'大于',
+    less_than:'小于',
+    between:'介于',
+    equal_to:'等于',
+    occurrence_date:'发生日期',
+    manage_rules:'管理规则',
+    enter_number:'输入数字/选择数值单元格',
+    set_to:'设置为',
+    lrf_drt:'浅红色填充色深红色文本',
+    yf_dyt:'黄填充色深黄色文本',
+    gf_dgt:'绿填充色深绿色文本',
+    lrf:'浅红色填充',
+    rt:'红色文本',
+    custom:'自定义',
+    apply_selection:'应用选区',
+    background_color:'填充色',
+    text_color:'文本颜色',
+    cancel_btn:'取消',
+    and:'至',
+    today:'今天',
+    tomorrow:'明天',
+    last_7_days:'最近7天',
+    last_week:'上周',
+    this_week:'本周',
+    next_week:'下周',
+    last_month:'上月',
+    this_month:'本月',
+    next_month:'下月',
+    rule:'规则',
+    operation:'操作',
+    edit:'编辑',
+    delete:'删除',
+    please_choose:'请选择',
+    please_c_or_i:'请输入或选择应用选区',
+    please_set:'请设置',
+    add_sheet_format:'保存表格后可使用条件格式功能',
+    add_text:'添加成功',
+    edit_text:'修改成功',
+    delete_text:'删除成功',
+    apply_selection_error:'应用选区设置异常，请检查',
+    parameter_error:'参数设置异常，请检查',
+    please_select_the_area:'请选择选区'
+  }
 };

src/utils/sortMove.js

@@ -0,0 +1,26 @@
+export default {
+    bind(el, binding, vnode) {
+        el.draggable = true;
+
+        el.addEventListener('dragstart', (event) => {
+            event.dataTransfer.setData('text/plain', binding.value);
+            el.classList.add('dragging');
+        });
+
+        el.addEventListener('dragend', () => {
+            el.classList.remove('dragging');
+        });
+
+        el.addEventListener('dragover', (event) => {
+            event.preventDefault();
+        });
+
+        el.addEventListener('drop', (event) => {
+            event.preventDefault();
+            const draggedIndex = event.dataTransfer.getData('text/plain');
+            const droppedIndex = binding.value;
+
+            vnode.context.handleDrop({ draggedIndex, droppedIndex });
+        });
+    }
+};

src/views/chartRelevance_manage/components/selectTarget.vue

@@ -85,7 +85,7 @@
       clearable
       :disabled="isDisabled"
       :placeholder="$t('Edb.InputHolderAll.select_edb_name')"
-      :style="`width: ${width}; ${filter?'margin-top: 20px':''}`"
+      :style="`width: ${showMoreBtn?'auto':width}; ${filter?'margin-top: 20px':''}`"
       :remote-method="searchHandle"
       @click.native="inputFocusHandle"
       @change="handleSelectTarget"
@@ -112,6 +112,7 @@
         </edbDetailPopover>
       </el-option>
     </el-select>
+    <slot name="moreBtn"></slot>
   </div>
 </template>
 
@@ -145,6 +146,9 @@ export default {
       selectBoxWidth:{
         default:''
       },
+      showMoreBtn:{
+        default:false
+      }
     },
     watch:{
       defaultId(){

src/views/datasheet_manage/components/BalanceTable.vue

@@ -5,6 +5,7 @@
       <toolBarSection
         v-if="!disabled"
         :cell="selectCell?selectCell:mergeSelectedCells" @cellMerge="toolCellMergeFun"
+        @openConDialog="openConDialog"
         :echoParameter="{hasMergedCell}"
       />
 
@@ -25,6 +26,7 @@
           <div style="padding:20px;background-color: #fff;" @mouseleave="endSelection">
           <div class="table-wrap">
             <table
+              id="myTable"
               width="auto"
               border="0"
               class="table"
@@ -72,6 +74,8 @@
                     :data-key="cell.Uid"
                     :data-datarindex="index"
                     :data-datacindex="cell_index"
+                    :style="cell.ShowStyle?getShowCss(cell.ShowStyle):{}"
+                    :initIndex="initIndex(index,cell_index,rowHeader[index],columnHeader[cell_index])"
                     v-show="!cell.merData || cell.merData.type!=='merged'"
                     :colspan="(cell.merData && cell.merData.type=='merge' && cell.merData.mer)?cell.merData.mer.colspan || 1:1"
                     :rowspan="(cell.merData && cell.merData.type=='merge' && cell.merData.mer)?cell.merData.mer.rowspan || 1:1"
@@ -151,7 +155,7 @@
                         :data-datacindex="cell_index"
                         :data-key="cell.Uid"
                       >
-                        {{ cell.ShowFormatValue }}
+                       {{isShowFormat(cell.ShowStyle)?cell.ShowFormatValue:cell.DataTime?cell.ShowValue:[7,5].includes(cell.DataType)?cell.ShowValue:cell.Value}}
                       </span>
 
                       <span
@@ -390,6 +394,14 @@
       :ExcelInfoId="activeSheetId"
       @success="addChartSuccess"
     />
+
+    <condition-dia
+      :chooseCell="selectCell?selectCell:mergeSelectedCells"
+      ref="conditionDia" 
+      @changeRule="getExcelRule"
+      @deleteRule="deleteExcelRule"
+      @editRule="editExcelRule"
+    />
   </div>
 </template>
 <script>
@@ -424,12 +436,14 @@ import calculateDateDia from './calculateDateDia.vue';
 import toolBarSection from './toolBarSection.vue';
 import { formulaTip } from '@/views/dataEntry_manage/databaseComponents/util';
 import BalanceAddChart from './BalanceAddChart.vue';
+import conditionDia from './conditionDia.vue'
 import BalanceSheetChartItem from './BalanceSheetChartItem.vue';
-
+import conditionTableMixin from "../mixins/conditionTableMixin.js"
 let autoSaveInterval=null;//自动保存定时器
 let dblclickInterval=null;//双击事件的定时器 为了解决同一个元素双击事件重复触发单击事件的问题
 
 export default {
+  mixins:[conditionTableMixin],
   props: {
     disabled: { //是否只预览
       type: Boolean,
@@ -441,6 +455,7 @@ export default {
     }
   },
   components: {
+    conditionDia,
     selectTargetValueDia,
     insertDateDia,
     calculateEdbDia,
@@ -565,7 +580,9 @@ export default {
       },
       // 做个缓存
       cacheKey:'',
-      cacheCellDom:{}
+      cacheCellDom:{},
+      //规则列表
+      excelRuleList:[]
     };
   },
   watch:{
@@ -594,6 +611,20 @@ export default {
     clearInterval(autoSaveInterval)
   },
   methods: {
+    // 获取规则
+    async getExcelRule(){
+      const res = await dataBaseInterface.getRuleList({ExcelInfoId:this.activeSheetId})
+      // console.log(res)
+      if(res.Ret !== 200) return
+      this.excelRuleList = res.Data.List?res.Data.List:[];
+      this.commonInitCell()
+    },
+    
+    // 打开选择条件格式弹框
+    openConDialog({chooseItem,chooseCells}){
+      this.$refs.conditionDia.openDialog(chooseItem,chooseCells,this.excelRuleList,this.activeSheetId)
+    },
+
     // 获取图表数据
     async getChartList(){
       const res = await sheetInterface.getBalanceChartData({
@@ -1211,6 +1242,7 @@ export default {
 
       //判断是否是有插入值的依赖单元格 更新值或重置关系
       this.checkCellRelation(cell)
+      this.commonInitCell('edit')
     },
 
     /* 当前单元格是否和插入值有关联 无就不管 */
@@ -1562,7 +1594,7 @@ export default {
         haveIndex !== -1 && this.insertRelationArr.splice(haveIndex, 1)
         resetRelationStyle();
       }
-
+      this.commonInitCell('edit')
     },
 
     /* 清除单元格内容 格式 关联关系 */
@@ -1866,6 +1898,7 @@ export default {
       this.insertTargetCell.Value = str;
       this.insertTargetCell.EdbInfoId = 0;
       this.insertTargetCell.DataTime = insertValue;
+      this.commonInitCell('edit')
     },
 
     /* 指标计算弹窗 */
@@ -1924,6 +1957,7 @@ export default {
         haveIndex !== -1 && this.insertRelationArr.splice(haveIndex, 1)
         resetRelationStyle();
       }
+      this.commonInitCell('edit')
     },
 
     /* 日期计算弹窗 */
@@ -1954,6 +1988,7 @@ export default {
       this.insertTargetCell.ShowFormatValue = this.insertTargetCell.ShowStyle ? transDecimalPlace(insertValue, JSON.parse(this.insertTargetCell.ShowStyle)) : '';
 
       this.$message.success(this.$t('ETable.Msg.insertion_success_msg'))
+      this.commonInitCell('edit')
     },
 
     /* 初始化8行5列 */
@@ -1982,6 +2017,9 @@ export default {
       }
       this.$nextTick(() => {
         this.hasInit = true
+        if(this.activeSheetId){
+          this.getExcelRule()
+        }
       })
     },
 

src/views/datasheet_manage/components/CustomTable.vue

@@ -509,9 +509,11 @@ export default {
     };
   },
   methods: {
-
+    clearStyle(){
+      this.config.data.length&&resetStyle()
+    },
     /* 选择指标后push新数据 */
-    updateEdbData(edb) {
+    updateEdbData(edb,save=true) {
       this.config.data.push(edb);
 
       //如果有文本行 文本行的数据长度也要增加
@@ -527,7 +529,7 @@ export default {
             
         })
       }
-      if(!this.disabled && this.hasInit){
+      if(!this.disabled && this.hasInit&&save){
         this.$emit("autoSave")
       }
     },

src/views/datasheet_manage/components/MixedTable.vue

@@ -125,7 +125,7 @@
                 :data-datacindex="cell_index"
                 :data-key="cell.Uid"
               >
-                {{isShowFormat(cell.ShowStyle)?cell.ShowFormatValue:cell.DataTime?cell.ShowValue:cell.Value}}
+                {{isShowFormat(cell.ShowStyle)?cell.ShowFormatValue:cell.DataTime?cell.ShowValue:[7,5].includes(cell.DataType)?cell.ShowValue:cell.Value}}
               </span>
 
               <span
@@ -244,7 +244,13 @@
       @insert="insertCalculateDateValue"
     />
 
-    <condition-dia :chooseCell="selectCell?selectCell:selectedCells" ref="conditionDia" />
+    <condition-dia
+      :chooseCell="selectCell?selectCell:selectedCells"
+      ref="conditionDia" 
+      @changeRule="getExcelRule"
+      @deleteRule="deleteExcelRule"
+      @editRule="editExcelRule"
+    />
   </div>
 </template>
 <script>
@@ -279,7 +285,9 @@ import calculateDateDia from './calculateDateDia.vue';
 import toolBarSection from './toolBarSection.vue';
 import conditionDia from './conditionDia.vue'
 import { formulaTip } from '@/views/dataEntry_manage/databaseComponents/util';
+import conditionTableMixin from "../mixins/conditionTableMixin.js"
 export default {
+  mixins:[conditionTableMixin],
   props: {
     disabled: { //是否只预览
       type: Boolean,
@@ -422,41 +430,28 @@ export default {
       },
       // 做个缓存
       cacheKey:'',
-      cacheCellDom:{}
+      cacheCellDom:{},
+      //规则列表
+      excelRuleList:[]
     };
   },
   mounted() {
     if(this.$route.path === '/addMixedSheet' && !this.$route.query.id) this.initData();
   },
   methods: {
-    //获取字母对应下标
-    getColumnHeaderIndex(code){
-       return code.charCodeAt() - 65;
-    },
-    getCellIndices(table, startRow, endRow, startCol, endCol) {
-      const indices = [];
-      for (let i = startRow; i <= endRow; i++) {
-        for (let j = startCol; j <= endCol; j++) {
-          const cell = table.rows[i].cells[j];
-          indices.push({ row: i, col: j, index: cell });
-        }
-      }
-      return indices;
+    // 获取规则
+    async getExcelRule(ExcelInfoId='',){
+      const res = await dataBaseInterface.getRuleList({ExcelInfoId:ExcelInfoId?ExcelInfoId:this.$route.query.id})
+      // console.log(res)
+      if(res.Ret !== 200) return
+      this.excelRuleList = res.Data.List?res.Data.List:[];
+      this.commonInitCell()
     },
-    // 打开选择条件格式弹框
+
     openConDialog({chooseItem,chooseCells}){
-      this.$refs.conditionDia.openDialog(chooseItem.label,chooseCells)
-      // 使用示例
-      const table = document.getElementById('myTable'); // 假设你有一个id为'myTable'的表格
-      const startRow = 3; // 从第几行开始
-      const endRow = 4; // 到第几行结束
-      const startCol = 3; // 从第几列开始
-      const endCol = 4; // 到第几列结束
-      
-      const cellIndices = this.getCellIndices(table, startRow, endRow, startCol, endCol);
-      console.log(cellIndices);
+      this.$refs.conditionDia.openDialog(chooseItem,chooseCells,this.excelRuleList,this.$route.query.id)
     },
-
+    
     /* 输入时实时搜索 满足日期格式不搜索 有=视为输入公式不搜索  eta1.5.6弃用了*/
     async searchTarget(query,cb) {
       return cb([])
@@ -483,37 +478,6 @@ export default {
       let arr = DataType===2 ? [res.Data] : (res.Data.List||[])
       cb(arr);
     },
-    // 由于在showStyle做了背景色及字体颜色处理，解决判断冲突
-    isShowFormat(style,type='css'){
-      const styleCss=JSON.parse(style)
-      let tag=type==='css'?styleCss.pn>0:style.EdbInfoId
-      return tag
-    },
-    // 初始化单元格横纵坐标
-    initIndex(rindex,cindex,row,col){
-      this.config.data[rindex][cindex]['colIndex']=col
-      this.config.data[rindex][cindex]['rowIndex']=row
-      if(rindex==3&&cindex==3){
-        const styleCss=JSON.parse(this.config.data[3-1][3-1].ShowStyle)
-        this.config.data[3-1][3-1].ShowStyle=JSON.stringify({
-            ...styleCss,
-            glObj:{
-            'color':'green',
-            'background-color':'black'
-          }
-        })
-      }
-    },
-    // 设置背景色及字体颜色
-    getShowCss(style){
-      const styleCss=JSON.parse(style)
-      let color=styleCss.glObj?styleCss.glObj['color']:styleCss['color']
-      let bgcolor=styleCss.glObj?styleCss.glObj['background-color']:styleCss['background-color']
-      return {
-        'color':color,
-        'background-color':bgcolor
-      }
-    },
 
     /* 单击 */
     clickCell(e, cell) {
@@ -717,6 +681,8 @@ export default {
 
       //判断是否是有插入值的依赖单元格 更新值或重置关系
       this.checkCellRelation(cell)
+      this.commonInitCell('edit')
+
     },
 
     /* 当前单元格是否和插入值有关联 无就不管 */
@@ -848,7 +814,6 @@ export default {
           }
         })
       })
-       
     },
 
     //关联类型7的指标计算单元格值刷新
@@ -1070,7 +1035,7 @@ export default {
         haveIndex!==-1 && this.insertRelationArr.splice(haveIndex,1)
         resetRelationStyle();
       }
-
+      this.commonInitCell('edit')
     },
 
     /* 
@@ -1291,8 +1256,7 @@ export default {
       let startMainKey=''
 
       let row = new Array(this.columnHeader.length).fill("").map((_,cindex) => {
-
-        let isEnlargeCell = !!(this.config.data[index][cindex].merData && this.config.data[checkIndex][cindex] && this.config.data[checkIndex][cindex].merData)
+        let isEnlargeCell = !!(this.config.data[index][cindex].merData &&(this.config.data[checkIndex]&&this.config.data[checkIndex][cindex]) && this.config.data[checkIndex][cindex].merData)
         if(isEnlargeCell && startMainKey != this.config.data[index][cindex].merData.mer.sKey){
           const data = this.config.data[index][cindex].merData.type == 'merge'?
                       this.config.data[index][cindex]:
@@ -1376,6 +1340,7 @@ export default {
       this.insertTargetCell.Value = str;
       this.insertTargetCell.EdbInfoId = 0;
       this.insertTargetCell.DataTime = insertValue;
+      this.commonInitCell('edit')
     },
 
     /* 指标计算弹窗 */
@@ -1436,6 +1401,7 @@ export default {
         haveIndex!==-1 && this.insertRelationArr.splice(haveIndex,1)
         resetRelationStyle();
       }
+      this.commonInitCell('edit')
     },
 
     /* 日期计算弹窗 */
@@ -1466,6 +1432,7 @@ export default {
       this.insertTargetCell.ShowFormatValue = this.insertTargetCell.ShowStyle ? transDecimalPlace(insertValue,JSON.parse(this.insertTargetCell.ShowStyle)) : '';
 
       this.$message.success(this.$t('ETable.Msg.insertion_success_msg'))
+      this.commonInitCell('edit')
     },
 
     /* 初始化8行5列 */
@@ -1492,6 +1459,9 @@ export default {
       }
       this.$nextTick(()=>{
         this.hasInit=true
+        if(this.$route.query.id){
+          this.getExcelRule()
+        }
       })
     },
 

src/views/datasheet_manage/components/batchSetDia.vue

@@ -0,0 +1,154 @@
+<template>
+    <div class="batch-set-dialog">
+        <el-dialog :visible.sync="isOpenDialog" :close-on-click-modal="false" :modal-append-to-body="false"
+            :title="$t('OnlineExcelPage.batch_settings')" @close="cancelHandle" custom-class="dialog" center
+            width="560px" v-dialogDrag>
+            <div class="dialog-main">
+                <selectTarget ref="selectRef" @select="handleSelectTarget" :selectStyleType="3">
+                </selectTarget>
+                <div class="dialog-main-content">
+                    <div class="content-list" v-if="searchList.length">
+                        <div class="content-list-item flex-align" v-sortMove="index"
+                            @dragstart="setDraggingIndex(index)" @dragend="clearDraggingIndex"
+                            v-for="(item, index) in searchList" :key="index">
+                            <div class="content-list-item-left flex-align">
+                                <img style="margin-right: 8px;" class="img-icon"
+                                    src="~@/assets/img/cus_sheet/icon-move.png" alt="">
+                                {{ currentLang === 'en' ? item.EdbNameEn : item.EdbName }}
+                            </div>
+                            <img class="img-icon" @click="deleteHandle(index)"
+                                src="~@/assets/img/cus_sheet/icon-delete.png" alt="">
+                        </div>
+                    </div>
+                    <tableNoData v-else :text="$t('OnlineExcelPage.no_found_search')" />
+                </div>
+            </div>
+
+            <div class="dia-bot">
+                <el-button type="primary" plain @click="cancelHandle">{{
+                    $t("ETable.Btn.cancel_btn")
+                }}</el-button>
+                <el-button type="primary" style="margin-right: 20px" @click="saveHandle">{{ $t("ETable.Btn.save_btn")
+                    }}</el-button>
+            </div>
+        </el-dialog>
+    </div>
+</template>
+<script>
+import sortMove from '@/utils/sortMove';
+import selectTarget from '@/views/chartRelevance_manage/components/selectTarget.vue';
+export default {
+    components: { selectTarget },
+    directives: {
+        sortMove
+    },
+    watch: {
+        searchList: {
+            handler(newval) {
+
+            }
+        }
+    },
+    computed: {
+
+    },
+    data() {
+        return {
+            isOpenDialog: false,
+            searchList: [],
+            draggingIndex: null,
+            firstId: ''
+        };
+    },
+    computed: {
+        currentLang() {
+            return this.$store.state.lang
+        }
+    },
+    methods: {
+        handleDrop({ draggedIndex, droppedIndex }) {
+            const draggedItem = this.searchList[draggedIndex];
+            this.searchList.splice(draggedIndex, 1);
+            this.searchList.splice(droppedIndex, 0, draggedItem);
+            this.$message({
+                message: this.$t("OnlineExcelPage.move_successful"),
+                type: 'success'
+            });
+        },
+        setDraggingIndex(index) {
+            this.draggingIndex = index;
+        },
+        clearDraggingIndex() {
+            this.draggingIndex = null;
+        },
+        // 删除选中
+        deleteHandle(index) {
+            this.searchList.splice(index, 1)
+        },
+        // 保存
+        async saveHandle() {
+            this.cancelHandle()
+            this.$emit('moreSetSave', this.searchList, this.firstId)
+        },
+        // 选中
+        handleSelectTarget(item) {
+            // console.log(item)
+            if (item) {
+                this.searchList.push(item)
+            }
+        },
+        // 打开弹框
+        openDialog(array) {
+            // console.log(array)
+            if (array.length) {
+                this.firstId = array[0].EdbInfoId
+            }
+            this.searchList = JSON.parse(JSON.stringify(array))
+            this.isOpenDialog = true;
+        },
+        // 关闭弹框
+        cancelHandle() {
+            this.$refs.selectRef.search_txt = ''
+            this.isOpenDialog = false;
+        },
+    },
+};
+</script>
+<style lang="scss" scoped>
+.batch-set-dialog {
+    .dialog-main {
+        .dialog-main-content {
+            .content-list {
+
+                .content-list-item {
+                    padding: 13px 0;
+                    border-bottom: 1px solid #C8CDD9;
+                    justify-content: space-between;
+
+                    .content-list-item-left {
+                        font-family: PingFang SC;
+                        font-size: 14px;
+                        font-weight: 400;
+                    }
+                }
+            }
+        }
+    }
+
+    .img-icon {
+        width: 16px;
+        height: 16px;
+    }
+
+    .dia-bot {
+        margin: 52px 0 30px;
+        display: flex;
+        justify-content: center;
+    }
+
+    .flex-align {
+        display: flex;
+        align-items: center;
+    }
+}
+</style>

src/views/datasheet_manage/components/conditionDia.vue

@@ -1,116 +1,105 @@
 <template>
-  <div  v-dialogDrag v-if="isOpenDialog">
-    <div class="condition-dialog el-dialog">
+  <div v-dialogDrag v-if="isOpenDialog">
+    <div class="condition-dialog el-dialog" style="width:522px">
       <div class="header el-dialog__header">
         <span>{{
-          $t("OnlineExcelPage.conditional_format") + "-" + chooseType
+          $t("MixSheet.conditional_format") + "-" + chooseTitleObj[chooseType]
         }}</span>
         <i class="el-icon-close" @click="cancelHandle" />
       </div>
 
-      <div class="main">
-        <el-form
-          hide-required-asterisk
-          :model="ruleForm"
-          :rules="rules"
-          ref="ruleForm"
-          label-width="90px"
-          class="demo-ruleForm"
-        >
-          <div class="flex-align">
-            <el-form-item :label="chooseType" prop="pdzleft">
-              <el-input
-                @focus="momentRef = 'pdzleftRef'"
-                ref="pdzleftRef"
-                style="width: 100%"
-                v-model="ruleForm.pdzleft"
-              ></el-input>
-            </el-form-item>
-            <template v-if="chooseType == '介于'">
-              <span style="margin: 0 10px 22px">到</span>
-              <el-form-item
-                class="right-form-item"
-                label-width="0"
-                label=""
-                prop="pdzright"
-              >
-                <el-input
-                  @focus="momentRef = 'pdzrightRef'"
-                  ref="pdzrightRef"
-                  style="width: 100%"
-                  v-model="ruleForm.pdzright"
-                ></el-input>
+      <div class="main" :style="{'padding-top':chooseType==6?'30px':'10px'}">
+        <el-form v-if="chooseType != 6" hide-required-asterisk :model="ruleForm" :rules="rules" ref="ruleForm"
+          class="demo-ruleForm" label-position="top">
+          <el-form-item :label="chooseTitleObj[chooseType]">
+            <div class="flex-align value-box">
+              <el-form-item label-width="0" label="" :rules="chooseType == 5 ? rules.fsrqval : rules.LeftValue"
+                prop="LeftValue">
+                <el-select v-if="chooseType == 5" style="width:100%" v-model="ruleForm.LeftValue"
+                  :placeholder="$t('MixSheet.please_choose')">
+                  <el-option v-for="item in dateSel" :key="item.value" :label="item.label" :value="item.value">
+                  </el-option>
+                </el-select>
+                <el-input :placeholder="$t('MixSheet.enter_number')" v-else style="width:100%"
+                  @focus="momentRef = 'LeftValueRef'" ref="LeftValueRef" v-model="ruleForm.LeftValue"></el-input>
               </el-form-item>
-            </template>
-            <el-form-item label="设置为" prop="szw">
-              <el-select
-                style="width: 100%"
-                @change="changeColorSel"
-                v-model="ruleForm.szw"
-                placeholder="请设置样式"
-              >
-                <el-option
-                  v-for="(color, colorIndex) in colorSelect"
-                  :key="colorIndex"
-                  :label="color.label"
-                  :value="color.value"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </div>
-          <div class="flex-align">
-            <el-form-item label="应用选区" prop="yyxq">
-              <el-input
-                @focus="momentRef = 'yyxqRef'"
-                ref="yyxqRef"
-                style="width: 100%"
-                v-model="ruleForm.yyxq"
-              ></el-input>
-            </el-form-item>
-            <el-form-item
-              v-if="ruleForm.szw === '自定义'"
-              label="填充色"
-              prop="bgColor"
-            >
-              <div class="flex-align">
-                <div class="flex-align">
-                  <el-color-picker
-                    v-model="ruleForm.bgColor"
-                    show-alpha
-                  ></el-color-picker>
-                  <div class="flex-align">
-                    <div
-                      style="
-                        width: 90px;
-                        text-align: right;
-                        padding-right: 12px;
-                      "
-                    >
-                      文本颜色
-                    </div>
-                    <el-color-picker
-                      v-model="ruleForm.fontColor"
-                      show-alpha
-                    ></el-color-picker>
-                  </div>
-                </div>
+              <template v-if="chooseType == 3">
+                <span style="margin:0 9px;">{{ $t("MixSheet.and") }}</span>
+                <el-form-item label-width="0" label="" prop="RightValue">
+                  <el-input :placeholder="$t('MixSheet.enter_number')" @focus="momentRef = 'RightValueRef'"
+                    ref="RightValueRef" style="width:100%" v-model="ruleForm.RightValue"></el-input>
+                </el-form-item>
+              </template>
+            </div>
+          </el-form-item>
+          <el-form-item :label="$t('MixSheet.set_to')" prop="Remark">
+            <el-select style="width:100%" @change="changeColorSel" v-model="ruleForm.Remark"
+              :placeholder="$t('MixSheet.please_set')">
+              <el-option v-for="color in colorSelect" :key="color.label" :label="color.label"
+                :value="color.value"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item :label="$t('MixSheet.apply_selection')" prop="Scope">
+            <el-input :placeholder="$t('MixSheet.please_c_or_i')" @focus="momentRef = 'ScopeRef'" ref="ScopeRef"
+              style="width:100%" v-model="ruleForm.Scope"></el-input>
+          </el-form-item>
+          <el-form-item label-position="left" v-if="ruleForm.Remark === '自定义'" label="" label-width="0"
+            prop="BackgroundColor">
+            <div class="flex-align">
+              <div style="margin-right:10px;">
+                {{ $t("MixSheet.background_color") }}
               </div>
-            </el-form-item>
-          </div>
+              <el-color-picker v-model="ruleForm.BackgroundColor" show-alpha></el-color-picker>
+              <div style="margin:0 10px 0 40px;">
+                {{ $t("MixSheet.text_color") }}
+              </div>
+              <el-color-picker v-model="ruleForm.FontColor" show-alpha></el-color-picker>
+            </div>
+          </el-form-item>
         </el-form>
+        <div class="dialog-table-box" v-else>
+          <el-table :data="diaRuleList" :header-cell-style="{
+            background: '#F6F7FA',
+            'text-align': 'center',
+          }" border style="width: 100%">
+            <el-table-column align="center" :label="$t('MixSheet.rule')">
+              <template slot-scope="scope">
+                <template v-if="scope.row.RuleType != 5">
+                  {{ chooseTitleObj[scope.row.RuleType] }}{{ scope.row.LeftValue }}<span
+                    v-if="scope.row.RuleType == 3">{{
+                      $t("MixSheet.and") }}{{ scope.row.RightValue }}</span>
+                </template>
+                <template v-else>
+                  {{ dateSel.find(el=>el.value==scope.row.LeftValue).label }}
+                </template>
+              </template>
+            </el-table-column>
+            <el-table-column align="center" prop="ScopeShow" :label="$t('MixSheet.apply_selection')">
+            </el-table-column>
+            <el-table-column align="center" :label="$t('MixSheet.operation')" width="150">
+              <template slot-scope="scope">
+                <el-button @click="handleEdit(scope.row)" type="text" size="small">{{ $t("MixSheet.edit") }}</el-button>
+                <el-button style="color: #f56c6c" @click="handleDelete(scope.row, scope.$index)" type="text"
+                  size="small">{{ $t("MixSheet.delete") }}</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
       </div>
-      <section class="bot">
+      <section class="bot" v-if="chooseType != 6">
         <el-button type="primary" plain @click="cancelHandle">{{
-          $t("ETable.Btn.cancel_btn")
+          $t("MixSheet.cancel_btn")
         }}</el-button>
         <el-button type="primary" @click="saveHandle">{{
-          $t("ETableChildren.save_btn")
+          $t("MixSheet.save_btn")
         }}</el-button>
       </section>
     </div>
   </div>
 </template>
 <script>
+import { dataBaseInterface } from "@/api/api.js";
+
 export default {
   props: {
     chooseCell: {
@@ -120,17 +109,17 @@ export default {
   watch: {
     chooseCell: {
       handler(nval) {
-        console.log(nval, this.momentRef);
         if (nval && this.momentRef) {
-          if (this.momentRef == "yyxqRef") {
+          // console.log(nval, this.momentRef);
+          if (this.momentRef == "ScopeRef") {
             this.chooseArray = Array.isArray(nval) ? nval : [nval];
             this.formatXq(this.chooseArray);
           } else {
-            console.log(!Array.isArray(nval));
+            // console.log(!Array.isArray(nval));
             if (!Array.isArray(nval)) {
               this.formatXq(
                 [nval],
-                this.momentRef === "pdzleftRef" ? "pdzleft" : "pdzright"
+                this.momentRef === "LeftValueRef" ? "LeftValue" : "RightValue"
               );
             }
           }
@@ -139,124 +128,266 @@ export default {
       deep: true,
     },
   },
-  data() {
-    var validateValue = (rule, value, callback) => {
-      const regex1 = /^\$[A-Z]+\$[1-9][0-9]*$/;
-      if (value === "") {
-        callback(new Error("请输入数字或选择数值单元格"));
-      } else if (regex1.test(value) || Number.isFinite(+value)) {
-        callback();
-      } else {
-        callback(new Error("请输入数字或选择数值单元格"));
-      }
-    };
-    var validateYyxq = (rule, value, callback) => {
-      const regex1 = /^\$[A-Z]+\$[1-9][0-9]*$/;
-      const regex2 = /^\$[A-Z]+\$[1-9][0-9]*:\$[A-Z]+\$[1-9][0-9]*$/;
-      if (value === "") {
-        callback(new Error("请选择数值单元格"));
-      } else if (regex1.test(value) || regex2.test(value)) {
-        callback();
-      } else {
-        callback(new Error("单元格格式不正确"));
-      }
-    };
-    return {
-      chooseType: "",
-      isOpenDialog: false,
-      chooseArray: [],
-      colorSelect: [
+  computed: {
+    colorSelect() {
+      return [
         {
-          label: "浅红色填充色深红色文本",
-          value: "rgb(254,67,101)-rba(252,157,154)", //前为文本颜色，后为填充色
+          label: this.$t("MixSheet.lrf_drt"),
+          value: "rgb(254,67,101)-rgb(252,157,154)", //前为文本颜色，后为填充色
         },
         {
-          label: "黄填充色深黄色文本",
-          value: "rgb(255,255,224)-rba(255,215,0)",
+          label: this.$t("MixSheet.yf_dyt"),
+          value: "rgb(255,255,224)-rgb(255,215,0)",
         },
         {
-          label: "绿填充色深绿色文本",
-          value: "rgb(0,100,0)-rba(0,255,0)",
+          label: this.$t("MixSheet.gf_dgt"),
+          value: "rgb(0,100,0)-rgb(0,255,0)",
         },
         {
-          label: "浅红色填充",
-          value: "''-rba(252,157,154)",
+          label: this.$t("MixSheet.lrf"),
+          value: "-rgb(252,157,154)",
         },
         {
-          label: "红色文本",
-          value: "rgb(255, 0, 0)-''",
+          label: this.$t("MixSheet.rt"),
+          value: "rgb(255, 0, 0)-",
         },
         {
-          label: "自定义格式...",
+          label: this.$t("MixSheet.custom"),
           value: "自定义",
         },
-      ],
-      ruleForm: {
-        pdzleft: "",
-        pdzright: "",
-        szw: "rgb(254,67,101)-rba(252,157,154)",
-        fontColor: "rgb(254,67,101)",
-        bgColor: "rba(252,157,154)",
-        yyxq: "",
-      },
-      rules: {
-        pdzleft: [
+      ];
+    },
+    dateSel() {
+      return [
+        {
+          label: this.$t("MixSheet.today"),
+          value: "today",
+        },
+        {
+          label: this.$t("MixSheet.tomorrow"),
+          value: "tomorrow",
+        },
+        {
+          label: this.$t("MixSheet.last_7_days"),
+          value: "last7days",
+        },
+        {
+          label: this.$t("MixSheet.last_week"),
+          value: "lastweek",
+        },
+        {
+          label: this.$t("MixSheet.this_week"),
+          value: "thisweek",
+        },
+        {
+          label: this.$t("MixSheet.next_week"),
+          value: "nextweek",
+        },
+        {
+          label: this.$t("MixSheet.last_month"),
+          value: "lastmonth",
+        },
+        {
+          label: this.$t("MixSheet.this_month"),
+          value: "thismonth",
+        },
+        {
+          label: this.$t("MixSheet.next_month"),
+          value: "nextmonth",
+        },
+      ];
+    },
+    chooseTitleObj() {
+      return {
+        1: this.$t("MixSheet.greater_than"),
+        2: this.$t("MixSheet.less_than"),
+        3: this.$t("MixSheet.between"),
+        4: this.$t("MixSheet.equal_to"),
+        5: this.$t("MixSheet.occurrence_date"),
+        6: this.$t("MixSheet.manage_rules"),
+      };
+    },
+    rules() {
+      const validateValue = (rule, value, callback) => {
+        const regex1 = /^\$[A-Z]+\$[1-9][0-9]*$/;
+        if (value === "") {
+          callback(new Error(this.$t("MixSheet.enter_number")));
+        } else if (regex1.test(value) || Number.isFinite(+value)) {
+          callback();
+        } else {
+          callback(new Error(this.$t("MixSheet.parameter_error")));
+        }
+      };
+      const validateScope = (rule, value, callback) => {
+        const regex1 = /^\$[A-Z]+\$[1-9][0-9]*$/;
+        const regex2 = /^\$[A-Z]+\$[1-9][0-9]*:\$[A-Z]+\$[1-9][0-9]*$/;
+        if (value === "") {
+          callback(new Error(this.$t("MixSheet.please_c_or_i")));
+        } else if (regex1.test(value) || regex2.test(value)) {
+          callback();
+        } else {
+          callback(new Error(this.$t("MixSheet.apply_selection_error")));
+        }
+      };
+      return {
+        fsrqval: [
           {
             required: true,
-            message: "请输入数字或选择数值单元格",
+            message: this.$t("MixSheet.please_choose"),
+            trigger: "change",
+          },
+        ],
+        LeftValue: [
+          {
+            required: true,
+            message: this.$t("MixSheet.enter_number"),
             trigger: ["blur", "change"],
           },
           { validator: validateValue, trigger: "blur" },
         ],
-        pdzright: [
+        RightValue: [
           {
             required: true,
-            message: "请输入数字或选择数值单元格",
+            message: this.$t("MixSheet.enter_number"),
             trigger: ["blur", "change"],
           },
           { validator: validateValue, trigger: "blur" },
         ],
-        szw: [{ required: true, message: "请选择样式", trigger: "change" }],
-        yyxq: [
+        Remark: [
+          {
+            required: true,
+            message: this.$t("MixSheet.please_choose"),
+            trigger: "change",
+          },
+        ],
+        Scope: [
           {
             required: true,
-            message: "请输入或选择应用选区",
+            message: this.$t("MixSheet.please_c_or_i"),
             trigger: ["blur", "change"],
           },
-          { validator: validateYyxq, trigger: "blur" },
+          { validator: validateScope, trigger: "blur" },
         ],
+      };
+    },
+  },
+  data() {
+    return {
+      ExcelInfoId: 0,
+      diaRuleList: [],
+      ExcelRuleMappingId: 0,
+      chooseType: "",
+      isOpenDialog: false,
+      chooseArray: [],
+      ruleForm: {
+        LeftValue: "",
+        RightValue: "",
+        Remark: "rgb(254,67,101)-rgb(252,157,154)",
+        FontColor: "rgb(254,67,101)",
+        BackgroundColor: "rgb(252,157,154)",
+        Scope: "",
       },
     };
   },
   methods: {
+    // 编辑规则
+    async handleEdit(row) {
+      this.$nextTick(() => {
+        this.ruleForm = JSON.parse(
+          JSON.stringify({ ...row, Scope: row.ScopeShow })
+        );
+        this.chooseType = row.RuleType;
+        this.ExcelRuleMappingId = row.ExcelInfoRuleMappingId;
+      });
+    },
+    // 删除规则
+    async handleDelete(row, index) {
+      // console.log(index);
+      const res = await dataBaseInterface.excelRuleDelete({
+        ExcelRuleMappingId: row.ExcelInfoRuleMappingId,
+      });
+      // console.log(res);
+      if (res.Ret !== 200) return;
+      this.diaRuleList.splice(index, 1);
+      this.$message({
+        message: this.$t("MixSheet.delete_text"),
+        type: "success",
+      });
+      this.$emit("deleteRule", row);
+    },
     // 切换颜色选择
     changeColorSel(val) {
       const colorArr = val.split("-");
-      this.ruleForm.fontColor = val != "自定义" ? colorArr[0] : "";
-      this.ruleForm.bgColor = val != "自定义" ? colorArr[1] : "";
+      this.ruleForm.FontColor = val != "自定义" ? colorArr[0] : "";
+      this.ruleForm.BackgroundColor = val != "自定义" ? colorArr[1] : "";
     },
     // 保存
     saveHandle() {
       this.momentRef = "";
-      this.$refs["ruleForm"].validate((valid) => {
+      this.$refs["ruleForm"].validate(async (valid) => {
         if (valid) {
-          console.log(this.ruleForm);
+          const params = {
+            ...this.ruleForm,
+            ExcelRuleMappingId: +this.ExcelRuleMappingId,
+            ExcelInfoId: +this.ExcelInfoId,
+            RuleType: +this.chooseType,
+            LeftValueType:
+              this.chooseType == 5
+                ? 1
+                : Number.isFinite(+this.ruleForm.LeftValue)
+                  ? 1
+                  : 2,
+            RightValueType: this.ruleForm.RightValue
+              ? Number.isFinite(+this.ruleForm.RightValue)
+                ? 1
+                : 2
+              : 0,
+          };
+          let res = "";
+          if (this.ExcelRuleMappingId) {
+            res = await dataBaseInterface.excelRuleEdit(params);
+          } else {
+            res = await dataBaseInterface.excelRuleAdd(params);
+          }
+          // console.log(res);
+          if (res.Ret !== 200) return;
+          this.$message({
+            message: this.ExcelRuleMappingId
+              ? this.$t("MixSheet.edit_text")
+              : this.$t("MixSheet.add_text"),
+            type: "success",
+          });
+          if (this.ExcelRuleMappingId) {
+            this.$emit("editRule", { ...params, ScopeShow: params.Scope });
+          } else {
+            this.$emit("changeRule");
+          }
+          this.cancelHandle();
         } else {
           return false;
         }
       });
     },
     // 打开弹框
-    openDialog(type, array) {
+    openDialog(type, array, ruleList, id) {
+      if (this.isOpenDialog) {
+        this.cancelHandle();
+      }
+      this.ExcelRuleMappingId = 0;
       this.chooseType = type;
       this.isOpenDialog = true;
       this.chooseArray = array;
-      this.formatXq(this.chooseArray);
+      this.diaRuleList = ruleList;
+      this.ExcelInfoId = id;
+      if (type != 6) {
+        this.formatXq(this.chooseArray);
+      }
     },
-    formatXq(array, key = "yyxq") {
-      console.log(array);
+    formatXq(array, key = "Scope") {
+      // console.log(array, key);
       if (array.length < 2) {
-        this.ruleForm[key] = "$" + array[0].colIndex + "$" + array[0].rowIndex;
+        let str = "$" + array[0].colIndex + "$" + array[0].rowIndex;
+        this.$set(this.ruleForm, key, str);
       } else {
         let str = "";
         array.forEach((el, index) => {
@@ -269,22 +400,30 @@ export default {
               (index === 0 ? ":" : "");
           }
         });
-        this.ruleForm[key] = str;
+        this.$set(this.ruleForm, key, str);
       }
     },
     cancelHandle() {
       this.momentRef = "";
+      this.$refs.ruleForm && this.$refs.ruleForm.resetFields();
       this.isOpenDialog = false;
+      this.ruleForm = {
+        LeftValue: "",
+        RightValue: "",
+        Remark: "rgb(254,67,101)-rgb(252,157,154)",
+        FontColor: "rgb(254,67,101)",
+        BackgroundColor: "rgb(252,157,154)",
+      };
     },
     handleClickOutside(event) {
       let _this = this;
       // 检查点击是否发生在el-input外
       if (
-        this.$refs[_this.momentRef] &&
-        !this.$refs.pdzleftRef.$el.contains(event.target)
+        _this.$refs[_this.momentRef] &&
+        !_this.$refs.LeftValueRef.$el.contains(event.target)
       ) {
         // 如果是，则将焦点设置到当前el-input
-        this.$refs[_this.momentRef].focus();
+        _this.$refs[_this.momentRef].focus();
       }
     },
   },
@@ -300,15 +439,16 @@ export default {
 </script>
 <style lang="scss" scoped>
 @import "~@/styles/theme-vars.scss";
+
 .condition-dialog {
   background: #fff;
   position: fixed;
   top: 20%;
-  left: 50%;
-  width: 750px;
+  left: 45%;
   border-radius: 2px;
   box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3);
   z-index: 9999;
+
   .header {
     font-size: 16px;
     background: $theme-color;
@@ -317,6 +457,7 @@ export default {
     display: flex;
     align-content: center;
     justify-content: space-between;
+
     .el-icon-close {
       font-size: 20px;
       cursor: pointer;
@@ -324,27 +465,41 @@ export default {
   }
 
   .main {
-    padding: 20px;
+    padding: 30px 60px;
     max-height: calc(100vh - 350px);
     min-height: 300px;
     overflow-y: auto;
+
     .main-top {
       margin-bottom: 20px;
+
       .right-form-item {
         .el-form-item__error {
           padding-left: 20px;
         }
       }
+
     }
   }
+
   .bot {
     display: flex;
     justify-content: center;
     margin: 30px 0;
   }
+
   .flex-align {
     display: flex;
     align-items: center;
   }
 }
 </style>
+<style lang="scss">
+.condition-dialog {
+  .value-box {
+    .el-form-item {
+      flex: 1;
+    }
+  }
+}
+</style>

src/views/datasheet_manage/customSheetEdit.vue

@@ -6,7 +6,12 @@
           ref="selectRef"
           @select="handleSelectTarget"
           :selectStyleType="2"
-        />
+          :showMoreBtn="true"
+        >
+          <template v-slot:moreBtn>
+            <el-button plain style="margin-left: 20px;" type="primary" @click="moreSet">{{ $t('OnlineExcelPage.batch_settings') }}</el-button>
+          </template>
+        </selectTarget>
         <div>
           <div v-if="saveTime" style="color:#999999;margin-right:30px ;">
             {{$t('OnlineExcelPage.recent_save_time_info')}}{{ saveTime }}
@@ -116,6 +121,9 @@
 			:chartInfo="sheetForm"
 			@update="updateSheetSource"
 		/>
+
+    <!-- 批量设置弹框 -->
+     <batchSetDia ref="batchSetDia" @moreSetSave="moreSetSave" />
   </div>
 </template>
 
@@ -125,11 +133,12 @@ import { dataBaseInterface } from 'api/api.js';
 import {etaBaseConfigInterence} from '@/api/modules/etaBaseConfigApi.js';
 import selectTarget from '@/views/chartRelevance_manage/components/selectTarget.vue';
 import CustomTable from './components/CustomTable.vue'
+import batchSetDia from './components/batchSetDia.vue'
 import html2canvas from 'html2canvas';
 import chartSourceEditDia from '@/views/dataEntry_manage/components/chartSourceEditDialog.vue';
 
 export default {
-  components: { selectTarget,CustomTable,chartSourceEditDia},
+  components: { batchSetDia,selectTarget,CustomTable,chartSourceEditDia},
   beforeRouteEnter(to, from, next) {
     if(to.query.id){
       to.matched[1].name=`编辑表格`
@@ -192,6 +201,51 @@ export default {
     }
   },
   methods: {
+    // 打开批量设置弹框
+    moreSet(){
+      this.$refs.batchSetDia.openDialog(this.$refs.customTableRef.config.data)
+    },
+    
+    // 批量设置
+    async moreSetSave(list,firstId){
+      // console.log(list,firstId)
+      //false 第一项没发生变化
+      let tag=false
+      if(list.length){
+        tag=firstId!=list[0].EdbInfoId
+      }
+      const params = {
+          EdbInfoId: list.map(el => el.EdbInfoId),
+          Num:this.$refs.customTableRef.config.data.length?this.$refs.customTableRef.dateArr.length:12,
+          SortType: this.$refs.customTableRef.config.order===1 ? 'desc' : 'asc',
+          DateList:tag?[]:this.$refs.customTableRef.config.data.length? this.$refs.customTableRef.dateArr:[],
+      }
+      const res = await dataBaseInterface.moreSetGetList(params);
+      // console.log(res);
+      if (res.Ret !== 200) return;
+      this.sheetForm.SourcesFrom = this.setDefaultSource()
+      this.sheetSourceFrom = JSON.parse(this.sheetForm.SourcesFrom)
+      this.$refs.customTableRef.config.data=[]
+      this.$refs.customTableRef.config.textRowData = [];
+      this.$refs.customTableRef.clearStyle()
+      // console.log(this.$refs.customTableRef.config.data)
+      this.$nextTick(()=>{
+        res.Data.forEach((Data,index)=>{
+          this.updateSourceFrom(Data.ExcelSource)
+          let obj={
+            Data: Data.Data.map(_ => ({..._,DataTimeType: 1,})),
+            EdbAliasName: '',
+            EdbName:list[index].EdbName,
+            Unit:list[index].Unit,
+            EdbNameEn:list[index].EdbNameEn,
+            UnitEn:list[index].Frequency,
+            Frequency:list[index].Frequency,
+            EdbInfoId:list[index].EdbInfoId,
+          }
+          this.$refs.customTableRef.updateEdbData(obj,index==res.Data.length-1)
+        })
+      })
+    },
 
     backHandle() {
       this.$router.back()

src/views/datasheet_manage/mixins/conditionTableMixin.js

@@ -0,0 +1,280 @@
+export default {
+    methods: {
+        // 判断时间
+        isDateInRange(dateStr) {
+            const today = new Date();
+            const tomorrow = new Date(today);
+            tomorrow.setDate(today.getDate() + 1);
+            const sevenDaysAgo = new Date(today); // 当前日期的副本
+            sevenDaysAgo.setDate(sevenDaysAgo.getDate() - 7); // 减去6天
+            const date = new Date(dateStr);
+            const startOfWeek = new Date(
+                today.getFullYear(),
+                today.getMonth(),
+                today.getDate() - today.getDay() + 1
+            );
+            const lastWeekfristDay = new Date(
+                today.getFullYear(),
+                today.getMonth(),
+                today.getDate() - today.getDay() + 1
+            );
+            lastWeekfristDay.setDate(lastWeekfristDay.getDate() - 7);
+            const endOfWeek = new Date(
+                today.getFullYear(),
+                today.getMonth(),
+                today.getDate() + (7 - today.getDay())
+            );
+            const nextWeekLastDay = new Date(
+                today.getFullYear(),
+                today.getMonth(),
+                today.getDate() + (7 - today.getDay())
+            );
+            nextWeekLastDay.setDate(nextWeekLastDay.getDate() + 7);
+            const startOfMonth = new Date(today.getFullYear(), today.getMonth(), 1);
+            const startOfLastMonth = new Date(
+                today.getFullYear(),
+                today.getMonth() - 1,
+                1
+            );
+            const endOfMonth = new Date(today.getFullYear(), today.getMonth() + 1, 0);
+            const endOfNextMonth = new Date(
+                today.getFullYear(),
+                today.getMonth() + 2,
+                0
+            );
+            return {
+                today: date.toDateString() === today.toDateString(),
+                tomorrow: date.toDateString() === tomorrow.toDateString(),
+                thisweek: date >= startOfWeek && date <= endOfWeek,
+                lastweek: date < startOfWeek && date >= lastWeekfristDay,
+                nextweek: date > endOfWeek && date <= nextWeekLastDay,
+                thismonth: date >= startOfMonth && date <= endOfMonth,
+                lastmonth: date < startOfMonth && date >= endOfNextMonth,
+                nextmonth: date > endOfMonth && date <= endOfNextMonth,
+                last7days: date <= today && date > sevenDaysAgo,
+            };
+        },
+        // 删除规则
+        deleteExcelRule(item) {
+            // console.log(item);
+            this.commonInitCell("delete", [item]);
+        },
+        // 修改规则
+        editExcelRule(item) {
+            // console.log(item);
+            this.commonInitCell("editRule", [item]);
+        },
+        // 清空全部单元格样式
+        resetTableData() {
+            this.config.data.forEach((el) => {
+                el.forEach((item) => {
+                    const styleCss = item.ShowStyle
+                        ? JSON.parse(
+                            item.ShowStyle
+                        )
+                        : {};
+                    item.ShowStyle = JSON.stringify({
+                        ...styleCss,
+                        glObj: null,
+                    })
+                })
+            })
+        },
+        commonInitCell(initType = "change", rulist = this.excelRuleList) {
+            if (initType == 'edit') {
+                this.resetTableData()
+            }
+            // 获取表格
+            const table = document.getElementById("myTable");
+            rulist.forEach((el) => {
+                let indexArr = [];
+                if (el.ScopeShow.indexOf(":") > -1) {
+                    let rowCols = this.getRowsAndColumns(el.ScopeShow);
+                    // console.log(rowCols);
+                    if (rowCols.length === 2) {
+                        indexArr = this.getCellIndices(
+                            table,
+                            rowCols[0].row,
+                            rowCols[1].row,
+                            rowCols[0].column,
+                            rowCols[1].column
+                        );
+                    }
+                } else {
+                    indexArr = this.getRowsAndColumns(el.ScopeShow);
+                }
+                // console.log(indexArr);
+                indexArr.forEach((item) => {
+                    if (this.config.data[item.row - 1] && this.config.data[item.row - 1][item.column - 1]) {
+                        // 先判断类型然后取值，再去进行比较，符合再去设置样式 判断两个值都是数字
+                        const keyObj = {
+                            1: "ShowValue",
+                            3: "Value",
+                            5: "ShowValue",
+                        };
+                        const types =
+                            this.config.data[item.row - 1][item.column - 1].DataType;
+                        const cellValue = this.config.data[item.row - 1][item.column - 1];
+                        const val = cellValue[types == 3 ? "Value" : "ShowValue"];
+                        const leftVal =
+                            el.RuleType == 5
+                                ? el.LeftValue
+                                : Number.isFinite(+el.LeftValue)
+                                    ? el.LeftValue
+                                    : this.config.data[
+                                    this.getRowsAndColumns(el.LeftValue)[0].row - 1
+                                    ][this.getRowsAndColumns(el.LeftValue)[0].column - 1][
+                                    this.config.data[
+                                        this.getRowsAndColumns(el.LeftValue)[0].row - 1
+                                    ][this.getRowsAndColumns(el.LeftValue)[0].column - 1]
+                                        .DataType == 3
+                                        ? "Value"
+                                        : "ShowValue"
+                                    ];
+                        const rightVal = Number.isFinite(+el.RightValue)
+                            ? el.RightValue
+                            : this.config.data[
+                            this.getRowsAndColumns(el.RightValue)[0].row - 1
+                            ][this.getRowsAndColumns(el.RightValue)[0].column - 1][
+                            this.config.data[
+                                this.getRowsAndColumns(el.RightValue)[0].row - 1
+                            ][this.getRowsAndColumns(el.RightValue)[0].column - 1]
+                                .DataType == 3
+                                ? "Value"
+                                : "ShowValue"
+                            ];
+                        let tag = false;
+                        const regex = /^\d{4}-\d{2}-\d{2}$/;
+                        if (
+                            (Number.isFinite(+val) &&
+                                Number.isFinite(+leftVal) &&
+                                (el.RuleType == 3 && rightVal
+                                    ? Number.isFinite(+rightVal)
+                                    : true) &&
+                                el.RuleType != 5) ||
+                            (el.RuleType == 5 && regex.test(cellValue.ShowValue))
+                        ) {
+                            switch (+el.RuleType) {
+                                case 1:
+                                    if (+val > +leftVal) {
+                                        tag = true;
+                                    }
+                                    break;
+                                case 2:
+                                    if (+val < +leftVal) {
+                                        // console.log(+val < +leftVal);
+                                        tag = true;
+                                    }
+                                    break;
+                                case 3:
+                                    // console.log(el.RuleType, 3333);
+                                    if (+val >= +leftVal && +val <= +rightVal) {
+                                        tag = true;
+                                    }
+                                    break;
+                                case 4:
+                                    if (+val == +leftVal) {
+                                        tag = true;
+                                    }
+                                    break;
+                                case 5:
+                                    const dateRanges = this.isDateInRange(cellValue.ShowValue);
+                                    if (dateRanges[el.LeftValue]) {
+                                        tag = true;
+                                    }
+                                    break;
+                                default:
+                                    break;
+                            }
+                            // console.log(tag);
+                            const showStyle =
+                                this.config.data[item.row - 1][item.column - 1].ShowStyle;
+                            const styleCss = showStyle
+                                ? JSON.parse(
+                                    showStyle
+                                )
+                                : {};
+                            let glObj = tag
+                                ? {
+                                    color: el.FontColor ? el.FontColor : "#606266",
+                                    "background-color": el.BackgroundColor
+                                        ? el.BackgroundColor
+                                        : "#fff",
+                                }
+                                : initType == 'editRule' ? null : styleCss.glObj;
+                            if (initType == "delete") {
+                                glObj = null;
+                            }
+                            this.config.data[item.row - 1][item.column - 1].ShowStyle =
+                                JSON.stringify({
+                                    ...styleCss,
+                                    glObj,
+                                });
+                            if (["editRule", "delete"].includes(initType)) {
+                                this.getExcelRule();
+                            }
+                        }
+                    }
+                });
+            });
+        },
+        //获取选区及值的下标数组
+        getRowsAndColumns(input) {
+            const matches = input.match(/\$([A-Z])\$(\d+)/g) || [];
+            const result = [];
+            // console.log(matches);
+            matches.forEach((match) => {
+                const [, column, row] = match.match(/\$([A-Z])\$(\d+)/);
+                result.push({
+                    row: Number(row),
+                    column: Number(this.getColumnHeaderIndex(column) + 1),
+                });
+            });
+
+            return result;
+        },
+        //获取字母对应下标
+        getColumnHeaderIndex(code) {
+            return code.charCodeAt() - 65;
+        },
+        // 获取区间所有坐标
+        getCellIndices(table, startRow, endRow, startCol, endCol) {
+            // console.log(startRow, endRow, startCol, endCol);
+            const indices = [];
+            for (let i = startRow; i <= endRow; i++) {
+                for (let j = startCol; j <= endCol; j++) {
+                    indices.push({ row: i, column: j });
+                }
+            }
+            return indices;
+        },
+        // 由于在showStyle做了背景色及字体颜色处理，解决判断冲突
+        isShowFormat(style, type = "css") {
+            const styleCss = style ? JSON.parse(style) : {};
+            let tag =
+                type === "css"
+                    ? styleCss.pn > 0 || ["percent"].includes(styleCss.nt)
+                    : style.EdbInfoId;
+            return tag;
+        },
+        // 初始化单元格横纵坐标
+        initIndex(rindex, cindex, row, col) {
+            this.config.data[rindex][cindex]["cIndex"] = cindex;
+            this.config.data[rindex][cindex]["rIndex"] = rindex;
+            this.config.data[rindex][cindex]["colIndex"] = col;
+            this.config.data[rindex][cindex]["rowIndex"] = row;
+        },
+        // 设置背景色及字体颜色
+        getShowCss(style) {
+            const styleCss = JSON.parse(style);
+            let color = styleCss.glObj ? styleCss.glObj["color"] : styleCss["color"];
+            let BackgroundColor = styleCss.glObj
+                ? styleCss.glObj["background-color"]
+                : styleCss["background-color"];
+            return {
+                color: color,
+                "background-color": BackgroundColor,
+            };
+        },
+    },
+};

src/views/datasheet_manage/sheetList.vue

@@ -1086,7 +1086,8 @@ export default {
               this.$refs.customTableRef.initSheetData(res.Data.TableData);
 
             this.sheetDetailInfo.Source === 3 && this.$refs.mixedTableRef &&
-              this.$refs.mixedTableRef.initData(res.Data.TableData);
+              this.$refs.mixedTableRef.initData(res.Data.TableData)
+            this.sheetDetailInfo.Source === 3 && this.$refs.mixedTableRef && this.$refs.mixedTableRef.getExcelRule(this.select_id);
           });
         });
     },