From 0c34ce196240a0fed93cc11f0d4b65374484cf27 Mon Sep 17 00:00:00 2001 From: puhui999 Date: Mon, 6 Mar 2023 11:44:33 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E5=99=A8=E5=85=A8=E5=B1=80=E7=B1=BB=E5=9E=8B=E6=89=BE=E4=B8=8D?= =?UTF-8?q?=E5=88=B0=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- types/global.d.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/types/global.d.ts b/types/global.d.ts index 6f583ba7..3685ffbd 100644 --- a/types/global.d.ts +++ b/types/global.d.ts @@ -1,3 +1,4 @@ +export {} declare global { declare interface Fn { (...arg: T[]): T From 84e802fe93d868e09ff6575b220f0dcfc7dfab11 Mon Sep 17 00:00:00 2001 From: puhui999 Date: Mon, 6 Mar 2023 11:46:40 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BD=BF=E7=94=A8const=20let=E6=9B=BF?= =?UTF-8?q?=E6=8D=A2=E6=8E=89var?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/XTable/src/XTable.vue | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/components/XTable/src/XTable.vue b/src/components/XTable/src/XTable.vue index e5c503ec..4ae546db 100644 --- a/src/components/XTable/src/XTable.vue +++ b/src/components/XTable/src/XTable.vue @@ -26,12 +26,12 @@ const prefixCls = getPrefixCls('x-vxe-table') const attrs = useAttrs() const emit = defineEmits(['register']) const removeStyles = () => { - var filename = 'cssTheme' + const filename = 'cssTheme' //移除引入的文件名 - var targetelement = 'style' - var targetattr = 'id' - var allsuspects = document.getElementsByTagName(targetelement) - for (var i = allsuspects.length; i >= 0; i--) { + const targetelement = 'style' + const targetattr = 'id' + const allsuspects = document.getElementsByTagName(targetelement) + for (let i = allsuspects.length; i >= 0; i--) { if ( allsuspects[i] && allsuspects[i].getAttribute(targetattr) != null && @@ -43,8 +43,8 @@ const removeStyles = () => { } } const reImport = () => { - var head = document.getElementsByTagName('head')[0] - var style = document.createElement('style') + const head = document.getElementsByTagName('head')[0] + const style = document.createElement('style') style.innerText = styleCss style.id = 'cssTheme' head.appendChild(style) @@ -52,10 +52,10 @@ const reImport = () => { watch( () => appStore.getIsDark, () => { - if (appStore.getIsDark == true) { + if (appStore.getIsDark) { reImport() } - if (appStore.getIsDark == false) { + if (!appStore.getIsDark) { removeStyles() } }, From cbc21c33b1861414d0422784da2d1a5a66de80d9 Mon Sep 17 00:00:00 2001 From: puhui999 Date: Mon, 6 Mar 2023 11:48:39 +0800 Subject: [PATCH 3/5] =?UTF-8?q?1=E3=80=81=E8=A7=A3=E5=86=B3=E8=87=AA?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E5=AD=97=E5=85=B8=E6=A0=87=E7=AD=BE=E5=80=BC?= =?UTF-8?q?=E4=B8=BA=E9=9B=B6=E6=97=B6=E6=A0=87=E7=AD=BE=E4=B8=8D=E6=B8=B2?= =?UTF-8?q?=E6=9F=93=E7=9A=84=E9=97=AE=E9=A2=98=202=E3=80=81=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=A0=87=E7=AD=BE=E7=9A=84=E6=96=87=E5=AD=97=E9=A2=9C?= =?UTF-8?q?=E8=89=B2=E4=B8=BA=E7=99=BD=E8=89=B2=EF=BC=8C=E8=A7=A3=E5=86=B3?= =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=83=8C=E6=99=AF=E9=A2=9C=E8=89=B2?= =?UTF-8?q?=E6=97=B6=E6=A0=87=E7=AD=BE=E6=96=87=E5=AD=97=E7=9C=8B=E4=B8=8D?= =?UTF-8?q?=E6=B8=85=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/DictTag/src/DictTag.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/components/DictTag/src/DictTag.vue b/src/components/DictTag/src/DictTag.vue index f70d52bf..15b5f12a 100644 --- a/src/components/DictTag/src/DictTag.vue +++ b/src/components/DictTag/src/DictTag.vue @@ -33,12 +33,15 @@ export default defineComponent({ if (!props.type) { return null } - if (!props.value) { + // 解决自定义字典标签值为零时标签不渲染的问题 + if (!props.value && props.value !== 0) { return null } getDictObj(props.type, props.value.toString()) + // 添加标签的文字颜色为白色，解决自定义背景颜色时标签文字看不清的问题 return ( Date: Mon, 6 Mar 2023 15:33:34 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=BF=90=E8=A1=8C?= =?UTF-8?q?=E6=97=B6=E6=8A=A5Variable=20'id'=20is=20already=20declared=20i?= =?UTF-8?q?n=20the=20upper=20scope=20=20vue/no-template-shadow?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../package/penal/task/task-components/ReceiveTask.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/bpmnProcessDesigner/package/penal/task/task-components/ReceiveTask.vue b/src/components/bpmnProcessDesigner/package/penal/task/task-components/ReceiveTask.vue index 63db1c75..ef2ba0b9 100644 --- a/src/components/bpmnProcessDesigner/package/penal/task/task-components/ReceiveTask.vue +++ b/src/components/bpmnProcessDesigner/package/penal/task/task-components/ReceiveTask.vue @@ -11,10 +11,10 @@ > Date: Mon, 6 Mar 2023 15:34:38 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=AF=BC=E5=85=A5css?= =?UTF-8?q?=E6=8A=A5=E8=AD=A6=E5=91=8A=E7=9A=84=E9=97=AE=E9=A2=98=20?= =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=96=B9=E6=B3=95=E6=9D=A5=E6=BA=90=20https:?= =?UTF-8?q?//github.com/vitejs/vite/pull/10762?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/XTable/src/XTable.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/XTable/src/XTable.vue b/src/components/XTable/src/XTable.vue index 4ae546db..451d3d30 100644 --- a/src/components/XTable/src/XTable.vue +++ b/src/components/XTable/src/XTable.vue @@ -12,7 +12,7 @@ import { useAppStore } from '@/store/modules/app' import { useDesign } from '@/hooks/web/useDesign' import { XTableProps } from './type' import { isBoolean, isFunction } from '@/utils/is' -import styleCss from './style/dark.scss' +import styleCss from './style/dark.scss?inline' import download from '@/utils/download' const { t } = useI18n()