SimpleTable组件bug修复

src/components/SimpleTable/index.vue

@@ -6,58 +6,48 @@
     element-loading-background="rgba(0, 0, 0, 0.8)"
     class="table-wrapper"
   >
-    <template v-if="filteredTableCols.length">
-      <el-table
-        ref="table"
-        v-el-table-infinite-scroll="load"
-        :data="dealedTableData"
-        :header-cell-class-name="headerCellClass"
-        :row-class-name="rowClass"
-        :cell-class-name="cellClass"
-        :span-method="tableSpanMethod"
-        :show-summary="showSummary"
-        :summary-method="tableSummaryMethod"
-        :height="height"
-        stripe
-        fit
-        border
-        @cell-click="cellClickHandler"
+    <el-table
+      ref="table"
+      v-el-table-infinite-scroll="load"
+      :data="dealedTableData"
+      :header-cell-class-name="headerCellClass"
+      :row-class-name="rowClass"
+      :cell-class-name="cellClass"
+      :span-method="tableSpanMethod"
+      :show-summary="showSummary"
+      :summary-method="tableSummaryMethod"
+      :height="height"
+      stripe
+      fit
+      border
+      @cell-click="cellClickHandler"
+    >
+      <el-table-column
+        v-for="col in filteredTableCols"
+        :key="col.columnName"
+        :prop="col.columnName"
+        :label="col.columnLabel"
+        :width="col.width"
+        :show-overflow-tooltip="showOverflowTooltip"
+        :formatter="tableFormatter"
       >
-        <el-table-column
-          v-for="col in filteredTableCols"
-          :key="col.columnName"
-          :prop="col.columnName"
-          :label="col.columnLabel"
-          :width="col.width"
-          :show-overflow-tooltip="showOverflowTooltip"
-          :formatter="tableFormatter"
-        >
-          <template #header>
-            <el-tooltip
-              :content="col.columnDescribe || col.columnLabel"
-              placement="top"
-            >
-              <TableHeaderCell
-                :label="col.columnLabel"
-                :filter-options="tableDataFilters[col.columnName]"
-                :filter-values.sync="filterValues[col.columnName]"
-                filter-style="arrow"
-                :sortable="!!col.needSort"
-                :sort-rule.sync="tableDataSortRules[col.columnName]"
-              />
-            </el-tooltip>
-          </template>
-        </el-table-column>
-      </el-table>
-    </template>
-    <template v-else>
-      <div
-        :style="{ height: height }"
-        class="no-column"
-      >
-        无数据
-      </div>
-    </template>
+        <template #header>
+          <el-tooltip
+            :content="col.columnDescribe || col.columnLabel"
+            placement="top"
+          >
+            <TableHeaderCell
+              :label="col.columnLabel"
+              :filter-options="tableDataFilters[col.columnName]"
+              :filter-values.sync="filterValues[col.columnName]"
+              filter-style="arrow"
+              :sortable="!!col.needSort"
+              :sort-rule.sync="tableDataSortRules[col.columnName]"
+            />
+          </el-tooltip>
+        </template>
+      </el-table-column>
+    </el-table>
   </div>
 </template>
 

src/views/advancedQuery/views/advancedNew.vue

@@ -27,15 +27,21 @@
           <button
             class="btnAn"
             @click="dialogShow"
-          >高级搜索</button>
+          >
+            高级搜索
+          </button>
           <button
             class="btnAn"
             @click="exportHandler('table', '高级查询结果')"
-          >导出</button>
+          >
+            导出
+          </button>
           <button
             class="btnAn"
             @click="toOldAdvance"
-          >切换</button>
+          >
+            切换
+          </button>
           <!-- <div
             class="setting"
             @click="show"
@@ -85,12 +91,14 @@
               size="small"
               plain
               @click="addParamsHandler"
-            >新增</el-button>
+              >新增</el-button
+            >
             <el-button
               type="primary"
               size="small"
               @click="advancedQueryHandler(false)"
-            >查询</el-button>
+              >查询</el-button
+            >
           </div>
           <el-form
             ref="paramsForm"
@@ -127,8 +135,15 @@
                       <el-select
                         v-model="scope.row[col.prop]"
                         placeholder="请选择"
-                        :disabled="scope.$index < 2 && col.prop === 'comparisonOperator' || col.prop === 'paramValue' && paramsForm.disabled[scope.$index]"
-                        @change="value => { selectChangeHandler(value, scope.$index, index) }"
+                        :disabled="
+                          (scope.$index < 2 && col.prop === 'comparisonOperator') ||
+                          (col.prop === 'paramValue' && paramsForm.disabled[scope.$index])
+                        "
+                        @change="
+                          value => {
+                            selectChangeHandler(value, scope.$index, index)
+                          }
+                        "
                       >
                         <el-option
                           v-for="(option, index) in col.options[scope.$index]"
@@ -142,8 +157,15 @@
                       <el-select
                         v-model="scope.row[col.prop]"
                         placeholder="请选择"
-                        :disabled="scope.$index < 2 && ['leftBrackets', 'paramKey', 'rightBrackets', 'connector'].includes(col.prop)"
-                        @change="value => { selectChangeHandler(value, scope.$index, index) }"
+                        :disabled="
+                          scope.$index < 2 &&
+                          ['leftBrackets', 'paramKey', 'rightBrackets', 'connector'].includes(col.prop)
+                        "
+                        @change="
+                          value => {
+                            selectChangeHandler(value, scope.$index, index)
+                          }
+                        "
                       >
                         <el-option
                           v-for="(option, index) in col.options"
@@ -180,7 +202,11 @@
                         placeholder="请选择"
                         :clearable="false"
                         :picker-options="datePickerOptions(scope.$index, index)"
-                        @change="value => { dateChangeHandler(value, scope.$index, index) }"
+                        @change="
+                          value => {
+                            dateChangeHandler(value, scope.$index, index)
+                          }
+                        "
                       />
                     </template>
                     <template v-else-if="col.inputType[scope.$index] === 'datetime'">
@@ -210,7 +236,8 @@
                     <span
                       slot="reference"
                       class="clickable-delete"
-                    >删除</span>
+                      >删除</span
+                    >
                   </el-popconfirm>
                   <span v-else>固定</span>
                 </template>
@@ -693,7 +720,9 @@ export default {
       return function ({ row, column, rowIndex, columnIndex }) {
         const classes = []
         if (
-          ['flightNO', 'passengerName', 'bagSN', 'U_Device_ID', 'preFlightNO', 'transferFlightNO'].includes(column.property) &&
+          ['flightNO', 'passengerName', 'bagSN', 'U_Device_ID', 'preFlightNO', 'transferFlightNO'].includes(
+            column.property
+          ) &&
           row[column.property] &&
           row[column.property] !== 'FBULK'
         ) {
@@ -714,7 +743,9 @@ export default {
     },
     cellClickHandler(row, column, cell, event) {
       if (
-        ['flightNO', 'passengerName', 'bagSN', 'U_Device_ID', 'preFlightNO', 'transferFlightNO'].includes(column.property) &&
+        ['flightNO', 'passengerName', 'bagSN', 'U_Device_ID', 'preFlightNO', 'transferFlightNO'].includes(
+          column.property
+        ) &&
         row[column.property] &&
         row[column.property] !== 'FBULK'
       ) {

src/views/systemSettings/views/queryTemplate/queryTemplatePreview.vue

@@ -614,7 +614,7 @@ export default {
       })
     },
     load() {
-      if (this.noMore || this.loading) {
+      if (this.noMore || this.loading || !this.hasInit) {
         return
       }
       this.queryTableData()