0017
/
iot-ui-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
leiqiaochu 2023-03-01 14:56:58 +08:00
parent b71248c1b4 344729b5de
commit eee87548e8
5 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.npmrc
View File

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

16
src/components/MonacoEditor/index.vue
View File

@ -75,7 +75,7 @@ watchEffect(() => {
}); });
const insert = (val) => { const insert = (val) => {
if (!instance) return if (!instance) return;
const position = instance.getPosition(); const position = instance.getPosition();
instance.executeEdits(instance.getValue(), [ instance.executeEdits(instance.getValue(), [
{ {
@ -88,17 +88,19 @@ const insert = (val) => {
text: val, text: val,
}, },
]); ]);
} };
watch(() => props.modelValue, // watch(
(val) => { // () => props.modelValue,
instance.setValue(val) // (val) => {
}) // instance.setValue(val);
// },
// );
defineExpose({ defineExpose({
editorFormat, editorFormat,
insert, insert,
}) });
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>

3
src/style/variable.less
View File

@ -1,5 +1,4 @@
@import 'ant-design-vue/es/style/themes/default.less'; @import 'jetlinks-ui-components/es/style/variable.less';
//@import 'jetlinks-ui-components/es/style/default.less';
.ellipsisFn(@num: 1, @width: 100%) { .ellipsisFn(@num: 1, @width: 100%) {
display: -webkit-box; display: -webkit-box;

1
vite.config.ts
View File

@ -98,6 +98,7 @@ export default defineConfig(({ mode}) => {
preprocessorOptions: { preprocessorOptions: {
less: { less: {
modifyVars: { modifyVars: {
'root-entry-name': 'variable',
hack: `true; @import (reference) "${path.resolve('src/style/variable.less')}";`, hack: `true; @import (reference) "${path.resolve('src/style/variable.less')}";`,
}, },
javascriptEnabled: true, javascriptEnabled: true,

4
yarn.lock
View File

@ -3898,8 +3898,8 @@ jetlinks-store@^0.0.3:
jetlinks-ui-components@^1.0.0: jetlinks-ui-components@^1.0.0:
version "1.0.0" version "1.0.0"
resolved "https://registry.jetlinks.cn/jetlinks-ui-components/-/jetlinks-ui-components-1.0.0.tgz#9802688f088bfa5441e8d2c1198e4782226ad334" resolved "https://registry.jetlinks.cn/jetlinks-ui-components/-/jetlinks-ui-components-1.0.0.tgz#d12144cd57e9547a9fdec1b28fe4c4135fba50ce"
integrity sha512-JF+r6dRBFJmy3BWgO4Dwt6uTvNDBd0lsQrjIYkE1YEZRwYVE1g58gY6CUX4q7q1qw9wncZxr5iXL4EjX2+IHhw== integrity sha512-oqeQpQqidJJMdPa/DzU4V++93r9i9IdHEvqNqDg/+zzw+AhbehtcaRKUVb2bQcMWWCnJWCdv0Md8K5NIdIaoDw==
dependencies: dependencies:
"@vueuse/core" "^9.12.0" "@vueuse/core" "^9.12.0"
ant-design-vue "^3.2.15" ant-design-vue "^3.2.15"