diff --git a/DataRoom/pom.xml b/DataRoom/pom.xml index 2d543599..01e40c9f 100644 --- a/DataRoom/pom.xml +++ b/DataRoom/pom.xml @@ -60,7 +60,7 @@ 0.3.2 2.2 4.9.1 - 1.0.1.2023083001.Alpha + 1.0.1.2023083101.Alpha diff --git a/data-room-ui/packages/BigScreenDesign/CloseDialog/index.vue b/data-room-ui/packages/BigScreenDesign/CloseDialog/index.vue new file mode 100644 index 00000000..2a0ce24f --- /dev/null +++ b/data-room-ui/packages/BigScreenDesign/CloseDialog/index.vue @@ -0,0 +1,55 @@ + + + + diff --git a/data-room-ui/packages/BigScreenDesign/LeftPanel.vue b/data-room-ui/packages/BigScreenDesign/LeftPanel.vue index 1a7f1748..790b048b 100644 --- a/data-room-ui/packages/BigScreenDesign/LeftPanel.vue +++ b/data-room-ui/packages/BigScreenDesign/LeftPanel.vue @@ -563,6 +563,7 @@ export default { display: block; width: 100%; font-size: 12px; + text-align: center; } } } diff --git a/data-room-ui/packages/BigScreenDesign/PageDesignTop.vue b/data-room-ui/packages/BigScreenDesign/PageDesignTop.vue index 8e131c8e..5d42ed8e 100644 --- a/data-room-ui/packages/BigScreenDesign/PageDesignTop.vue +++ b/data-room-ui/packages/BigScreenDesign/PageDesignTop.vue @@ -5,11 +5,13 @@ class="menu-img" src="../BigScreenDesign/images/app.png" alt="返回" - @click="backManagement" + @click="goBackManage" > {{ pageInfo.name }}
+ 缩放比例 + - 对齐 + 对齐方式 + {{ mode.label }} @@ -96,6 +99,7 @@ :page-info="pageInfo" @replaceItByTemplate="replaceItByTemplate" /> +
@@ -111,6 +115,7 @@ import cloneDeep from 'lodash/cloneDeep' import uniqBy from 'lodash/uniqBy' import { stringifyObjectFunctions } from 'data-room-ui/js/utils/evalFunctions' import AssignDialog from 'data-room-ui/BigScreenDesign/AssignDialog/index.vue' +import CloseDialog from 'data-room-ui/BigScreenDesign/CloseDialog/index.vue' import HistoryList from 'data-room-ui/BigScreenDesign/HistoryList/index.vue' import CusBtn from './BtnLoading' import icons from 'data-room-ui/assets/images/alignIcon/export' @@ -121,7 +126,6 @@ import { translateBlobToBase64 } from 'data-room-ui/js/utils/compressImg' import * as imageConversion from 'image-conversion' -import { themeToSetting } from 'data-room-ui/js/utils/themeFormatting' export default { name: 'PageTopSetting', components: { @@ -129,7 +133,8 @@ export default { ChooseTemplateDialog, AssignDialog, CusBtn, - HistoryList + HistoryList, + CloseDialog }, props: { code: { @@ -189,7 +194,8 @@ export default { pageInfo: (state) => state.bigScreen.pageInfo, timelineStore: (state) => state.bigScreen.timelineStore, currentTimeLine: (state) => state.bigScreen.currentTimeLine, - activeCodes: state => state.bigScreen.activeCodes + activeCodes: state => state.bigScreen.activeCodes, + zoom: (state) => state.bigScreen.zoom, }), pageCode () { return this.$route.query.code || this.code @@ -218,6 +224,10 @@ export default { undoTimeLine: 'bigScreen/undoTimeLine', saveTimeLine: 'bigScreen/saveTimeLine' }), + changeZoom(val){ + this.$emit('changeZoom', val) + // console.log(val) + }, // 切换主题 changeTheme (val) { // 调取每个组件内部切换主题的方法 @@ -323,6 +333,13 @@ export default { return value1 - value2 // 升序 } }, + goBackManage(){ + this.$refs.CloseDialog.init() + }, + async backSave(){ + await this.save() + this.backManagement() + }, backManagement () { this.$router.push({ path: this.pageInfo.type === 'component' ? (window.BS_CONFIG?.routers?.componentUrl || '/big-screen-components') : (window.BS_CONFIG?.routers?.pageManagementUrl || '/home') }) const data = { componentsManagementType: 'component' } @@ -599,6 +616,7 @@ export default { } } .align-list-dropdown{ + width: 100px !important; color: #ffffff!important; } @@ -616,4 +634,13 @@ export default { } } +::v-deep .el-input__inner, +::v-deep .el-color-picker__color-inner, +::v-deep .el-input-number--mini, +::v-deep .el-textarea__inner, +::v-deep .el-input-group__append { + background: var(--bs-el-background-1); + color: var(--bs-el-text); + border: 0 !important; +} diff --git a/data-room-ui/packages/BigScreenDesign/RulerTool/SketchRuler.vue b/data-room-ui/packages/BigScreenDesign/RulerTool/SketchRuler.vue index 449af5c0..90f28455 100644 --- a/data-room-ui/packages/BigScreenDesign/RulerTool/SketchRuler.vue +++ b/data-room-ui/packages/BigScreenDesign/RulerTool/SketchRuler.vue @@ -191,7 +191,7 @@ export default { } // 30是grid-wrap-box的底部工具栏高度 - this.innerHeight = screensRect.height - 30 + this.innerHeight = screensRect.height this.innerWidth = screensRect.width this.diffX = this.width - screensRect.width this.diffY = this.height - screensRect.height diff --git a/data-room-ui/packages/BigScreenDesign/index.vue b/data-room-ui/packages/BigScreenDesign/index.vue index be4e1acc..0220ce2f 100644 --- a/data-room-ui/packages/BigScreenDesign/index.vue +++ b/data-room-ui/packages/BigScreenDesign/index.vue @@ -10,6 +10,7 @@ @updateRightVisiable="updateRightVisiable" @showPageInfo="showPageInfo" @updateTheme="updateTheme" + @changeZoom="changeScreenZoom" @empty="empty" />
@@ -54,7 +55,7 @@ /> -
+
- + + ES案例 + +
+ +
确定 + +
+ +
+ + + 关闭 + 使用该案例 + +
@@ -642,7 +679,38 @@ export default { paramsListCopy: [], isSet: false, // 参数是否配置状态 passTest: false, - fieldDesc: null // 字段描述 + fieldDesc: null, // 字段描述 + exampleVisible: false, + currentExample: '', + exampleList: { + es: `import com.gccloud.dataset.utils.ElasticsearchDsService; + +def dsl = ''' +{ + "query":{ + "match_all":{} + } +} +''' +def host = "127.0.0.1" +int port = 9200 +def username = "elastic" +def password = "pwd" +def path = "/_search" + +/** + * query方法的参数说明： + * host es的ip + * port es的端口 + * username es的用户名，如果没有可以不填 + * password es的密码，如果没有可以不填 + * path es的查询路径 + * dsl 查询的dsl，示例见上面 + * return 查询结果，List格式 + */ +return ElasticsearchDsService.query(host, port, username, password, path, dsl); +` + } } }, computed: { @@ -906,7 +974,18 @@ export default { treeFilter (value, data) { if (!value) return true return data.name.indexOf(value) !== -1 - } + }, + /** + * 获取脚本案例 + */ + example(type) { + this.exampleVisible = true + this.currentExample = this.exampleList[type] + }, + useExample() { + this.dataForm.script = this.currentExample + this.exampleVisible = false + }, } } @@ -954,15 +1033,24 @@ export default { // .codeStyle { // border: 1px solid #EBEEF5; // } -::v-deep .CodeMirror { - height: 180px !important; - font-family: Helvetica, Tahoma; - // .CodeMirror-scroll { - // background: #fff; - // .CodeMirror-gutters { - // background: #f6f7fb; - // } - // } +.code-out { + ::v-deep .CodeMirror { + height: 180px ; + font-family: Helvetica, Tahoma; + // .CodeMirror-scroll { + // background: #fff; + // .CodeMirror-gutters { + // background: #f6f7fb; + // } + // } + } +} + +.code-inner { + ::v-deep .CodeMirror { + height: 400px ; + font-family: Helvetica, Tahoma; + } } .no-border {