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:
wzyyy 2023-03-16 10:44:27 +08:00
parent da47dcb028 5604c8bd35
commit 7d10dc3e6e
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/ValueItem/index.vue
View File

@ -86,8 +86,8 @@
@cancel="modalVis = false"
@ok="handleItemModalSubmit"
>
<div style="width: 100%; height: 400px">
<MonacoEditor v-model:modelValue="objectValue" />
<div style="width: 100%; height: 300px">
<JMonacoEditor v-model:modelValue="objectValue" />
</div>
</j-modal>
</div>
@ -97,7 +97,6 @@
import { PropType } from 'vue';
import { UploadChangeParam, UploadFile } from 'ant-design-vue';
import { DefaultOptionType } from 'ant-design-vue/lib/select';
import MonacoEditor from '@/components/MonacoEditor/index.vue';
import GeoComponent from '@/components/GeoComponent/index.vue';
import { BASE_API_PATH, TOKEN_KEY } from '@/utils/variable';
import { LocalStore } from '@/utils/comm';

2
src/views/device/Instance/Detail/Function/components/Advance.vue
View File

@ -8,7 +8,7 @@
>
<j-row :gutter="30">
<j-col :span="15">
<MonacoEditor
<JMonacoEditor
:ref="`monacoEditor${func.id}`"
v-model="func.json"
theme="vs-dark"