From 689c98864280a3156a854153c3361a4d79286d49 Mon Sep 17 00:00:00 2001 From: zhaoxiao Date: Mon, 6 Mar 2023 09:50:53 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E3=80=90fix=20ESLint=E3=80=91src/compone?= =?UTF-8?q?nts/table?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/table/index.js | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/jero-web/src/components/table/index.js b/jero-web/src/components/table/index.js index 6907cee3..6300efa4 100644 --- a/jero-web/src/components/table/index.js +++ b/jero-web/src/components/table/index.js @@ -1,5 +1,6 @@ import T from 'ant-design-vue/es/table/Table' import get from 'lodash.get' + export default { data () { return { @@ -84,12 +85,10 @@ export default { }, loadData (pagination, filters, sorter) { this.localLoading = true - var result = this.data( + const result = this.data( Object.assign({ - pageNo: (pagination && pagination.current) || - this.localPagination.current, - pageSize: (pagination && pagination.pageSize) || - this.localPagination.pageSize + pageNo: (pagination && pagination.current) || this.localPagination.current, + pageSize: (pagination && pagination.pageSize) || this.localPagination.pageSize }, (sorter && sorter.field && { sortField: sorter.field @@ -98,8 +97,7 @@ export default { sortOrder: sorter.order }) || {}, { ...filters - } - ) + }) ) if (result instanceof Promise) { @@ -112,7 +110,7 @@ export default { this.localPagination.pageSize }); // update--begin--autor:wangshuai-----date:20200724------for：判断showPagination是否为false------ - (!this.showPagination || !r.totalCount && this.showPagination === 'auto') && (this.localPagination = false) + ((!this.showPagination || !r.totalCount) && this.showPagination === 'auto') && (this.localPagination = false) // update--end--autor:wangshuai-----date:20200724------for：判断showPagination是否为false----- this.localDataSource = r.data // 返回结果中的数组数据 this.localLoading = false @@ -217,9 +215,11 @@ export default { Object.keys(T.props).forEach(k => { const localKey = `local${k.substring(0, 1).toUpperCase()}${k.substring(1)}` if (localKeys.includes(localKey)) { - return props[k] = _vm[localKey] + const tempItem = props[k] = _vm[localKey] + return tempItem } - return props[k] = _vm[k] + const tempItemA = props[k] = _vm[k] + return tempItemA }) // 显示信息提示 From e60ab2b2e103613cc6f3375c2d8535715c192699 Mon Sep 17 00:00:00 2001 From: danshihao Date: Mon, 6 Mar 2023 09:55:27 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E3=80=90fix=20ESLint=E3=80=91src/compone?= =?UTF-8?q?nts/layouts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/layouts/IframeFReportView.vue | 9 ++++----- .../src/components/layouts/IframePageView.vue | 14 ++++++------- jero-web/src/components/layouts/PageView.vue | 4 ++-- jero-web/src/components/layouts/TabLayout.vue | 10 +++++----- .../src/components/layouts/UserLayout.vue | 20 +++++++++---------- 5 files changed, 28 insertions(+), 29 deletions(-) diff --git a/jero-web/src/components/layouts/IframeFReportView.vue b/jero-web/src/components/layouts/IframeFReportView.vue index 46a9703b..4ae90d02 100644 --- a/jero-web/src/components/layouts/IframeFReportView.vue +++ b/jero-web/src/components/layouts/IframeFReportView.vue @@ -5,8 +5,8 @@ \ No newline at end of file +} + +.chart-card-content { + margin-bottom: 12px; + position: relative; + height: 46px; + width: 100%; + + .content-fix { + position: absolute; + left: 0; + bottom: 0; + width: 100%; + } +} + +.total { + overflow: hidden; + text-overflow: ellipsis; + word-break: break-all; + white-space: nowrap; + color: #000; + margin-top: 4px; + margin-bottom: 0; + font-size: 30px; + line-height: 38px; + height: 38px; +} + diff --git a/jero-web/src/components/lazy_antd.js b/jero-web/src/components/lazy_antd.js index 3de74b83..29f9937b 100644 --- a/jero-web/src/components/lazy_antd.js +++ b/jero-web/src/components/lazy_antd.js @@ -58,9 +58,9 @@ import { Slider, Transfer, Rate, - Collapse, + Collapse } from 'ant-design-vue' -import Viser from 'viser-vue' +// import Viser from 'viser-vue' Vue.use(ConfigProvider) Vue.use(Layout) @@ -123,4 +123,4 @@ Vue.prototype.$success = Modal.success Vue.prototype.$error = Modal.error Vue.prototype.$warning = Modal.warning -process.env.NODE_ENV !== 'production' && console.warn('[jero-boot-vue] NOTICE: Antd use lazy-load.') \ No newline at end of file +process.env.NODE_ENV !== 'production' && console.warn('[jero-boot-vue] NOTICE: Antd use lazy-load.') From ad38ddc27e165688c7eb33b7d0e724af7043f563 Mon Sep 17 00:00:00 2001 From: zhaoxiao Date: Mon, 6 Mar 2023 10:09:36 +0800 Subject: [PATCH 05/14] =?UTF-8?q?=E3=80=90fix=20ESLint=E3=80=91src/config?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/config/router.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/config/router.config.js b/jero-web/src/config/router.config.js index 87e936da..32009cfd 100644 --- a/jero-web/src/config/router.config.js +++ b/jero-web/src/config/router.config.js @@ -1,4 +1,4 @@ -import { UserLayout, TabLayout, RouteView, BlankLayout, PageView } from '@/components/layouts' +import { UserLayout, TabLayout, BlankLayout } from '@/components/layouts' /** * 走菜单，走权限控制 From 1e33ffad8f32dc07b5f704c2e079360f180ec81f Mon Sep 17 00:00:00 2001 From: danshihao Date: Mon, 6 Mar 2023 10:14:55 +0800 Subject: [PATCH 06/14] =?UTF-8?q?=E3=80=90fix=20ESLint=E3=80=91src/compone?= =?UTF-8?q?nts/JVxeCells?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/JVxeCells/JVxeFileCell.vue | 78 ++++++++++--------- .../components/JVxeCells/JVxeImageCell.vue | 75 +++++++++--------- 2 files changed, 80 insertions(+), 73 deletions(-) diff --git a/jero-web/src/components/JVxeCells/JVxeFileCell.vue b/jero-web/src/components/JVxeCells/JVxeFileCell.vue index 65a8ac2b..b54a321e 100644 --- a/jero-web/src/components/JVxeCells/JVxeFileCell.vue +++ b/jero-web/src/components/JVxeCells/JVxeFileCell.vue @@ -1,45 +1,49 @@