From c4f7fbc6c95624aa18af685ec541f90f4258ba07 Mon Sep 17 00:00:00 2001
From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com>
Date: Tue, 18 Oct 2022 14:43:38 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20git=20=E6=96=87=E4=BB=B6=E5=A4=A7?=
 =?UTF-8?q?=E5=B0=8F=E5=86=99=E4=B8=8D=E6=95=8F=E6=84=9Fbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/chart/chart/common/common_table.js  |  2 +-
 .../src/views/chart/chart/table/table-info.js     |  8 ++++----
 .../chart/components/shape-attr/SizeSelector.vue  |  8 ++++----
 .../components/shape-attr/SizeSelectorAntV.vue    |  7 ++++---
 .../views/chart/components/table/TableNormal.vue  | 15 ++++++++-------
 .../src/views/system/SysParam/BasicSetting.vue    |  2 +-
 .../views/system/SysParam/ClusterModeSetting.vue  |  2 +-
 .../src/views/system/SysParam/EmailSetting.vue    |  2 +-
 .../src/views/system/task/DatasetTaskList.vue     |  2 +-
 frontend/src/views/system/task/TaskRecord.vue     |  2 +-
 frontend/src/views/system/user/index.vue          |  4 ++--
 11 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/frontend/src/views/chart/chart/common/common_table.js b/frontend/src/views/chart/chart/common/common_table.js
