From 01d39880356a0dd672fe2b90e691e4bcd35bcf3d Mon Sep 17 00:00:00 2001 From: xieyonghong <18010623010@163.com> Date: Wed, 1 Mar 2023 14:22:50 +0800 Subject: [PATCH 1/3] =?UTF-8?q?update:=20=E4=BC=98=E5=8C=96=E5=8F=98?= =?UTF-8?q?=E9=87=8Fless=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/style/variable.less | 3 +-- vite.config.ts | 1 + yarn.lock | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/style/variable.less b/src/style/variable.less index 667349d7..40f87bdf 100644 --- a/src/style/variable.less +++ b/src/style/variable.less @@ -1,5 +1,4 @@ -@import 'ant-design-vue/es/style/themes/default.less'; -//@import 'jetlinks-ui-components/es/style/default.less'; +@import 'jetlinks-ui-components/es/style/variable.less'; .ellipsisFn(@num: 1, @width: 100%) { display: -webkit-box; diff --git a/vite.config.ts b/vite.config.ts index 0f47bbf4..2c89fd1c 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -98,6 +98,7 @@ export default defineConfig(({ mode}) => { preprocessorOptions: { less: { modifyVars: { + 'root-entry-name': 'variable', hack: `true; @import (reference) "${path.resolve('src/style/variable.less')}";`, }, javascriptEnabled: true, diff --git a/yarn.lock b/yarn.lock index 0d88f0a9..f03c4f22 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3898,8 +3898,8 @@ jetlinks-store@^0.0.3: jetlinks-ui-components@^1.0.0: version "1.0.0" - resolved "https://registry.jetlinks.cn/jetlinks-ui-components/-/jetlinks-ui-components-1.0.0.tgz#9802688f088bfa5441e8d2c1198e4782226ad334" - integrity sha512-JF+r6dRBFJmy3BWgO4Dwt6uTvNDBd0lsQrjIYkE1YEZRwYVE1g58gY6CUX4q7q1qw9wncZxr5iXL4EjX2+IHhw== + resolved "https://registry.jetlinks.cn/jetlinks-ui-components/-/jetlinks-ui-components-1.0.0.tgz#d12144cd57e9547a9fdec1b28fe4c4135fba50ce" + integrity sha512-oqeQpQqidJJMdPa/DzU4V++93r9i9IdHEvqNqDg/+zzw+AhbehtcaRKUVb2bQcMWWCnJWCdv0Md8K5NIdIaoDw== dependencies: "@vueuse/core" "^9.12.0" ant-design-vue "^3.2.15" From c20f707f77931bcd6d35ab1c2a201838682a0c10 Mon Sep 17 00:00:00 2001 From: xieyonghong <18010623010@163.com> Date: Wed, 1 Mar 2023 14:23:21 +0800 Subject: [PATCH 2/3] =?UTF-8?q?update:=20=E4=BF=AE=E6=94=B9=E6=BA=90?= =?UTF-8?q?=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .npmrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.npmrc b/.npmrc index 2462d6db..dfe2ca70 100644 --- a/.npmrc +++ b/.npmrc @@ -1,2 +1,2 @@ always-auth=true -registry=https://registry.jetlinks.cn/ \ No newline at end of file +registry=http://registry.jetlinks.cn/ \ No newline at end of file From 5b7979405e741fa6e9f4443d0371280b0819629a Mon Sep 17 00:00:00 2001 From: JiangQiming <291854119@qq.com> Date: Wed, 1 Mar 2023 14:51:57 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E4=BB=A3=E7=A0=81=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E5=99=A8=E5=85=89=E6=A0=87=E4=B8=80=E7=9B=B4=E5=9C=A8=E6=96=87?= =?UTF-8?q?=E6=9C=AC=E6=9C=80=E5=89=8D=E9=9D=A2=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/MonacoEditor/index.vue | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/components/MonacoEditor/index.vue b/src/components/MonacoEditor/index.vue index 21f8ba61..d748341b 100644 --- a/src/components/MonacoEditor/index.vue +++ b/src/components/MonacoEditor/index.vue @@ -75,7 +75,7 @@ watchEffect(() => { }); const insert = (val) => { - if (!instance) return + if (!instance) return; const position = instance.getPosition(); instance.executeEdits(instance.getValue(), [ { @@ -88,17 +88,19 @@ const insert = (val) => { text: val, }, ]); -} +}; -watch(() => props.modelValue, - (val) => { - instance.setValue(val) - }) +// watch( +// () => props.modelValue, +// (val) => { +// instance.setValue(val); +// }, +// ); defineExpose({ editorFormat, insert, -}) +});