Merge pull request #3658 from dataease/pr@dev@feat_new-app

refactor: 文件命名标准化
This commit is contained in:
dataeaseShu 2022-11-07 15:42:46 +08:00 committed by GitHub
commit f21fddd533
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
146 changed files with 1583 additions and 1385 deletions

View File

@ -19,7 +19,7 @@
</template>
<script>
import BackButton from '@/components/back-button'
import BackButton from '@/components/backButton'
export default {
name: 'DeLayoutContent',
@ -64,6 +64,7 @@ export default {
display: flex;
flex-direction: column;
position: relative;
.route-title {
font-family: PingFang SC;
font-size: 20px;
@ -74,6 +75,7 @@ export default {
width: 100%;
margin: 0;
}
.container-wrapper {
width: 100%;
overflow: auto;

View File

@ -25,7 +25,7 @@
</template>
<script>
import BackButton from '@/components/back-button'
import BackButton from '@/components/backButton'
export default {
name: 'LayoutContent',

View File

@ -93,16 +93,18 @@
<script>
import { mapState } from 'vuex'
import DeEditor from '@/components/canvas/components/Editor/DeEditor'
import DeEditor from '@/components/canvas/components/editor/DeEditor'
import elementResizeDetectorMaker from 'element-resize-detector'
import bus from '@/utils/bus'
import { deepCopy } from '@/components/canvas/utils/utils'
import { uuid } from 'vue-uuid'
import componentList, {
BASE_MOBILE_STYLE,
COMMON_BACKGROUND, commonAttr,
HYPERLINKS, PIC_STYLE
} from '@/components/canvas/custom-component/component-list'
COMMON_BACKGROUND,
commonAttr,
HYPERLINKS,
PIC_STYLE
} from '@/components/canvas/customComponent/component-list'
import { ApplicationContext } from '@/utils/ApplicationContext'
import { chartCopy } from '@/api/chart/chart'
import { adaptCurThemeCommonStyle } from '@/components/canvas/utils/style'
@ -582,6 +584,7 @@ export default {
overflow-y: auto;
background-size: 100% 100% !important;
}
.min-width-730 {
min-width: 730px !important;
}

View File

@ -85,9 +85,10 @@
</template>
<script>
import VText from '@/components/canvas/custom-component/VText'
import RectShape from '@/components/canvas/custom-component/RectShape'
import VText from '@/components/canvas/customComponent/VText'
import RectShape from '@/components/canvas/customComponent/RectShape'
import { getStyle } from '@/components/canvas/utils/style'
export default {
components: { VText, RectShape },
data() {

View File

@ -20,7 +20,7 @@
</template>
<script>
import componentList from '@/components/canvas/custom-component/component-list'
import componentList from '@/components/canvas/customComponent/component-list'
export default {
data() {

View File

@ -410,12 +410,12 @@
<script>
import { mapState } from 'vuex'
import VideoLinks from '@/components/canvas/components/Editor/VideoLinks'
import StreamMediaLinks from '@/components/canvas/components/Editor/StreamMediaLinks'
import DateFormat from '@/components/canvas/components/Editor/DateFormat'
import VideoLinks from '@/components/canvas/components/editor/VideoLinks'
import StreamMediaLinks from '@/components/canvas/components/editor/StreamMediaLinks'
import DateFormat from '@/components/canvas/components/editor/DateFormat'
import { COLOR_PANEL } from '@/views/chart/chart/chart'
import FrameLinks from '@/components/canvas/components/Editor/FrameLinks'
import TitlePosition from '@/components/widget/DeWidget/TitlePosition'
import FrameLinks from '@/components/canvas/components/editor/FrameLinks'
import TitlePosition from '@/components/widget/deWidget/TitlePosition'
export default {
components: { TitlePosition, FrameLinks, DateFormat, VideoLinks, StreamMediaLinks },

View File

@ -194,11 +194,13 @@
style="float: left"
size="mini"
@click="closeNotSave()"
>{{ $t('panel.do_not_save') }}</el-button>
>{{ $t('panel.do_not_save') }}
</el-button>
<el-button
size="mini"
@click="closePanelVisible=false"
>{{ $t('panel.cancel') }}</el-button>
>{{ $t('panel.cancel') }}
</el-button>
<el-button
type="primary"
size="mini"
@ -214,11 +216,11 @@
import generateID from '@/components/canvas/utils/generateID'
import toast from '@/components/canvas/utils/toast'
import { mapState } from 'vuex'
import { commonStyle, commonAttr } from '@/components/canvas/custom-component/component-list'
import { commonAttr, commonStyle } from '@/components/canvas/customComponent/component-list'
import eventBus from '@/components/canvas/utils/eventBus'
import { deepCopy, mobile2MainCanvas } from '@/components/canvas/utils/utils'
import { panelUpdate, saveCache, removePanelCache } from '@/api/panel/panel'
import { saveLinkage, getPanelAllLinkageInfo } from '@/api/panel/linkage'
import { panelUpdate, removePanelCache, saveCache } from '@/api/panel/panel'
import { getPanelAllLinkageInfo, saveLinkage } from '@/api/panel/linkage'
import bus from '@/utils/bus'
import { queryPanelJumpInfo } from '@/api/panel/linkJump'
@ -842,9 +844,11 @@ export default {
line-height: 22px;
color: var(--TextPrimary, #1F2329);
}
.margin-left52 {
margin-left: 52px !important;
}
.margin-left12 {
margin-left: 12px !important;
}
@ -852,6 +856,7 @@ export default {
.el-divider--vertical {
margin: 0 20px 0 20px
}
.el-dropdown-menu__item {
line-height: 32px;
}

View File

@ -76,9 +76,9 @@ import runAnimation from '@/components/canvas/utils/runAnimation'
import { mixins } from '@/components/canvas/utils/events'
import { mapState } from 'vuex'
import DeOutWidget from '@/components/dataease/DeOutWidget'
import EditBar from '@/components/canvas/components/Editor/EditBar'
import MobileCheckBar from '@/components/canvas/components/Editor/MobileCheckBar'
import CloseBar from '@/components/canvas/components/Editor/CloseBar'
import EditBar from '@/components/canvas/components/editor/EditBar'
import MobileCheckBar from '@/components/canvas/components/editor/MobileCheckBar'
import CloseBar from '@/components/canvas/components/editor/CloseBar'
import { hexColorToRGBA } from '@/views/chart/chart/util'
import { imgUrlTrans } from '@/components/canvas/utils/utils'
@ -328,10 +328,12 @@ export default {
width: 100% !important;
height: 100%;
}
.main_view {
position: relative;
background-size: 100% 100% !important;
}
.component {
//position: relative;
}

View File

@ -146,10 +146,10 @@
<script>
import { mapState } from 'vuex'
import Shape from './Shape'
import DeDrag from '@/components/DeDrag'
import DeDrag from '@/components/deDrag'
// eslint-disable-next-line no-unused-vars
import { getStyle, getComponentRotatedStyle } from '@/components/canvas/utils/style'
import { getComponentRotatedStyle, getStyle } from '@/components/canvas/utils/style'
import { _$, imgUrlTrans } from '@/components/canvas/utils/utils'
import ContextMenu from './ContextMenu'
import MarkLine from './MarkLine'
@ -158,9 +158,9 @@ import eventBus from '@/components/canvas/utils/eventBus'
import Grid from './Grid'
import PGrid from './PGrid'
import { changeStyleWithScale } from '@/components/canvas/utils/translate'
import UserViewDialog from '@/components/canvas/custom-component/UserViewDialog'
import UserViewDialog from '@/components/canvas/customComponent/UserViewDialog'
import DeOutWidget from '@/components/dataease/DeOutWidget'
import DragShadow from '@/components/DeDrag/shadow'
import DragShadow from '@/components/deDrag/shadow'
import bus from '@/utils/bus'
import LinkJumpSet from '@/views/panel/LinkJumpSet'
import { buildFilterMap, buildViewKeyMap, formatCondition, valueValid, viewIdMatch } from '@/utils/conditionUtil'
@ -168,7 +168,7 @@ import { buildFilterMap, buildViewKeyMap, formatCondition, valueValid, viewIdMat
import _ from 'lodash'
import _jq from 'jquery'
import Background from '@/views/background/index'
import PointShadow from '@/components/DeDrag/pointShadow'
import PointShadow from '@/components/deDrag/pointShadow'
// let positionBox = []
// let coordinates = [] //
@ -1790,7 +1790,6 @@ export default {
}
.edit {
/*outline: 1px solid gainsboro;*/
.component {
outline: none;
width: 100%;

View File

@ -179,10 +179,10 @@
<script>
import { mapState } from 'vuex'
import bus from '@/utils/bus'
import SettingMenu from '@/components/canvas/components/Editor/SettingMenu'
import LinkageField from '@/components/canvas/components/Editor/LinkageField'
import SettingMenu from '@/components/canvas/components/editor/SettingMenu'
import LinkageField from '@/components/canvas/components/editor/LinkageField'
import toast from '@/components/canvas/utils/toast'
import FieldsList from '@/components/canvas/components/Editor/fieldsList'
import FieldsList from '@/components/canvas/components/editor/fieldsList'
import LinkJumpSet from '@/views/panel/LinkJumpSet'
import Background from '@/views/background/index'
@ -200,7 +200,8 @@ export default {
},
sourceElement: {
type: Object,
default: () => {}
default: () => {
}
},
element: {
type: Object,
@ -378,7 +379,10 @@ export default {
multiplexingCheck(val) {
if (val) {
// push
this.$store.commit('addCurMultiplexingComponent', { 'component': this.sourceElement, 'componentId': this.element.id })
this.$store.commit('addCurMultiplexingComponent', {
'component': this.sourceElement,
'componentId': this.element.id
})
} else {
// remove
this.$store.commit('removeCurMultiplexingComponentWithId', this.element.id)
@ -439,7 +443,9 @@ export default {
bus.$emit('button-dialog-edit')
} else if (this.curComponent.type === 'v-text' || this.curComponent.type === 'de-rich-text' || this.curComponent.type === 'rect-shape') {
bus.$emit('component-dialog-style')
} else { bus.$emit('change_panel_right_draw', true) }
} else {
bus.$emit('change_panel_right_draw', true)
}
},
linkageEdit() {
@ -512,6 +518,7 @@ export default {
cursor: pointer !important;
background-color: var(--primary, #3370ff);
}
.bar-main i {
color: white;
float: right;
@ -526,10 +533,12 @@ export default {
.bar-main ::v-deep .el-checkbox__inner::after {
width: 4.5px;
}
.bar-main-right {
width: 22px;
right: -25px;
}
.bar-main-left-inner {
width: 22px;
left: 0px;

View File

@ -68,10 +68,11 @@ import { uuid } from 'vue-uuid'
import { deepCopy, imgUrlTrans } from '@/components/canvas/utils/utils'
import eventBus from '@/components/canvas/utils/eventBus'
import elementResizeDetectorMaker from 'element-resize-detector'
import CanvasOptBar from '@/components/canvas/components/Editor/CanvasOptBar'
import CanvasOptBar from '@/components/canvas/components/editor/CanvasOptBar'
import bus from '@/utils/bus'
import { buildFilterMap, buildViewKeyMap, formatCondition, valueValid, viewIdMatch } from '@/utils/conditionUtil'
import { hasDataPermission } from '@/utils/permission'
const erd = elementResizeDetectorMaker()
export default {
@ -338,9 +339,7 @@ export default {
buttonExist: false,
relationFilterIds: [],
autoTrigger: true,
filterMap: {
}
filterMap: {}
}
if (!panelItems || !panelItems.length) return result
let sureButtonItem = null
@ -443,7 +442,10 @@ export default {
this.scaleHeight = canvasHeight * 100 / this.canvasStyleData.height//
}
if (this.isMainCanvas()) {
this.$store.commit('setPreviewCanvasScale', { scaleWidth: (this.scaleWidth / 100), scaleHeight: (this.scaleHeight / 100) })
this.$store.commit('setPreviewCanvasScale', {
scaleWidth: (this.scaleWidth / 100),
scaleHeight: (this.scaleHeight / 100)
})
}
this.handleScaleChange()
},
@ -579,6 +581,7 @@ export default {
.mobile-dialog-css ::v-deep .el-dialog__body {
padding: 0px;
}
::-webkit-scrollbar {
width: 0px !important;
height: 0px !important;

View File

@ -47,7 +47,7 @@ import { uuid } from 'vue-uuid'
import { deepCopy, imgUrlTrans } from '@/components/canvas/utils/utils'
import eventBus from '@/components/canvas/utils/eventBus'
import elementResizeDetectorMaker from 'element-resize-detector'
import CanvasOptBar from '@/components/canvas/components/Editor/CanvasOptBar'
import CanvasOptBar from '@/components/canvas/components/editor/CanvasOptBar'
export default {
components: { ComponentWrapper, CanvasOptBar },

View File

@ -148,7 +148,7 @@
import { mapState } from 'vuex'
import bus from '@/utils/bus'
import { getViewLinkageGather } from '@/api/panel/linkage'
import HyperlinksDialog from '@/components/canvas/components/Editor/HyperlinksDialog'
import HyperlinksDialog from '@/components/canvas/components/editor/HyperlinksDialog'
import CustomTabsSort from '@/components/widget/DeWidget/CustomTabsSort'
export default {

View File

@ -215,11 +215,11 @@
<script>
import { mapState } from 'vuex'
import Shape from './Shape'
import DeDrag from '@/components/DeDrag'
import DeDrag from '@/components/deDrag'
// eslint-disable-next-line no-unused-vars
import { getStyle, getComponentRotatedStyle } from '@/components/canvas/utils/style'
import { _$, imgUrlTrans } from '@/components/canvas/utils/utils'
import { getComponentRotatedStyle, getStyle } from '@/components/canvas/utils/style'
import { _$, deepCopy, imgUrlTrans } from '@/components/canvas/utils/utils'
import ContextMenu from './ContextMenu'
import MarkLine from './MarkLine'
import Area from './Area'
@ -227,10 +227,9 @@ import eventBus from '@/components/canvas/utils/eventBus'
import Grid from './Grid'
import PGrid from './PGrid'
import { changeStyleWithScale } from '@/components/canvas/utils/translate'
import { deepCopy } from '@/components/canvas/utils/utils'
import UserViewDialog from '@/components/canvas/custom-component/UserViewDialog'
import UserViewDialog from '@/components/canvas/customComponent/UserViewDialog'
import DeOutWidget from '@/components/dataease/DeOutWidget'
import DragShadow from '@/components/DeDrag/shadow'
import DragShadow from '@/components/deDrag/shadow'
import bus from '@/utils/bus'
import LinkJumpSet from '@/views/panel/LinkJumpSet'
import { buildFilterMap, buildViewKeyMap, formatCondition, valueValid, viewIdMatch } from '@/utils/conditionUtil'
@ -1856,7 +1855,6 @@ export default {
}
.edit {
/*outline: 1px solid gainsboro;*/
.component {
outline: none;
width: 100%;

View File

@ -1,24 +0,0 @@
import Vue from 'vue'
import Picture from '@/components/canvas/custom-component/Picture'
import VText from '@/components/canvas/custom-component/VText'
import VButton from '@/components/canvas/custom-component/VButton'
import Group from '@/components/canvas/custom-component/Group'
import RectShape from '@/components/canvas/custom-component/RectShape'
import UserView from '@/components/canvas/custom-component/UserView'
import DeVideo from '@/components/canvas/custom-component/DeVideo'
import DeFrame from '@/components/canvas/custom-component/DeFrame'
import DeStreamMedia from '@/components/canvas/custom-component/DeStreamMedia'
import DeRichText from '@/components/canvas/custom-component/DeRichText'
Vue.component('DeRichText', DeRichText)
Vue.component('DeStreamMedia', DeStreamMedia)
// eslint-disable-next-line
Vue.component('Picture', Picture)
Vue.component('VText', VText)
Vue.component('VButton', VButton)
Vue.component('Group', Group)
Vue.component('RectShape', RectShape)
Vue.component('UserView', UserView)
Vue.component('DeVideo', DeVideo)
Vue.component('DeFrame', DeFrame)

View File

@ -196,26 +196,39 @@ import { mapState } from 'vuex'
import { isChange } from '@/utils/conditionUtil'
import { BASE_CHART_STRING } from '@/views/chart/chart/chart'
import { deepCopy } from '@/components/canvas/utils/utils'
import { getToken, getLinkToken } from '@/utils/auth'
import { getLinkToken, getToken } from '@/utils/auth'
import DrillPath from '@/views/chart/view/DrillPath'
import { areaMapping } from '@/api/map/map'
import ChartComponentG2 from '@/views/chart/components/ChartComponentG2'
import EditBarView from '@/components/canvas/components/Editor/EditBarView'
import EditBarView from '@/components/canvas/components/editor/EditBarView'
import { adaptCurTheme, customAttrTrans, customStyleTrans, recursionTransObj } from '@/components/canvas/utils/style'
import ChartComponentS2 from '@/views/chart/components/ChartComponentS2'
import PluginCom from '@/views/system/plugin/PluginCom'
import LabelNormalText from '@/views/chart/components/normal/LabelNormalText'
import { viewEditSave, viewPropsSave } from '@/api/chart/chart'
import { checkAddHttp } from '@/utils/urlUtils'
import DeRichTextView from '@/components/canvas/custom-component/DeRichTextView'
import DeRichTextView from '@/components/canvas/customComponent/DeRichTextView'
import Vue from 'vue'
import { formatterItem, valueFormatter } from '@/views/chart/chart/formatter'
import UserViewDialog from '@/components/canvas/custom-component/UserViewDialog'
import UserViewMobileDialog from '@/components/canvas/custom-component/UserViewMobileDialog'
import UserViewDialog from '@/components/canvas/customComponent/UserViewDialog'
import UserViewMobileDialog from '@/components/canvas/customComponent/UserViewMobileDialog'
export default {
name: 'UserView',
components: { UserViewMobileDialog, UserViewDialog, DeRichTextView, LabelNormalText, PluginCom, ChartComponentS2, EditBarView, ChartComponent, TableNormal, LabelNormal, DrillPath, ChartComponentG2 },
components: {
UserViewMobileDialog,
UserViewDialog,
DeRichTextView,
LabelNormalText,
PluginCom,
ChartComponentS2,
EditBarView,
ChartComponent,
TableNormal,
LabelNormal,
DrillPath,
ChartComponentG2
},
props: {
canvasId: {
type: String,
@ -688,7 +701,11 @@ export default {
adaptCurTheme(customStyleObj, customAttrObj)
this.chart.customStyle = JSON.stringify(customStyleObj)
this.chart.customAttr = JSON.stringify(customAttrObj)
viewEditSave(this.panelInfo.id, { id: this.chart.id, customStyle: this.chart.customStyle, customAttr: this.chart.customAttr })
viewEditSave(this.panelInfo.id, {
id: this.chart.id,
customStyle: this.chart.customStyle,
customAttr: this.chart.customAttr
})
this.$store.commit('adaptorStatusDisable', this.element.id)
}
this.sourceCustomAttrStr = this.chart.customAttr
@ -933,7 +950,10 @@ export default {
const current = this.$refs[this.element.propValue.id]
if (this.chart.isPlugin) {
current && current.callPluginInner && this.setDetailMapCode(null) && current.callPluginInner({ methodName: 'registerDynamicMap', methodParam: null })
current && current.callPluginInner && this.setDetailMapCode(null) && current.callPluginInner({
methodName: 'registerDynamicMap',
methodParam: null
})
} else {
current && current.registerDynamicMap && this.setDetailMapCode(null) && current.registerDynamicMap(null)
}
@ -963,7 +983,10 @@ export default {
this.currentAcreaNode = tempNode
const current = this.$refs[this.element.propValue.id]
if (this.chart.isPlugin) {
current && current.callPluginInner && this.setDetailMapCode(this.currentAcreaNode.code) && current.callPluginInner({ methodName: 'registerDynamicMap', methodParam: this.currentAcreaNode.code })
current && current.callPluginInner && this.setDetailMapCode(this.currentAcreaNode.code) && current.callPluginInner({
methodName: 'registerDynamicMap',
methodParam: this.currentAcreaNode.code
})
} else {
current && current.registerDynamicMap && this.setDetailMapCode(this.currentAcreaNode.code) && current.registerDynamicMap(this.currentAcreaNode.code)
}
@ -990,7 +1013,10 @@ export default {
this.currentAcreaNode = nextNode
const current = this.$refs[this.element.propValue.id]
if (this.chart.isPlugin) {
nextNode && current && current.callPluginInner && this.setDetailMapCode(nextNode.code) && current.callPluginInner({ methodName: 'registerDynamicMap', methodParam: nextNode.code })
nextNode && current && current.callPluginInner && this.setDetailMapCode(nextNode.code) && current.callPluginInner({
methodName: 'registerDynamicMap',
methodParam: nextNode.code
})
} else {
nextNode && current && current.registerDynamicMap && this.setDetailMapCode(nextNode.code) && current.registerDynamicMap(nextNode.code)
}
@ -1024,7 +1050,10 @@ export default {
const current = this.$refs[this.element.propValue.id]
if (this.chart.isPlugin) {
current && current.callPluginInner && current.callPluginInner({ methodName: 'registerDynamicMap', methodParam: areaNode.code })
current && current.callPluginInner && current.callPluginInner({
methodName: 'registerDynamicMap',
methodParam: areaNode.code
})
} else {
current && current.registerDynamicMap && current.registerDynamicMap(areaNode.code)
}

View File

@ -0,0 +1,24 @@
import Vue from 'vue'
import Picture from '@/components/canvas/customComponent/Picture'
import VText from '@/components/canvas/customComponent/VText'
import VButton from '@/components/canvas/customComponent/VButton'
import Group from '@/components/canvas/customComponent/Group'
import RectShape from '@/components/canvas/customComponent/RectShape'
import UserView from '@/components/canvas/customComponent/UserView'
import DeVideo from '@/components/canvas/customComponent/DeVideo'
import DeFrame from '@/components/canvas/customComponent/DeFrame'
import DeStreamMedia from '@/components/canvas/customComponent/DeStreamMedia'
import DeRichText from '@/components/canvas/customComponent/DeRichText'
Vue.component('DeRichText', DeRichText)
Vue.component('DeStreamMedia', DeStreamMedia)
// eslint-disable-next-line
Vue.component('Picture', Picture)
Vue.component('VText', VText)
Vue.component('VButton', VButton)
Vue.component('Group', Group)
Vue.component('RectShape', RectShape)
Vue.component('UserView', UserView)
Vue.component('DeVideo', DeVideo)
Vue.component('DeFrame', DeFrame)

View File

@ -20,12 +20,13 @@
<script>
import Editor from '@/components/Editor/index'
import componentList from '@/components/canvas/custom-component/component-list' //
import componentList from '@/components/canvas/customComponent/component-list' //
import Toolbar from '@/components/Toolbar'
import { deepCopy } from '@/utils/utils'
import { mapState } from 'vuex'
import generateID from '@/utils/generateID'
import { uuid } from 'vue-uuid'
export default {
components: { Editor, Toolbar },
data() {

View File

@ -3,7 +3,7 @@ import generateID from '@/components/canvas/utils/generateID'
import eventBus from '@/components/canvas/utils/eventBus'
import decomposeComponent from '@/components/canvas/utils/decomposeComponent'
import { $ } from '@/components/canvas/utils/utils'
import { commonStyle, commonAttr } from '@/components/canvas/custom-component/component-list'
import { commonStyle, commonAttr } from '@/components/canvas/customComponent/component-list'
export default {
state: {

View File

@ -1,7 +1,7 @@
import {
BASE_MOBILE_STYLE, COMMON_BACKGROUND_NONE,
HYPERLINKS
} from '@/components/canvas/custom-component/component-list'
} from '@/components/canvas/customComponent/component-list'
import {
ApplicationContext

View File

@ -59,7 +59,8 @@
</template>
<script>
import inputStyleMixin from '@/components/widget/DeWidget/inputStyleMixin'
import inputStyleMixin from '@/components/widget/deWidget/inputStyleMixin'
export default {
name: 'DeOutWidget',
mixins: [inputStyleMixin],
@ -70,7 +71,8 @@ export default {
},
element: {
type: Object,
default: () => {}
default: () => {
}
},
inDraw: {
type: Boolean,
@ -202,6 +204,7 @@ export default {
bottom: 0px;
left: 0px;
}
.ccondition-main {
position: absolute;
overflow: auto;
@ -211,22 +214,26 @@ export default {
left: 0px;
display: flex;
}
.condition-title {
height: 2em;
cursor: -webkit-grab;
line-height: 2em;
white-space: nowrap;
}
.span-container {
overflow: hidden auto;
position: relative;
padding: 0 5px;
}
.condition-content {
overflow: auto hidden;
letter-spacing: 0px !important;
width: 100%;
}
.condition-content-container {
position: relative;
display: table;
@ -234,6 +241,7 @@ export default {
height: 100%;
white-space: nowrap;
}
.first-element {
position: relative;
display: table-cell;
@ -242,28 +250,35 @@ export default {
padding: 0px;
height: 100%;
}
.first-element-container {
width: calc(100% - 10px);
background: initial;
margin: 0 4px;
div {
width: 100%;
}
display: flex;
align-items: flex-end;
}
.first-element-grid-container {
background: #fff;
border: 1px solid #d7dae2;
top: 5px;
}
.condition-main-line {
height: 40px !important;
}
.condition-main {
display: flex;
padding-top: 5px;
}
.condition-content-default {
inset: 0px 0px 0px !important;
}

View File

@ -84,20 +84,19 @@
</template>
<script>
import { matchesSelectorToParentElements, getComputedSize, addEvent, removeEvent } from '../../utils/dom'
import { computeWidth, computeHeight, restrictToBounds, snapToGrid, rotatedPoint, getAngle } from '../../utils/fns'
import { events, userSelectNone, userSelectAuto } from './option.js'
let eventsFor = events.mouse
import { addEvent, getComputedSize, matchesSelectorToParentElements, removeEvent } from '../../utils/dom'
import { computeHeight, computeWidth, getAngle, restrictToBounds, rotatedPoint, snapToGrid } from '../../utils/fns'
import { events, userSelectAuto, userSelectNone } from './option.js'
// private
import eventBus from '@/components/canvas/utils/eventBus'
import { mapState } from 'vuex'
import EditBar from '@/components/canvas/components/Editor/EditBar'
import MobileCheckBar from '@/components/canvas/components/Editor/MobileCheckBar'
import EditBar from '@/components/canvas/components/editor/EditBar'
import MobileCheckBar from '@/components/canvas/components/editor/MobileCheckBar'
import { hexColorToRGBA } from '@/views/chart/chart/util'
import { imgUrlTrans } from '@/components/canvas/utils/utils'
let eventsFor = events.mouse
export default {
replace: true,
name: 'DeDrag',

View File

@ -65,10 +65,11 @@
</template>
<script>
import Preview from '@/components/canvas/components/Editor/Preview'
import Preview from '@/components/canvas/components/editor/Preview'
import { findOne } from '@/api/panel/panel'
import { viewOptions } from '@/api/chart/chart'
import { panelDataPrepare } from '@/components/canvas/utils/utils'
export default {
name: 'DeViewSelect',
components: { Preview },
@ -240,6 +241,7 @@ export default {
.my-top-class {
width: 100%;
}
.dialog-css ::v-deep .el-dialog__title {
font-size: 14px;
}

View File

@ -15,12 +15,15 @@
<p
v-if="startIndex === 0 && $attrs.multiple"
class="select-all"
><el-checkbox
>
<el-checkbox
v-model="selectAll"
v-customStyle="customStyle"
:indeterminate="isIndeterminate"
@change="selectAllChange"
>{{ $t('dataset.check_all') }}</el-checkbox></p>
>{{ $t('dataset.check_all') }}
</el-checkbox>
</p>
<el-option
v-for="item in options"
:key="item.id"
@ -34,9 +37,10 @@
</template>
<script>
import { handlerInputStyle } from '@/components/widget/DeWidget/serviceNameFn.js'
import { handlerInputStyle } from '@/components/widget/deWidget/serviceNameFn.js'
import { uuid } from 'vue-uuid'
export default {
name: 'ElVisualSelect',
model: {
@ -51,7 +55,8 @@ export default {
},
customStyle: {
type: Object,
default: () => {}
default: () => {
}
},
list: {
type: Array,
@ -234,25 +239,30 @@ export default {
overflow-x: hidden;
content-visibility: auto;
}
::-webkit-scrollbar {
background: #ffffff !important;
}
.el-select-height {
width: 1px;
position: absolute;
top: 0;
left: 0;
}
.el-select-dropdown__list {
width: 100%;
position: absolute;
top: 0;
left: 0;
}
.el-select-dropdown__wrap {
height: 0;
}
}
.select-all {
padding: 10px 20px 0 20px;
}

View File

@ -23,14 +23,10 @@
</template>
<script>
import {
ApplicationContext
} from '@/utils/ApplicationContext'
import {
timeSection
} from '@/utils'
import { ApplicationContext } from '@/utils/ApplicationContext'
import { timeSection } from '@/utils'
import bus from '@/utils/bus'
import customInput from '@/components/widget/DeWidget/customInput'
import customInput from '@/components/widget/deWidget/customInput'
export default {
mixins: [customInput],
@ -376,6 +372,7 @@ export default {
.el-time-spinner__wrapper {
width: 100% !important;
}
.el-scrollbar:nth-of-type(2) {
display: none;
}

Some files were not shown because too many files have changed in this diff Show More