Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev

.npmrc

@@ -1,2 +1,2 @@
 always-auth=true
-registry=https://registry.jetlinks.cn/
+registry=http://registry.jetlinks.cn/

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,
-})
+});
 </script>
 
 <style lang="less" scoped>

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;

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,

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"