index 6de4952283..42f93da6a5 100644
--- a/frontend/src/views/chart/chart/common/common_table.js
+++ b/frontend/src/views/chart/chart/common/common_table.js
@@ -21,7 +21,7 @@ export function getCustomTheme(chart) {
         backgroundColor: headerColor,
         horizontalBorderColor: borderColor,
         verticalBorderColor: borderColor,
-        verticalBorderWidth: 0 //左上角顶点单元格左右边缘宽度要设置为 0，不然序号列的数字部分会比表头多几个像素，视觉上会突出去
+        verticalBorderWidth: 0 // 左上角顶点单元格左右边缘宽度要设置为 0，不然序号列的数字部分会比表头多几个像素，视觉上会突出去
       },
       text: {
         fill: DEFAULT_COLOR_CASE.tableHeaderFontColor,
diff --git a/frontend/src/views/chart/chart/table/table-info.js b/frontend/src/views/chart/chart/table/table-info.js
index 6ba94691b2..2324b6b0fd 100644
--- a/frontend/src/views/chart/chart/table/table-info.js
+++ b/frontend/src/views/chart/chart/table/table-info.js
@@ -128,9 +128,9 @@ export function baseTableInfo(s2, container, chart, action, tableData) {
     style: getSize(chart),
     conditions: getConditions(chart)
   }
-  //开启序号之后，第一列就是序号列，修改 label 即可
+  // 开启序号之后，第一列就是序号列，修改 label 即可
   if (s2Options.showSeriesNumber) {
-    s2Options.colCell= (node) => {
+    s2Options.colCell = (node) => {
       if (node.colIndex === 0) {
         node.label = customAttr.size.indexLabel
       }
@@ -266,9 +266,9 @@ export function baseTableNormal(s2, container, chart, action, tableData) {
     style: getSize(chart),
     conditions: getConditions(chart)
   }
-  //开启序号之后，第一列就是序号列，修改 label 即可
+  // 开启序号之后，第一列就是序号列，修改 label 即可
   if (s2Options.showSeriesNumber) {
-    s2Options.colCell= (node) => {
+    s2Options.colCell = (node) => {
       if (node.colIndex === 0) {
         node.label = customAttr.size.indexLabel
       }
diff --git a/frontend/src/views/chart/components/shape-attr/SizeSelector.vue b/frontend/src/views/chart/components/shape-attr/SizeSelector.vue
index 74668a1b1d..d94b954a9a 100644
--- a/frontend/src/views/chart/components/shape-attr/SizeSelector.vue
+++ b/frontend/src/views/chart/components/shape-attr/SizeSelector.vue
@@ -380,14 +380,15 @@
             input-size="mini"
             @change="changeBarSizeCase('tableShowIndex')"
           >
-            <el-radio :label="true">{{$t('panel.yes')}}</el-radio>
-            <el-radio :label="false">{{$t('panel.no')}}</el-radio>
+            <el-radio :label="true">{{ $t('panel.yes') }}</el-radio>
+            <el-radio :label="false">{{ $t('panel.no') }}</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item
           v-show="showProperty('tableIndexLabel') && sizeForm.showIndex"
           label-width="100px"
-          class="form-item">
+          class="form-item"
+        >
           <el-input
             v-model="sizeForm.indexLabel"
             type="text"
@@ -395,7 +396,6 @@
           />
         </el-form-item>
 
-
         <!--table-end-->
         <!--gauge-begin-->
         <el-form-item
diff --git a/frontend/src/views/chart/components/shape-attr/SizeSelectorAntV.vue b/frontend/src/views/chart/components/shape-attr/SizeSelectorAntV.vue
index ee063015df..23093b7bc8 100644
--- a/frontend/src/views/chart/components/shape-attr/SizeSelectorAntV.vue
+++ b/frontend/src/views/chart/components/shape-attr/SizeSelectorAntV.vue
@@ -369,14 +369,15 @@
             input-size="mini"
             @change="changeBarSizeCase('tableShowIndex')"
           >
-            <el-radio :label="true">{{$t('panel.yes')}}</el-radio>
-            <el-radio :label="false">{{$t('panel.no')}}</el-radio>
+            <el-radio :label="true">{{ $t('panel.yes') }}</el-radio>
+            <el-radio :label="false">{{ $t('panel.no') }}</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item
           v-show="showProperty('tableIndexLabel') && sizeForm.showIndex"
           label-width="100px"
-          class="form-item">
+          class="form-item"
+        >
           <el-input
             v-model="sizeForm.indexLabel"
             type="text"
diff --git a/frontend/src/views/chart/components/table/TableNormal.vue b/frontend/src/views/chart/components/table/TableNormal.vue
index f2643c7364..acb5a68e14 100644
--- a/frontend/src/views/chart/components/table/TableNormal.vue
+++ b/frontend/src/views/chart/components/table/TableNormal.vue
@@ -26,7 +26,8 @@
       >
         <ux-table-column
           type="index"
-          :title='indexLabel'/>
+          :title="indexLabel"
+        />
         <ux-table-column
           v-for="field in fields"
           :key="field.name"
@@ -285,12 +286,12 @@ export default {
           this.table_item_class.height = customAttr.size.tableItemHeight + 'px'
 
           const visibleColumn = this.$refs.plxTable.getTableColumn().fullColumn
-          for (let i = 0,column=visibleColumn[i]; i < visibleColumn.length; i++) {
+          for (let i = 0, column = visibleColumn[i]; i < visibleColumn.length; i++) {
             // 有变更才刷新
             if (column.type === 'index' && column.visible !== customAttr.size.showIndex) {
               column.visible = customAttr.size.showIndex
               this.$refs.plxTable.refreshColumn()
-              break;
+              break
             }
           }
           this.indexLabel = customAttr.size.indexLabel
@@ -344,8 +345,8 @@ export default {
     summaryMethod({ columns, data }) {
       const that = this
       const means = [] // 合计
-      const x = JSON.parse(that.chart.xaxis);
-      const customAttr = JSON.parse(that.chart.customAttr);
+      const x = JSON.parse(that.chart.xaxis)
+      const customAttr = JSON.parse(that.chart.customAttr)
       columns.forEach((column, columnIndex) => {
         if (columnIndex === 0 && x.length > 0) {
           means.push('合计')
@@ -356,7 +357,7 @@ export default {
             requireSumIndex++
           }
           if (columnIndex >= requireSumIndex) {
-            const values = data.map(item => Number(item[column.property]));
+            const values = data.map(item => Number(item[column.property]))
             // 合计
             if (!values.every(value => isNaN(value))) {
               means[columnIndex] = values.reduce((prev, curr) => {
@@ -372,7 +373,7 @@ export default {
               means[columnIndex] = ''
             }
           } else {
-            means[columnIndex] = '';
+            means[columnIndex] = ''
           }
         }
       })
diff --git a/frontend/src/views/system/SysParam/BasicSetting.vue b/frontend/src/views/system/SysParam/BasicSetting.vue
index 0eb42544d9..4d7b7bc4a2 100644
--- a/frontend/src/views/system/SysParam/BasicSetting.vue
+++ b/frontend/src/views/system/SysParam/BasicSetting.vue
@@ -193,7 +193,7 @@
 import { basicInfo, updateInfo } from '@/api/system/basic'
 import { ldapStatus, oidcStatus, casStatus } from '@/api/user'
 import bus from '@/utils/bus'
-import operater from './Operater'
+import operater from './operater'
 import msgCfm from '@/components/msgCfm'
 import PluginCom from '@/views/system/plugin/PluginCom'
 export default {
diff --git a/frontend/src/views/system/SysParam/ClusterModeSetting.vue b/frontend/src/views/system/SysParam/ClusterModeSetting.vue
index 2b02318f2f..85047f1575 100644
--- a/frontend/src/views/system/SysParam/ClusterModeSetting.vue
+++ b/frontend/src/views/system/SysParam/ClusterModeSetting.vue
@@ -182,7 +182,7 @@
 <script>
 import { engineInfo, validate, save } from '@/api/system/engine'
 import i18n from '@/lang'
-import operater from './Operater'
+import operater from './operater'
 import msgCfm from '@/components/msgCfm'
 import dePwd from '@/components/deCustomCm/dePwd.vue'
 export default {
diff --git a/frontend/src/views/system/SysParam/EmailSetting.vue b/frontend/src/views/system/SysParam/EmailSetting.vue
index a27c1c4e37..74607ad699 100644
--- a/frontend/src/views/system/SysParam/EmailSetting.vue
+++ b/frontend/src/views/system/SysParam/EmailSetting.vue
@@ -130,7 +130,7 @@
 
 <script>
 import { emailInfo, updateInfo, validate } from '@/api/system/email'
-import operater from './Operater'
+import operater from './operater'
 import msgCfm from '@/components/msgCfm'
 import dePwd from '@/components/deCustomCm/dePwd.vue'
 export default {
diff --git a/frontend/src/views/system/task/DatasetTaskList.vue b/frontend/src/views/system/task/DatasetTaskList.vue
index 90a6a03146..60ffd41c95 100644
--- a/frontend/src/views/system/task/DatasetTaskList.vue
+++ b/frontend/src/views/system/task/DatasetTaskList.vue
@@ -367,7 +367,7 @@ import { formatOrders } from '@/utils/index'
 import { datasetTaskList, post } from '@/api/dataset/dataset'
 import { hasDataPermission } from '@/utils/permission'
 import GridTable from '@/components/gridTable/index.vue'
-import filterUser from './FilterUser.vue'
+import filterUser from './filterUser.vue'
 import msgCfm from '@/components/msgCfm/index'
 import _ from 'lodash'
 import keyEnter from '@/components/msgCfm/keyEnter.js'
diff --git a/frontend/src/views/system/task/TaskRecord.vue b/frontend/src/views/system/task/TaskRecord.vue
index 3048288932..7a92456be8 100644
--- a/frontend/src/views/system/task/TaskRecord.vue
+++ b/frontend/src/views/system/task/TaskRecord.vue
@@ -176,7 +176,7 @@ import {
 } from '@/utils/index'
 import { exportExcel, post } from '@/api/dataset/dataset'
 import GridTable from '@/components/gridTable/index.vue'
-import filterUser from './FilterUserRecord.vue'
+import filterUser from './filterUserRecord.vue'
 import _ from 'lodash'
 import keyEnter from '@/components/msgCfm/keyEnter.js'
 
diff --git a/frontend/src/views/system/user/index.vue b/frontend/src/views/system/user/index.vue
index 168f75c1bc..d54d3c7eb4 100644
--- a/frontend/src/views/system/user/index.vue
+++ b/frontend/src/views/system/user/index.vue
@@ -319,7 +319,7 @@
 </template>
 
 <script>
-import userEditer from './UserEditer.vue'
+import userEditer from './userEditer.vue'
 import { columnOptions } from './options'
 import DeLayoutContent from '@/components/business/DeLayoutContent'
 import { addOrder, formatOrders } from '@/utils/index'
@@ -335,7 +335,7 @@ import {
   unLock
 } from '@/api/system/user'
 import { mapGetters } from 'vuex'
-import filterUser from './FilterUser.vue'
+import filterUser from './filterUser.vue'
 import GridTable from '@/components/gridTable/index.vue'
 import PluginCom from '@/views/system/plugin/PluginCom'
 import _ from 'lodash'