Merge pull request #3378 from dataease/pr@dev_eslint_auto_fix

fix: git 文件大小写不敏感bug
This commit is contained in:
dataeaseShu 2022-10-18 14:45:20 +08:00 committed by GitHub
commit ae2d9e91a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 28 additions and 26 deletions

View File

@ -21,7 +21,7 @@ export function getCustomTheme(chart) {
backgroundColor: headerColor, backgroundColor: headerColor,
horizontalBorderColor: borderColor, horizontalBorderColor: borderColor,
verticalBorderColor: borderColor, verticalBorderColor: borderColor,
verticalBorderWidth: 0 //左上角顶点单元格左右边缘宽度要设置为 0不然序号列的数字部分会比表头多几个像素视觉上会突出去 verticalBorderWidth: 0 // 左上角顶点单元格左右边缘宽度要设置为 0不然序号列的数字部分会比表头多几个像素视觉上会突出去
}, },
text: { text: {
fill: DEFAULT_COLOR_CASE.tableHeaderFontColor, fill: DEFAULT_COLOR_CASE.tableHeaderFontColor,

View File

@ -128,9 +128,9 @@ export function baseTableInfo(s2, container, chart, action, tableData) {
style: getSize(chart), style: getSize(chart),
conditions: getConditions(chart) conditions: getConditions(chart)
} }
//开启序号之后,第一列就是序号列,修改 label 即可 // 开启序号之后,第一列就是序号列,修改 label 即可
if (s2Options.showSeriesNumber) { if (s2Options.showSeriesNumber) {
s2Options.colCell= (node) => { s2Options.colCell = (node) => {
if (node.colIndex === 0) { if (node.colIndex === 0) {
node.label = customAttr.size.indexLabel node.label = customAttr.size.indexLabel
} }
@ -266,9 +266,9 @@ export function baseTableNormal(s2, container, chart, action, tableData) {
style: getSize(chart), style: getSize(chart),
conditions: getConditions(chart) conditions: getConditions(chart)
} }
//开启序号之后,第一列就是序号列,修改 label 即可 // 开启序号之后,第一列就是序号列,修改 label 即可
if (s2Options.showSeriesNumber) { if (s2Options.showSeriesNumber) {
s2Options.colCell= (node) => { s2Options.colCell = (node) => {
if (node.colIndex === 0) { if (node.colIndex === 0) {
node.label = customAttr.size.indexLabel node.label = customAttr.size.indexLabel
} }

View File

@ -380,14 +380,15 @@
input-size="mini" input-size="mini"
@change="changeBarSizeCase('tableShowIndex')" @change="changeBarSizeCase('tableShowIndex')"
> >
<el-radio :label="true">{{$t('panel.yes')}}</el-radio> <el-radio :label="true">{{ $t('panel.yes') }}</el-radio>
<el-radio :label="false">{{$t('panel.no')}}</el-radio> <el-radio :label="false">{{ $t('panel.no') }}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
v-show="showProperty('tableIndexLabel') && sizeForm.showIndex" v-show="showProperty('tableIndexLabel') && sizeForm.showIndex"
label-width="100px" label-width="100px"
class="form-item"> class="form-item"
>
<el-input <el-input
v-model="sizeForm.indexLabel" v-model="sizeForm.indexLabel"
type="text" type="text"
@ -395,7 +396,6 @@
/> />
</el-form-item> </el-form-item>
<!--table-end--> <!--table-end-->
<!--gauge-begin--> <!--gauge-begin-->
<el-form-item <el-form-item

View File

@ -369,14 +369,15 @@
input-size="mini" input-size="mini"
@change="changeBarSizeCase('tableShowIndex')" @change="changeBarSizeCase('tableShowIndex')"
> >
<el-radio :label="true">{{$t('panel.yes')}}</el-radio> <el-radio :label="true">{{ $t('panel.yes') }}</el-radio>
<el-radio :label="false">{{$t('panel.no')}}</el-radio> <el-radio :label="false">{{ $t('panel.no') }}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
v-show="showProperty('tableIndexLabel') && sizeForm.showIndex" v-show="showProperty('tableIndexLabel') && sizeForm.showIndex"
label-width="100px" label-width="100px"
class="form-item"> class="form-item"
>
<el-input <el-input
v-model="sizeForm.indexLabel" v-model="sizeForm.indexLabel"
type="text" type="text"

View File

@ -26,7 +26,8 @@
> >
<ux-table-column <ux-table-column
type="index" type="index"
:title='indexLabel'/> :title="indexLabel"
/>
<ux-table-column <ux-table-column
v-for="field in fields" v-for="field in fields"
:key="field.name" :key="field.name"
@ -285,12 +286,12 @@ export default {
this.table_item_class.height = customAttr.size.tableItemHeight + 'px' this.table_item_class.height = customAttr.size.tableItemHeight + 'px'
const visibleColumn = this.$refs.plxTable.getTableColumn().fullColumn 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) { if (column.type === 'index' && column.visible !== customAttr.size.showIndex) {
column.visible = customAttr.size.showIndex column.visible = customAttr.size.showIndex
this.$refs.plxTable.refreshColumn() this.$refs.plxTable.refreshColumn()
break; break
} }
} }
this.indexLabel = customAttr.size.indexLabel this.indexLabel = customAttr.size.indexLabel
@ -344,8 +345,8 @@ export default {
summaryMethod({ columns, data }) { summaryMethod({ columns, data }) {
const that = this const that = this
const means = [] // const means = [] //
const x = JSON.parse(that.chart.xaxis); const x = JSON.parse(that.chart.xaxis)
const customAttr = JSON.parse(that.chart.customAttr); const customAttr = JSON.parse(that.chart.customAttr)
columns.forEach((column, columnIndex) => { columns.forEach((column, columnIndex) => {
if (columnIndex === 0 && x.length > 0) { if (columnIndex === 0 && x.length > 0) {
means.push('合计') means.push('合计')
@ -356,7 +357,7 @@ export default {
requireSumIndex++ requireSumIndex++
} }
if (columnIndex >= 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))) { if (!values.every(value => isNaN(value))) {
means[columnIndex] = values.reduce((prev, curr) => { means[columnIndex] = values.reduce((prev, curr) => {
@ -372,7 +373,7 @@ export default {
means[columnIndex] = '' means[columnIndex] = ''
} }
} else { } else {
means[columnIndex] = ''; means[columnIndex] = ''
} }
} }
}) })

View File

@ -193,7 +193,7 @@
import { basicInfo, updateInfo } from '@/api/system/basic' import { basicInfo, updateInfo } from '@/api/system/basic'
import { ldapStatus, oidcStatus, casStatus } from '@/api/user' import { ldapStatus, oidcStatus, casStatus } from '@/api/user'
import bus from '@/utils/bus' import bus from '@/utils/bus'
import operater from './Operater' import operater from './operater'
import msgCfm from '@/components/msgCfm' import msgCfm from '@/components/msgCfm'
import PluginCom from '@/views/system/plugin/PluginCom' import PluginCom from '@/views/system/plugin/PluginCom'
export default { export default {

View File

@ -182,7 +182,7 @@
<script> <script>
import { engineInfo, validate, save } from '@/api/system/engine' import { engineInfo, validate, save } from '@/api/system/engine'
import i18n from '@/lang' import i18n from '@/lang'
import operater from './Operater' import operater from './operater'
import msgCfm from '@/components/msgCfm' import msgCfm from '@/components/msgCfm'
import dePwd from '@/components/deCustomCm/dePwd.vue' import dePwd from '@/components/deCustomCm/dePwd.vue'
export default { export default {

View File

@ -130,7 +130,7 @@
<script> <script>
import { emailInfo, updateInfo, validate } from '@/api/system/email' import { emailInfo, updateInfo, validate } from '@/api/system/email'
import operater from './Operater' import operater from './operater'
import msgCfm from '@/components/msgCfm' import msgCfm from '@/components/msgCfm'
import dePwd from '@/components/deCustomCm/dePwd.vue' import dePwd from '@/components/deCustomCm/dePwd.vue'
export default { export default {

View File

@ -367,7 +367,7 @@ import { formatOrders } from '@/utils/index'
import { datasetTaskList, post } from '@/api/dataset/dataset' import { datasetTaskList, post } from '@/api/dataset/dataset'
import { hasDataPermission } from '@/utils/permission' import { hasDataPermission } from '@/utils/permission'
import GridTable from '@/components/gridTable/index.vue' import GridTable from '@/components/gridTable/index.vue'
import filterUser from './FilterUser.vue' import filterUser from './filterUser.vue'
import msgCfm from '@/components/msgCfm/index' import msgCfm from '@/components/msgCfm/index'
import _ from 'lodash' import _ from 'lodash'
import keyEnter from '@/components/msgCfm/keyEnter.js' import keyEnter from '@/components/msgCfm/keyEnter.js'

View File

@ -176,7 +176,7 @@ import {
} from '@/utils/index' } from '@/utils/index'
import { exportExcel, post } from '@/api/dataset/dataset' import { exportExcel, post } from '@/api/dataset/dataset'
import GridTable from '@/components/gridTable/index.vue' import GridTable from '@/components/gridTable/index.vue'
import filterUser from './FilterUserRecord.vue' import filterUser from './filterUserRecord.vue'
import _ from 'lodash' import _ from 'lodash'
import keyEnter from '@/components/msgCfm/keyEnter.js' import keyEnter from '@/components/msgCfm/keyEnter.js'

View File

@ -319,7 +319,7 @@
</template> </template>
<script> <script>
import userEditer from './UserEditer.vue' import userEditer from './userEditer.vue'
import { columnOptions } from './options' import { columnOptions } from './options'
import DeLayoutContent from '@/components/business/DeLayoutContent' import DeLayoutContent from '@/components/business/DeLayoutContent'
import { addOrder, formatOrders } from '@/utils/index' import { addOrder, formatOrders } from '@/utils/index'
@ -335,7 +335,7 @@ import {
unLock unLock
} from '@/api/system/user' } from '@/api/system/user'
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import filterUser from './FilterUser.vue' import filterUser from './filterUser.vue'
import GridTable from '@/components/gridTable/index.vue' import GridTable from '@/components/gridTable/index.vue'
import PluginCom from '@/views/system/plugin/PluginCom' import PluginCom from '@/views/system/plugin/PluginCom'
import _ from 'lodash' import _ from 'lodash'