kubbo/dvcp_v2_webapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bin-code-editor=>bin-ace-editor

Browse Source
This commit is contained in:
aixianling
2023-02-01 14:59:50 +08:00
parent d4d662a201
commit d0965fddfe
2 changed files with 313 additions and 308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packages/bigscreen/designer/components/form/DataConfig.vue
View File

@@ -63,7 +63,8 @@
</div> </div>
</div> </div>
</div> </div>
<div class="layout-config__group" v-if="options.dataType !== 'staticData' && options.type === 'monitor' && (options.monitorType === 'cmcc' || options.monitorType === 'slw')"> <div class="layout-config__group"
v-if="options.dataType !== 'staticData' && options.type === 'monitor' && (options.monitorType === 'cmcc' || options.monitorType === 'slw')">
<h2>字段设置</h2> <h2>字段设置</h2>
<div class="layout-config__item"> <div class="layout-config__item">
<label>监控视频</label> <label>监控视频</label>
@@ -97,7 +98,8 @@
<div class="layout-config__item"> <div class="layout-config__item">
<label>Y轴设置</label> <label>Y轴设置</label>
<div class="layout-config__item--right"> <div class="layout-config__item--right">
<el-select size="mini" multiple :multiple-limit="options.type.indexOf('pie') > -1 ? 1 : 100" v-model="options.dataY" collapse-tags placeholder="请选择Y轴" @change="onChooseChange"> <el-select size="mini" multiple :multiple-limit="options.type.indexOf('pie') > -1 ? 1 : 100" v-model="options.dataY" collapse-tags placeholder="请选择Y轴"
@change="onChooseChange">
<el-option <el-option
v-for="(item, index) in keys" v-for="(item, index) in keys"
:key="index" :key="index"
@@ -113,10 +115,10 @@
<script> <script>
import CodeEditor from 'bin-ace-editor' import CodeEditor from 'bin-ace-editor'
require('brace/mode/json') import 'brace/mode/json'
require('brace/snippets/json') import 'brace/snippets/json';
require('brace/theme/github') import 'brace/theme/github';
require('brace/theme/monokai') import 'brace/theme/monokai';
export default { export default {
name: 'dataConfig', name: 'dataConfig',
@@ -335,6 +337,7 @@
} }
} }
} }
.layout-config__group--wrapper { .layout-config__group--wrapper {
.layout-config__code .bin-ace-editor { .layout-config__code .bin-ace-editor {
} }

8
packages/extra/AppModConfig/AppModConfig.vue
View File

@@ -36,7 +36,6 @@
<code-editor v-model="form.config" auto-format :lint="false"/> <code-editor v-model="form.config" auto-format :lint="false"/>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row type="flex" justify="center" class="footer"> <el-row type="flex" justify="center" class="footer">
<el-button @click="drawer=false">取消</el-button> <el-button @click="drawer=false">取消</el-button>
<el-button type="primary" @click="submit">提交</el-button> <el-button type="primary" @click="submit">提交</el-button>
@@ -47,8 +46,11 @@
</template> </template>
<script> <script>
import {CodeEditor} from 'bin-code-editor' import {CodeEditor} from 'bin-ace-editor'
import 'bin-code-editor/lib/styles/index.css' import 'brace/mode/json'
import 'brace/snippets/json';
import 'brace/theme/github';
import 'brace/theme/monokai';
const label = "应用定制配置"; const label = "应用定制配置";
export default { export default {