Merge remote-tracking branch 'origin/master' into pr

main
hong.yang 1 year ago
commit ab18b001f2

@ -1,6 +1,6 @@
{
"name": "@gcpaas/data-room-ui",
"version": "2.0.0-RELEASE",
"version": "2.0.1-RELEASE",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@ -1660,9 +1660,9 @@
"dev": true
},
"@gcpaas/vue-draggable-resizable-gorkys": {
"version": "1.0.1-2023101602-Alpha",
"resolved": "https://registry.npmjs.org/@gcpaas/vue-draggable-resizable-gorkys/-/vue-draggable-resizable-gorkys-1.0.1-2023101602-Alpha.tgz",
"integrity": "sha512-bNC/v2B4tByl2Z7GfXXsBFkcIiHhxtaaDatjpwmz5KMpK72VzK1RPhePnePyr/yPFLhQiE2NbPpjpvDLRiz1tg==",
"version": "1.0.1-2023101705-Alpha",
"resolved": "https://registry.npmjs.org/@gcpaas/vue-draggable-resizable-gorkys/-/vue-draggable-resizable-gorkys-1.0.1-2023101705-Alpha.tgz",
"integrity": "sha512-y03QX0I88eM7ZJMS88cG0g+2ak9jPZdXAHZCO2bFR4L88KllMWQ3tW4jEbqbWll3Xz0npN5JwHn4V2ltSgd6ew==",
"requires": {
"core-js": "^2.6.11"
},
@ -3394,7 +3394,7 @@
"dependencies": {
"@vue/vue-loader-v15": {
"version": "npm:vue-loader@15.10.2",
"resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-15.10.2.tgz",
"resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.10.2.tgz",
"integrity": "sha512-ndeSe/8KQc/nlA7TJ+OBhv2qalmj1s+uBs7yHDRFaAXscFTApBzY9F1jES3bautmgWjDlDct0fw8rPuySDLwxw==",
"dev": true,
"requires": {
@ -3407,7 +3407,7 @@
"dependencies": {
"hash-sum": {
"version": "1.0.2",
"resolved": "https://registry.npmmirror.com/hash-sum/-/hash-sum-1.0.2.tgz",
"resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
"integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
"dev": true
}
@ -3486,7 +3486,7 @@
},
"json5": {
"version": "1.0.2",
"resolved": "https://registry.npmmirror.com/json5/-/json5-1.0.2.tgz",
"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
"integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
"dev": true,
"requires": {
@ -3495,7 +3495,7 @@
},
"loader-utils": {
"version": "1.4.2",
"resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-1.4.2.tgz",
"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
"integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
"dev": true,
"requires": {

@ -1,6 +1,6 @@
{
"name": "@gcpaas/data-room-ui",
"version": "2.0.1-RELEASE",
"version": "2.0.1-2023101801-Alpha",
"description": "自定义大屏",
"author": "gcpaas",
"license": "MIT",
@ -56,7 +56,7 @@
"dependencies": {
"@amap/amap-jsapi-loader": "^1.0.1",
"@antv/g2plot": "2.4.0",
"@gcpaas/vue-draggable-resizable-gorkys": "^1.0.1-2023101602-Alpha",
"@gcpaas/vue-draggable-resizable-gorkys": "^1.0.1-2023101705-Alpha",
"@jiaminghi/data-view": "2.10.0",
"axios": "0.18.1",
"echarts": "^5.2.2",

@ -28,12 +28,12 @@
:bigTitle='config.title'
/>
</div>
<!-- <SettingTitle>旋转</SettingTitle>
<SettingTitle>旋转</SettingTitle>
<div class="lc-field-body">
<RotateSetting
:config="config"
/>
</div> -->
</div>
<SettingTitle>基础</SettingTitle>
<div class="lc-field-body">
<el-form-item label="按钮名称">

@ -35,12 +35,12 @@
label-width="120px"
/>
</div>
<!-- <SettingTitle>旋转</SettingTitle>
<div class="lc-field-body">
<RotateSetting
:config="config"
/>
</div> -->
<SettingTitle>旋转</SettingTitle>
<div class="lc-field-body">
<RotateSetting
:config="config"
/>
</div>
<SettingTitle>基础</SettingTitle>
<div class="lc-field-body">
<el-form-item

@ -37,12 +37,12 @@
:bigTitle='config.title'
/>
</div>
<!-- <SettingTitle>旋转</SettingTitle>
<div class="lc-field-body">
<RotateSetting
:config="config"
/>
</div> -->
<SettingTitle>旋转</SettingTitle>
<div class="lc-field-body">
<RotateSetting
:config="config"
/>
</div>
<SettingTitle>基础</SettingTitle>
<div class="setting-wrap">
<el-form-item

@ -37,12 +37,12 @@
:bigTitle='config.title'
/>
</div>
<!-- <SettingTitle>旋转</SettingTitle>
<div class="lc-field-body">
<RotateSetting
:config="config"
/>
</div> -->
<SettingTitle>旋转</SettingTitle>
<div class="lc-field-body">
<RotateSetting
:config="config"
/>
</div>
<SettingTitle>基础</SettingTitle>
<div class="setting-wrap">
<el-form-item

@ -19,12 +19,12 @@
<div class="lc-field-body">
<PosWhSetting :config="config" />
</div>
<!-- <SettingTitle>旋转</SettingTitle>
<SettingTitle>旋转</SettingTitle>
<div class="lc-field-body">
<RotateSetting
:config="config"
/>
</div> -->
</div>
<SettingTitle>基础</SettingTitle>
<div class="lc-field-body">
<el-form-item label="组件类型">

@ -36,12 +36,12 @@
:bigTitle='config.title'
/>
</div>
<!-- <SettingTitle>旋转</SettingTitle>
<SettingTitle>旋转</SettingTitle>
<div class="lc-field-body">
<RotateSetting
:config="config"
/>
</div> -->
</div>
<SettingTitle>基础</SettingTitle>
<div class="lc-field-body">
<el-form-item label="字体大小">

@ -33,12 +33,12 @@
:bigTitle='config.title'
/>
</div>
<!-- <SettingTitle>旋转</SettingTitle>
<div class="lc-field-body">
<RotateSetting
:config="config"
/>
</div> -->
<SettingTitle>旋转</SettingTitle>
<div class="lc-field-body">
<RotateSetting
:config="config"
/>
</div>
<SettingTitle>基础</SettingTitle>
<div class="lc-field-body">
<el-form-item

@ -28,12 +28,12 @@
<div class="lc-field-body">
<PosWhSetting :config="config" />
</div>
<!-- <SettingTitle>旋转</SettingTitle>
<SettingTitle>旋转</SettingTitle>
<div class="lc-field-body">
<RotateSetting
:config="config"
/>
</div> -->
</div>
<SettingTitle v-if="config.border"></SettingTitle>
<div class="lc-field-body">
<BorderSetting

@ -29,12 +29,12 @@
<div class="setting-wrap">
<PosWhSetting :config="config" />
</div>
<!-- <SettingTitle>旋转</SettingTitle>
<div class="lc-field-body">
<RotateSetting
:config="config"
/>
</div> -->
<SettingTitle>旋转</SettingTitle>
<div class="lc-field-body">
<RotateSetting
:config="config"
/>
</div>
<SettingTitle v-if="config.border"></SettingTitle>
<div class="lc-field-body">
<BorderSetting

@ -27,12 +27,12 @@
<div class="lc-field-body">
<PosWhSetting :config="config" />
</div>
<!-- <SettingTitle>旋转</SettingTitle>
<SettingTitle>旋转</SettingTitle>
<div class="lc-field-body">
<RotateSetting
:config="config"
/>
</div> -->
</div>
<!-- <SettingTitle v-if="config.border"></SettingTitle>
<div class="lc-field-body">
<BorderSetting

@ -36,12 +36,12 @@
:bigTitle='config.title'
/>
</div> -->
<!-- <SettingTitle>旋转</SettingTitle>
<SettingTitle>旋转</SettingTitle>
<div class="lc-field-body">
<RotateSetting
:config="config"
/>
</div> -->
</div>
<SettingTitle>基础</SettingTitle>
<div class="lc-field-body">
<el-form-item label-width="100px" label="渐变背景色一">

@ -27,12 +27,12 @@
<div class="lc-field-body">
<PosWhSetting :config="config" />
</div>
<!-- <SettingTitle>旋转</SettingTitle>
<SettingTitle>旋转</SettingTitle>
<div class="lc-field-body">
<RotateSetting
:config="config"
/>
</div> -->
</div>
<!-- <SettingTitle v-if="config.border"></SettingTitle>
<div class="lc-field-body">
<BorderSetting

@ -27,12 +27,12 @@
<div class="lc-field-body">
<PosWhSetting :config="config" />
</div>
<!-- <SettingTitle>旋转</SettingTitle>
<SettingTitle>旋转</SettingTitle>
<div class="lc-field-body">
<RotateSetting
:config="config"
/>
</div> -->
</div>
<!-- <SettingTitle v-if="config.border"></SettingTitle>
<div class="lc-field-body">
<BorderSetting

@ -72,12 +72,12 @@
<div class="lc-field-body">
<PosWhSetting :config="config" />
</div>
<!-- <SettingTitle>旋转</SettingTitle>
<SettingTitle>旋转</SettingTitle>
<div class="lc-field-body">
<RotateSetting
:config="config"
/>
</div> -->
</div>
<SettingTitle>基础</SettingTitle>
<div class="lc-field-body">
<el-form-item label="输入值字体大小">

@ -40,12 +40,12 @@
:bigTitle='config.title'
/>
</div>
<!-- <SettingTitle>旋转</SettingTitle>
<SettingTitle>旋转</SettingTitle>
<div class="lc-field-body">
<RotateSetting
:config="config"
/>
</div> -->
</div>
<SettingTitle>基础</SettingTitle>
<div class="bs-setting-wrap">
<el-form-item

@ -33,12 +33,12 @@
:bigTitle='config.title'
/>
</div>
<!-- <SettingTitle>旋转</SettingTitle>
<div class="lc-field-body">
<RotateSetting
:config="config"
/>
</div> -->
<SettingTitle>旋转</SettingTitle>
<div class="lc-field-body">
<RotateSetting
:config="config"
/>
</div>
<SettingTitle>基础</SettingTitle>
<div class="lc-field-body">
<el-form-item

@ -40,12 +40,12 @@
:bigTitle='config.title'
/>
</div>
<!-- <SettingTitle>旋转</SettingTitle>
<div class="lc-field-body">
<RotateSetting
:config="config"
/>
</div> -->
<SettingTitle>旋转</SettingTitle>
<div class="lc-field-body">
<RotateSetting
:config="config"
/>
</div>
<SettingTitle>基础</SettingTitle>
<div class="lc-field-body">
<el-form-item

@ -42,12 +42,12 @@
:big-title="config.title"
/>
</div>
<!-- <SettingTitle>旋转</SettingTitle>
<div class="lc-field-body">
<RotateSetting
:config="config"
/>
</div> -->
<SettingTitle>旋转</SettingTitle>
<div class="lc-field-body">
<RotateSetting
:config="config"
/>
</div>
<SettingTitle>基础</SettingTitle>
<div class="lc-field-body">
<el-form-item

@ -40,12 +40,12 @@
:bigTitle='config.title'
/>
</div>
<!-- <SettingTitle>旋转</SettingTitle>
<div class="lc-field-body">
<RotateSetting
:config="config"
/>
</div> -->
<SettingTitle>旋转</SettingTitle>
<div class="lc-field-body">
<RotateSetting
:config="config"
/>
</div>
<SettingTitle>基础</SettingTitle>
<div class="lc-field-body">
<el-form-item

@ -36,12 +36,12 @@
:bigTitle='config.title'
/>
</div>
<!-- <SettingTitle>旋转</SettingTitle>
<SettingTitle>旋转</SettingTitle>
<div class="lc-field-body">
<RotateSetting
:config="config"
/>
</div> -->
</div>
<SettingTitle>基础</SettingTitle>
<div class="lc-field-body">
<el-form-item label="表头背景色">

@ -35,12 +35,12 @@
:bigTitle='config.title'
/>
</div>
<!-- <SettingTitle>旋转</SettingTitle>
<SettingTitle>旋转</SettingTitle>
<div class="lc-field-body">
<RotateSetting
:config="config"
/>
</div> -->
</div>
<SettingTitle>基础</SettingTitle>
<div class="lc-field-body">
<el-form-item

@ -19,12 +19,12 @@
<div class="lc-field-body">
<PosWhSetting :config="config" />
</div>
<!-- <SettingTitle>旋转</SettingTitle>
<SettingTitle>旋转</SettingTitle>
<div class="lc-field-body">
<RotateSetting
:config="config"
/>
</div> -->
</div>
<SettingTitle>基础</SettingTitle>
<div class="lc-field-body">
<!-- 选择器背景颜色 -->

@ -35,12 +35,12 @@
label-width="120px"
/>
</div>
<!-- <SettingTitle>旋转</SettingTitle>
<div class="lc-field-body">
<RotateSetting
:config="config"
/>
</div> -->
<SettingTitle>旋转</SettingTitle>
<div class="lc-field-body">
<RotateSetting
:config="config"
/>
</div>
<SettingTitle>基础</SettingTitle>
<div class="lc-field-body">
<el-form-item label="表头颜色">

@ -42,12 +42,12 @@
:big-title="config.title"
/>
</div>
<!-- <SettingTitle>旋转</SettingTitle>
<div class="lc-field-body">
<RotateSetting
:config="config"
/>
</div> -->
<SettingTitle>旋转</SettingTitle>
<div class="lc-field-body">
<RotateSetting
:config="config"
/>
</div>
<SettingTitle>基础</SettingTitle>
<div class="lc-field-body">
<el-form-item

@ -36,12 +36,12 @@
:bigTitle='config.title'
/>
</div>
<!-- <SettingTitle>旋转</SettingTitle>
<div class="lc-field-body">
<RotateSetting
:config="config"
/>
</div> -->
<SettingTitle>旋转</SettingTitle>
<div class="lc-field-body">
<RotateSetting
:config="config"
/>
</div>
<SettingTitle>基础</SettingTitle>
<div class="lc-field-body">
<el-form-item

@ -26,12 +26,12 @@
:bigTitle='config.title'
/>
</div>
<!-- <SettingTitle>旋转</SettingTitle>
<div class="lc-field-body">
<RotateSetting
:config="config"
/>
</div> -->
<SettingTitle>旋转</SettingTitle>
<div class="lc-field-body">
<RotateSetting
:config="config"
/>
</div>
<SettingTitle>基础</SettingTitle>
<div class="lc-field-body">
<el-form-item

@ -36,12 +36,12 @@
:bigTitle='config.title'
/>
</div>
<!-- <SettingTitle>旋转</SettingTitle>
<div class="lc-field-body">
<RotateSetting
:config="config"
/>
</div> -->
<SettingTitle>旋转</SettingTitle>
<div class="lc-field-body">
<RotateSetting
:config="config"
/>
</div>
<SettingTitle>基础</SettingTitle>
<div class="lc-field-body">
<el-form-item

@ -19,12 +19,12 @@
<div class="lc-field-body">
<PosWhSetting :config="config" />
</div>
<!-- <SettingTitle>旋转</SettingTitle>
<SettingTitle>旋转</SettingTitle>
<div class="lc-field-body">
<RotateSetting
:config="config"
/>
</div> -->
</div>
<SettingTitle>基础</SettingTitle>
<div class="lc-field-body">
<!-- 选择器背景颜色 -->

@ -37,12 +37,12 @@
:bigTitle='config.title'
/>
</div>
<!-- <SettingTitle>旋转</SettingTitle>
<SettingTitle>旋转</SettingTitle>
<div class="lc-field-body">
<RotateSetting
:config="config"
/>
</div> -->
</div>
<SettingTitle>基础</SettingTitle>
<div class="lc-field-body">
<el-form-item label="背景色一">

@ -37,12 +37,12 @@
:bigTitle='config.title'
/>
</div>
<!-- <SettingTitle>旋转</SettingTitle>
<SettingTitle>旋转</SettingTitle>
<div class="lc-field-body">
<RotateSetting
:config="config"
/>
</div> -->
</div>
<SettingTitle>基础</SettingTitle>
<div class="lc-field-body">
<el-form-item label="视频链接">

@ -27,12 +27,12 @@
<div class="lc-field-body">
<PosWhSetting :config="config" />
</div>
<!-- <SettingTitle>旋转</SettingTitle>
<SettingTitle>旋转</SettingTitle>
<div class="lc-field-body">
<RotateSetting
:config="config"
/>
</div> -->
</div>
<SettingTitle>基础</SettingTitle>
<div class="lc-field-body">
<slot name="top" />

@ -151,7 +151,7 @@
v-model="config[setting.field]"
v-else-if="setting.type === 'background'"
clearable
placeholder="请选择图片"
placeholder="选择或输入链接"
>
<template slot="append">
<el-button
@ -163,6 +163,13 @@
</el-button>
</template>
</el-input>
<el-button
v-else-if="setting.type === 'move'"
type="primary"
@click="initMove(config.imgUrl)"
>
图形切割
</el-button>
<el-select
v-else-if="setting.type === 'select'"
v-model="config[setting.field]"
@ -267,6 +274,7 @@
</el-form-item>
</div>
<SourceDialog ref="SourceDialog" @getImg='changeImg' />
<MoveDialog @getArray='changeBorder' ref="MoveDialog"/>
</div>
</div>
</template>
@ -277,13 +285,15 @@ import BorderColorSetting from 'data-room-ui/BigScreenDesign/RightSetting/Border
import ColorSelect from 'data-room-ui/ColorMultipleSelect/index.vue'
import BorderSelect from 'data-room-ui/BorderSelect/index.vue'
import SourceDialog from '../SourceDialog/index.vue'
import MoveDialog from './MoveDialog/index.vue'
export default {
name: '',
components: {
BorderSelect,
ColorSelect,
BorderColorSetting,
SourceDialog
SourceDialog,
MoveDialog
},
props: {
bigTitle:{
@ -381,6 +391,9 @@ export default {
// }
},
methods: {
changeBorder(val){
this.$set(this.config,'borderArray',val)
},
changeImg(val){
this.$set(this.config,'imgUrl',val.url)
},
@ -389,6 +402,10 @@ export default {
},
initCard(){
this.$refs.SourceDialog.init()
},
initMove(val){
console.log(val)
this.$refs.MoveDialog.init(val,this.config.borderArray)
}
}

@ -27,7 +27,7 @@
label="数据来源"
>
<el-radio-group
v-model="dataSourceStyle"
v-model="config.dataSource.source "
class="bs-el-radio-group"
>
<el-radio label="dataset">
@ -39,7 +39,7 @@
</el-radio-group>
</el-form-item>
<el-form-item
v-if="dataSourceStyle === 'dataset'"
v-if="config.dataSource.source === 'dataset'"
label="数据集"
>
<data-set-select
@ -56,7 +56,7 @@
</data-set-select>
</el-form-item>
<el-form-item
v-if="dataSourceStyle === 'expression' && config.option.displayOption.expression && config.option.displayOption.expression.enable"
v-if="config.dataSource.source === 'expression' && config.option.displayOption.expression && config.option.displayOption.expression.enable"
label="表达式"
>
<i
@ -102,7 +102,7 @@ data.forEach(item => {
</div>
</div>
<div
v-if="!['tree','multipleNumberChart','carousel'].includes(config.type) && config.option.displayOption.dataSourceType.enable && dataSourceStyle !== 'expression'"
v-if="!['tree','multipleNumberChart','carousel'].includes(config.type) && config.option.displayOption.dataSourceType.enable && config.dataSource.source !== 'expression'"
class="data-setting-data-box"
>
<div class="lc-field-head">
@ -300,7 +300,7 @@ data.forEach(item => {
<el-table-column
prop="width"
label="列宽"
width='90'
width="90"
align="center"
>
<template slot-scope="scope">
@ -470,7 +470,7 @@ data.forEach(item => {
</div>
</div>
<div
v-if="config.option.displayOption.params.enable && dataSourceStyle !== 'expression'"
v-if="config.option.displayOption.params.enable && config.dataSource.source !== 'expression'"
class="data-setting-data-box"
>
<div class="lc-field-head">
@ -642,7 +642,6 @@ export default {
},
data () {
return {
dataSourceStyle: 'dataset', //
fieldsList: [],
params: [], //
datasetName: '',
@ -764,11 +763,10 @@ export default {
}
},
methods: {
changeDsid(dsId){
this.clearVerify()
this.config.customize.columnConfig=[]
changeDsid (dsId) {
this.clearVerify()
this.config.customize.columnConfig = []
this.getDataSetDetailsById(dsId, 'treeTable')
},
//
openExpression () {

@ -37,12 +37,12 @@
:config="config"
/>
</div>
<!-- <SettingTitle>旋转</SettingTitle>
<div class="lc-field-body">
<RotateSetting
:config="config"
/>
</div> -->
<SettingTitle>旋转</SettingTitle>
<div class="lc-field-body">
<RotateSetting
:config="config"
/>
</div>
<template v-for="group in groupList">
<div :key="group.groupName">
<SettingTitle> {{ group.groupName | filterGroupName }}</SettingTitle>

@ -37,12 +37,12 @@
:config="config"
/>
</div>
<!-- <SettingTitle>旋转</SettingTitle>
<div class="lc-field-body">
<RotateSetting
:config="config"
/>
</div> -->
<SettingTitle>旋转</SettingTitle>
<div class="lc-field-body">
<RotateSetting
:config="config"
/>
</div>
<template v-for="group in groupList">
<div :key="group.groupName">
<SettingTitle> {{ group.groupName | filterGroupName }}</SettingTitle>

@ -0,0 +1,338 @@
<template>
<el-dialog
title="点九图"
:visible.sync="dialogVisible"
:modal="true"
width="75%"
:modal-append-to-body="false"
:appen-to-body="false"
class="bs-dialog-wrap bs-el-dialog"
@closed="close"
@opened='getDom'
>
<div class="content">
<div>
<table border="1" cellspacing="0">
<tr>
<th>方向</th>
<th>描述</th>
</tr>
<tr>
<td>左上角</td>
<td>不能拉伸</td>
</tr>
<tr>
<td>右上角</td>
<td>不能拉伸</td>
</tr>
<tr>
<td>左下角</td>
<td>不能拉伸</td>
</tr>
<tr>
<td>右下角</td>
<td>不能拉伸</td>
</tr>
<tr>
<td>左侧</td>
<td>宽度不变高度自动拉伸</td>
</tr>
<tr>
<td>右侧</td>
<td>宽度不变高度自动拉伸</td>
</tr>
<tr>
<td>顶部</td>
<td>高度不变宽度自动拉伸</td>
</tr>
<tr>
<td>底部</td>
<td>高度不变宽度自动拉伸</td>
</tr>
<tr>
<td>中部</td>
<td>宽度高度自动拉伸</td>
</tr>
</table>
</div>
<div class="img">
<span class="toptitle">
<!-- <InputCom @changeStyle='changeTop' :Fx="['上','下']" :number="top" /> -->
<el-input-number
@change='changeTop'
v-model="top"
class="bs-el-input-number"
:step=" 1"
:min="0"
:max="100000"
/>
</span>
<span class="righttitle">
<el-input-number
@change='changeRight'
v-model="right"
class="bs-el-input-number"
:step=" 1"
:min="0"
:max="100000"
/>
</span>
<span class="bottomtitle">
<el-input-number
@change='changeBottom'
v-model="bottom"
class="bs-el-input-number"
:step=" 1"
:min="0"
:max="100000"
/>
</span>
<span class="lefttitle">
<el-input-number
@change='changeLeft'
v-model="left"
class="bs-el-input-number"
:step=" 1"
:min="0"
:max="100000"
/>
</span>
<el-image
style="max-width:550px"
:src="this.imgUrl||url"
fit="fill"></el-image>
<div
@mousedown="onMouseDown"
@mouseup="onMouseUp"
@mousemove="onMousemove"
@click="changeSymbol('top')"
id="top"
class="top">
</div>
<div @click="changeSymbol('right')" id="right" class="right">
</div>
<div @click="changeSymbol('bottom')" id="bottom" class="bottom">
</div>
<div @click="changeSymbol('left')" id="left" class="left">
</div>
</div>
</div>
<div
slot="footer"
class="dialog-footer"
>
<el-button
class="bs-el-button-default"
@click="dialogVisible = false"
>
取消
</el-button>
<el-button
type="primary"
@click="confirm"
>
确定
</el-button>
</div>
</el-dialog>
</template>
<script>
import { getFileUrl } from 'data-room-ui/js/utils/file'
export default {
name: 'SourceDialog',
data () {
return {
dialogVisible: false,
imgUrl:'',
top:0,
right:0,
bottom:0,
left:0,
symbol:'',
isDown:false,
x:0,
y:0,
l:0,
t:0
}
},
computed: {
url(){
return require('data-room-ui/BorderComponents/GcBorder16/component.png')
}
},
mounted () {
},
methods: {
confirm(){
this.$emit('getArray',[this.top,this.right,this.bottom,this.left])
this.dialogVisible = false
},
getDom(){
// const a=document.getElementById('top')
// const b=document.getElementById('right')
// const c=document.getElementById('bottom')
// const d=document.getElementById('left')
// this.top=getComputedStyle(a).top.slice(0,-2)
// this.right=getComputedStyle(b).right.slice(0,-2)
// this.bottom=getComputedStyle(c).bottom.slice(0,-2)
// this.left=getComputedStyle(d).left.slice(0,-2)
},
onMouseUp(){
// this.isDown=false;
},
onMousemove(e){
// const a=document.getElementById('top')
// if(this.isDown==false){
// return
// }
// console.log(e)
// let ny=e.clientY-194;
// let nt=ny-(this.y-this.t);
// a.style.top=nt+"px"
// this.top=a.style.top
},
onMouseDown(e){
// this.y=e.layerY
// this.t=this.top;
// this.isDown=true
// console.log(this.x,this.l)
},
changeSymbol(val){
this.symbol=val
},
close(){
},
changeTop(val){
const a=document.getElementById('top')
a.style.top=val+"px"
},
changeRight(val){
const a=document.getElementById('right')
a.style.right=val+"px"
},
changeBottom(val){
const a=document.getElementById('bottom')
a.style.bottom=val+"px"
},
changeLeft(val){
const a=document.getElementById('left')
a.style.left=val+"px"
},
init (val,array) {
if(!val.startsWith('http')){
this.imgUrl=getFileUrl(val)
}else{
this.imgUrl=val
}
if(array){
[this.top,this.right,this.bottom,this.left]=array
this.$nextTick(()=>{
this.changeTop(this.top)
this.changeRight(this.right)
this.changeBottom(this.bottom)
this.changeLeft(this.left)
})
}
this.dialogVisible = true
},
}
}
</script>
<style lang="scss" scoped>
// @import '../../assets/style/bsTheme.scss';
::v-deep .el-dialog__body{
background-color: #232832;
position: relative;
min-height: 450px;
align-items: center;
justify-content: center;
display: flex;
padding: 16px 16px 16px 16px !important;
}
.content{
margin: 20px 0;
width: 100%;
display: flex;
justify-content: center;
align-items: center;
.img{
position: relative;
.toptitle{
position: absolute;
top: -30px;
left: 34%;
}
.righttitle{
position: absolute;
top: 50%;
right: -110px;
}
.bottomtitle{
position: absolute;
bottom: -30px;
left: 34%;
}
.lefttitle{
position: absolute;
top: 50%;
left: -110px;
}
// height: 100%;
.top{
position: absolute;
top: 0;
height: 1px;
background-color: #fff;
width: 100%;
}
.right{
position: absolute;
right: 0;
top: 0;
height: 100%;
background-color: #fff;
width: 1px;
}
.bottom{
position: absolute;
bottom: 0;
height: 1px;
background-color: #fff;
width: 100%;
}
.left{
position: absolute;
left: 0;
top: 0;
height: 100%;
background-color: #fff;
width: 1px;
}
}
}
::v-deep .el-input-number--mini{
width: 100px;
.el-input__inner{
padding-right: 30px;
}
}
table{
margin-right: 200px;
color: #fff;
border: 1px solid #fff;
}
th{
padding: 4px;
}
td{
padding: 8px;
}
</style>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 46 KiB

After

Width:  |  Height:  |  Size: 6.0 KiB

@ -4,6 +4,7 @@
class="bs-design-wrap"
:id="'border'+ config.code"
:style="{
opacity: opacity,
borderImageSlice:`${borderArray[0]} ${borderArray[1]} ${borderArray[2]} ${borderArray[3]} fill`,
borderImageWidth:`${borderArray[0]}px ${borderArray[1]}px ${borderArray[2]}px ${borderArray[3]}px`,
}"
@ -12,6 +13,7 @@
</template>
<script>
import { refreshComponentMixin } from 'data-room-ui/js/mixins/refreshComponent'
import { getFileUrl } from 'data-room-ui/js/utils/file'
export default {
name: 'Border14',
components: {
@ -33,25 +35,45 @@ export default {
}
},
computed: {
url(){
return require('data-room-ui/BorderComponents/GcBorder16/component.png')
},
opacity () {
return this.config.border.opacity || 100
},
borderArray(){
return this.config.border.borderArray ? this.config.border.borderArray
: [100,100,100,100]
: [50,50,50,50]
}
},
watch: {
'config.border.imgUrl': {
handler (val) {
if(val){
let ur=val
if(!val.startsWith('http')){
ur = getFileUrl(val)
}
const a =document.getElementById('border'+ this.config.code)
a.style['border-image-source']=`url(${val})`
a.style['border-image-source']=`url(${ur})`
}else{
const a =document.getElementById('border'+ this.config.code)
a.style['border-image-source']=`url(${this.url})`
}
}
}
},
mounted () {
if(this.config.border.imgUrl){
let ur=this.config.border.imgUrl
if(!this.config.border.imgUrl.startsWith('http')){
ur = getFileUrl(this.config.border.imgUrl)
}
const a =document.getElementById('border'+ this.config.code)
a.style['border-image-source']=`url(${ur})`
}else{
const a =document.getElementById('border'+ this.config.code)
a.style['border-image-source']=`url(${this.config.border.imgUrl})`
a.style['border-image-source']=`url(${this.url})`
}
},
methods: {
@ -61,7 +83,7 @@ export default {
<style lang="scss" scoped>
.bs-design-wrap {
border-image-source:url(component.png);
// border-image-source:url(component.png);
width: 100%;
height: 100%;
position: absolute;

@ -34,6 +34,16 @@ const setting = [
// 绑定的值
value: '',
},
{
label: '不透明度',
// 设置组件类型
type: 'slider',
// 字段
field: 'opacity',
// 对应options中的字段
optionField: 'opacity.fillOpacity',
value: 1,
},
{
label:'点九图背景切割',
// 设置组件类型, select / input / colorPicker
@ -44,7 +54,7 @@ const setting = [
// 是否多选
multiple: false,
// 绑定的值
value: [100,100,100,100],
value: [50,50,50,50],
},
]

@ -29,7 +29,6 @@
@click="chooseComponent(component)"
>
<div
v-if="component.title!='GcBorder16'"
:class="component.title == focus.title ? 'focus' : ''"
class="big-screen-card-inner"
>

@ -22,6 +22,12 @@
/>
</el-form-item>
<PosWhSetting :config="config" />
<SettingTitle>旋转</SettingTitle>
<div class="lc-field-body">
<RotateSetting
:config="config"
/>
</div>
<el-form-item label="边框线颜色">
<ColorPicker
v-model="config.customize.borderColor"
@ -107,12 +113,14 @@
<script>
import ColorPicker from 'data-room-ui/ColorPicker/index.vue'
import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue'
import RotateSetting from 'data-room-ui/BigScreenDesign/RightSetting/RotateSetting.vue'
import {predefineColors} from 'data-room-ui/js/utils/colorList'
export default {
name: 'Border14Setting',
components: {
ColorPicker,
PosWhSetting
PosWhSetting,
RotateSetting
},
props: {
config: {

@ -22,6 +22,12 @@
/>
</el-form-item>
<PosWhSetting :config="config" />
<SettingTitle>旋转</SettingTitle>
<div class="lc-field-body">
<RotateSetting
:config="config"
/>
</div>
<el-form-item label="文本">
<el-input
v-model="config.customize.text"
@ -109,12 +115,14 @@
<script>
import ColorPicker from 'data-room-ui/ColorPicker/index.vue'
import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue'
import RotateSetting from 'data-room-ui/BigScreenDesign/RightSetting/RotateSetting.vue'
import {predefineColors} from "data-room-ui/js/utils/colorList";
export default {
name: 'Border14Setting',
components: {
ColorPicker,
PosWhSetting
PosWhSetting,
RotateSetting
},
props: {
config: {

@ -27,12 +27,12 @@
<div class="lc-field-body">
<PosWhSetting :config="config" />
</div>
<!-- <SettingTitle>旋转</SettingTitle>
<SettingTitle>旋转</SettingTitle>
<div class="lc-field-body">
<RotateSetting
:config="config"
/>
</div> -->
</div>
<SettingTitle>基础</SettingTitle>
<div class="lc-field-body">
<el-form-item label="装饰主颜色">

@ -27,12 +27,12 @@
<div class="lc-field-body">
<PosWhSetting :config="config" />
</div>
<!-- <SettingTitle>旋转</SettingTitle>
<SettingTitle>旋转</SettingTitle>
<div class="lc-field-body">
<RotateSetting
:config="config"
/>
</div> -->
</div>
<SettingTitle>基础</SettingTitle>
<div class="lc-field-body">
<el-form-item label="装饰主颜色">

@ -27,12 +27,12 @@
<div class="lc-field-body">
<PosWhSetting :config="config" />
</div>
<!-- <SettingTitle>旋转</SettingTitle>
<SettingTitle>旋转</SettingTitle>
<div class="lc-field-body">
<RotateSetting
:config="config"
/>
</div> -->
</div>
<SettingTitle>基础</SettingTitle>
<div class="lc-field-body">
<el-form-item label="装饰主颜色">

@ -53,12 +53,12 @@
/>
</el-form-item>
</div>
<!-- <SettingTitle>旋转</SettingTitle>
<SettingTitle>旋转</SettingTitle>
<div class="lc-field-body">
<RotateSetting
:config="config"
/>
</div> -->
</div>
</el-form>
</el-form>
</div>

@ -24,12 +24,12 @@
<div class="lc-field-body">
<PosWhSetting :config="config" />
</div>
<!-- <SettingTitle>旋转</SettingTitle>
<SettingTitle>旋转</SettingTitle>
<div class="lc-field-body">
<RotateSetting
:config="config"
/>
</div> -->
</div>
<SettingTitle>基础</SettingTitle>
<div class="lc-field-body">
<el-form-item label="装饰颜色">

@ -24,12 +24,12 @@
<div class="lc-field-body">
<PosWhSetting :config="config" />
</div>
<!-- <SettingTitle>旋转</SettingTitle>
<SettingTitle>旋转</SettingTitle>
<div class="lc-field-body">
<RotateSetting
:config="config"
/>
</div> -->
</div>
<SettingTitle>基础</SettingTitle>
<div class="lc-field-body">
<el-form-item label="装饰主颜色">

@ -24,12 +24,12 @@
<div class="lc-field-body">
<PosWhSetting :config="config" />
</div>
<!-- <SettingTitle>旋转</SettingTitle>
<SettingTitle>旋转</SettingTitle>
<div class="lc-field-body">
<RotateSetting
:config="config"
/>
</div> -->
</div>
<SettingTitle>基础</SettingTitle>
<div class="lc-field-body">
<el-form-item label="装饰主颜色">

@ -24,12 +24,12 @@
<div class="lc-field-body">
<PosWhSetting :config="config" />
</div>
<!-- <SettingTitle>旋转</SettingTitle>
<SettingTitle>旋转</SettingTitle>
<div class="lc-field-body">
<RotateSetting
:config="config"
/>
</div> -->
</div>
<SettingTitle>基础</SettingTitle>
<div class="lc-field-body">
<el-form-item label="装饰主颜色">

@ -27,12 +27,12 @@
<div class="lc-field-body">
<PosWhSetting :config="config" />
</div>
<!-- <SettingTitle>旋转</SettingTitle>
<SettingTitle>旋转</SettingTitle>
<div class="lc-field-body">
<RotateSetting
:config="config"
/>
</div> -->
</div>
<SettingTitle>基础</SettingTitle>
<div class="lc-field-body">
<el-form-item label="装饰主颜色">

@ -27,12 +27,12 @@
<div class="lc-field-body">
<PosWhSetting :config="config" />
</div>
<!-- <SettingTitle>旋转</SettingTitle>
<SettingTitle>旋转</SettingTitle>
<div class="lc-field-body">
<RotateSetting
:config="config"
/>
</div> -->
</div>
<SettingTitle>基础</SettingTitle>
<div class="lc-field-body">
<el-form-item label="装饰主颜色">

@ -27,12 +27,12 @@
<div class="lc-field-body">
<PosWhSetting :config="config" />
</div>
<!-- <SettingTitle>旋转</SettingTitle>
<SettingTitle>旋转</SettingTitle>
<div class="lc-field-body">
<RotateSetting
:config="config"
/>
</div> -->
</div>
<SettingTitle>基础</SettingTitle>
<div class="lc-field-body">
<el-form-item label="装饰主颜色">

@ -27,12 +27,12 @@
<div class="lc-field-body">
<PosWhSetting :config="config" />
</div>
<!-- <SettingTitle>旋转</SettingTitle>
<SettingTitle>旋转</SettingTitle>
<div class="lc-field-body">
<RotateSetting
:config="config"
/>
</div> -->
</div>
<SettingTitle>基础</SettingTitle>
<div class="lc-field-body">
<el-form-item label="装饰主颜色">

@ -27,12 +27,12 @@
<div class="lc-field-body">
<PosWhSetting :config="config" />
</div>
<!-- <SettingTitle>旋转</SettingTitle>
<SettingTitle>旋转</SettingTitle>
<div class="lc-field-body">
<RotateSetting
:config="config"
/>
</div> -->
</div>
<SettingTitle>基础</SettingTitle>
<div class="lc-field-body">
<el-form-item label="装饰主颜色">

@ -203,6 +203,10 @@ export default {
} else {
//
config.option.data = this.plotList?.find(plot => plot.name === config.name)?.option?.data || config?.option?.data
const _xField = this.plotList?.find(plot => plot.name === config.name)?.option?.xField || config?.option?.xField
const _yField = this.plotList?.find(plot => plot.name === config.name)?.option?.yField || config?.option?.yField
const _seriesField = this.plotList?.find(plot => plot.name === config.name)?.option?.seriesField || config?.option?.seriesField
config.option = _seriesField ? { ...config.option, xField: _xField, yField: _yField, seriesField: _seriesField } : { ...config.option, xField: _xField, yField: _yField }
}
return config
},

@ -38,7 +38,8 @@
:style="{
zIndex: chart.z || 0,
}"
:transform="`skew(${chart.skewX == undefined ? 0 : chart.skewX}deg, ${chart.skewY == undefined? 0 : chart.skewY}deg) perspective(${chart.perspective > 0? (chart.perspective + 'px') : 'none' }) rotateX(${chart.rotateX == undefined ? 0 : chart.rotateX}deg) rotateY(${chart.rotateY == undefined ? 0 : chart.rotateY}deg) rotateZ(${chart.rotateZ == undefined ? 0 : chart.rotateZ}deg)`"
:perspective="parseInt(`${chart.perspective == undefined ? 0 : chart.perspective}`)"
:transform="`skew(${chart.skewX == undefined ? 0 : chart.skewX}deg, ${chart.skewY == undefined? 0 : chart.skewY}deg) rotateX(${chart.rotateX == undefined ? 0 : chart.rotateX}deg) rotateY(${chart.rotateY == undefined ? 0 : chart.rotateY}deg) rotateZ(${chart.rotateZ == undefined ? 0 : chart.rotateZ}deg)`"
:grid="[1,1]"
:handles="handlesList"
class-name-handle="bs-handle-class"
@ -85,7 +86,6 @@ import RenderCard from './RenderCard.vue'
import Configuration from './Configuration.vue'
// import _ from 'lodash'
import cloneDeep from 'lodash/cloneDeep'
// import vdr from 'gc-vue-draggable-resizable'
import vdr from '@gcpaas/vue-draggable-resizable-gorkys'
import 'gc-vue-draggable-resizable/dist/VueDraggableResizable.css'
import { randomString } from '../js/utils'

@ -23,6 +23,8 @@ const BigScreenDesign = () => import('./BigScreenDesign')
const DataSetManagement = () => import('./DataSetManagement')
// 数据源管理页面
const DataSourceManagement = () => import('./DataSourceManagement')
// 地图数据管理页面
const MapDataManagement = () => import('./MapDataManagement')
// 存储组件列表
const components = [
@ -33,7 +35,8 @@ const components = [
BigScreenRun,
BigScreenDesign,
DataSetManagement,
DataSourceManagement
DataSourceManagement,
MapDataManagement
]
function install (Vue) {
@ -52,6 +55,7 @@ export {
BigScreenDesign,
DataSetManagement,
DataSourceManagement,
MapDataManagement,
$dataRoomStore,
$dataRoomAxios,
registerConfig,
@ -68,6 +72,7 @@ export default {
BigScreenDesign,
DataSetManagement,
DataSourceManagement,
MapDataManagement,
$dataRoomStore,
$dataRoomAxios,
registerConfig,

@ -67,6 +67,7 @@ export default function (customConfig) {
className:
'com.gccloud.dataroom.core.module.chart.components.datasource.DataSetDataSource',
dataSourceKey: '', // 数据源,选择不同数据库
source: 'dataset',
businessKey: '', // 数据集标识
dimensionField: '', // 维度
metricField: '', // 指标

@ -18,6 +18,10 @@ export default {
const pageInfo = handleResData(data)
// 兼容边框配置
pageInfo.chartList.forEach((item) => {
if (item.dataSource) {
item.dataSource.source = item.dataSource?.source || 'dataset'
}
if (!item.border) {
item.border = { type: '', titleHeight: 60, fontSize: 16, isTitle: true, padding: [0, 0, 0, 0] }
}

Loading…
Cancel
Save