feat:组件添加绕x轴y轴扭曲配置项

main
zhu.yawen 1 year ago
parent dade1b89fd
commit d4674f8f7e

@ -45,7 +45,9 @@ const customConfig = {
// 绕z轴旋转角度
rotateZ: 0,
// 透视距离
perspective: 0
perspective: 0,
skewX: 0,
skewY: 0
},
// 自定义属性
customize: {

@ -23,7 +23,9 @@ const customConfig = {
// 绕z轴旋转角度
rotateZ: 0,
// 透视距离
perspective: 0
perspective: 0,
skewX: 0,
skewY: 0
},
customize: {
tabList: [],

@ -24,7 +24,9 @@ const customConfig = {
// 绕z轴旋转角度
rotateZ: 0,
// 透视距离
perspective: 0
perspective: 0,
skewX: 0,
skewY: 0
},
customize: {
fontSize: 28,

@ -26,7 +26,9 @@ const customConfig = {
// 绕z轴旋转角度
rotateZ: 0,
// 透视距离
perspective: 0
perspective: 0,
skewX: 0,
skewY: 0
},
// 自定义属性
customize: {

@ -39,7 +39,9 @@ const customConfig = {
// 绕z轴旋转角度
rotateZ: 0,
// 透视距离
perspective: 0
perspective: 0,
skewX: 0,
skewY: 0
},
customize: {
color: '#fff',

@ -45,7 +45,9 @@ const customConfig = {
// 绕z轴旋转角度
rotateZ: 0,
// 透视距离
perspective: 0
perspective: 0,
skewX: 0,
skewY: 0
},
customize: {
// 地图id

@ -20,7 +20,9 @@ const customConfig = {
// 绕z轴旋转角度
rotateZ: 0,
// 透视距离
perspective: 0
perspective: 0,
skewX: 0,
skewY: 0
},
customize: {
// 边框线颜色

@ -27,7 +27,9 @@ const customConfig = {
// 绕z轴旋转角度
rotateZ: 0,
// 透视距离
perspective: 0
perspective: 0,
skewX: 0,
skewY: 0
},
customize: {
fontSize: 20,

@ -44,7 +44,9 @@ const customConfig = {
// 绕z轴旋转角度
rotateZ: 0,
// 透视距离
perspective: 0
perspective: 0,
skewX: 0,
skewY: 0
},
customize: {
src: '',

@ -44,7 +44,9 @@ const customConfig = {
// 绕z轴旋转角度
rotateZ: 0,
// 透视距离
perspective: 0
perspective: 0,
skewX: 0,
skewY: 0
},
customize: {
src: '',

@ -44,7 +44,9 @@ const customConfig = {
// 绕z轴旋转角度
rotateZ: 0,
// 透视距离
perspective: 0
perspective: 0,
skewX: 0,
skewY: 0
},
customize: {
borderRadius: 0,

@ -44,7 +44,9 @@ const customConfig = {
// 绕z轴旋转角度
rotateZ: 0,
// 透视距离
perspective: 0
perspective: 0,
skewX: 0,
skewY: 0
},
customize: {
borderRadius: 0,

@ -21,7 +21,9 @@ const customConfig = {
// 绕z轴旋转角度
rotateZ: 0,
// 透视距离
perspective: 0
perspective: 0,
skewX: 0,
skewY: 0
},
// 自定义属性
customize: {

@ -38,7 +38,9 @@ const customConfig = {
// 绕z轴旋转角度
rotateZ: 0,
// 透视距离
perspective: 0
perspective: 0,
skewX: 0,
skewY: 0
},
customize: {
title: '超链接占位符',

@ -46,7 +46,9 @@ const customConfig = {
// 绕z轴旋转角度
rotateZ: 0,
// 透视距离
perspective: 0
perspective: 0,
skewX: 0,
skewY: 0
},
customize: {
mapId: '',

@ -38,7 +38,9 @@ const customConfig = {
// 绕z轴旋转角度
rotateZ: 0,
// 透视距离
perspective: 0
perspective: 0,
skewX: 0,
skewY: 0
},
customize: {
title: '跑马灯占位符',

@ -48,7 +48,9 @@ const customConfig = {
// 绕z轴旋转角度
rotateZ: 0,
// 透视距离
perspective: 0
perspective: 0,
skewX: 0,
skewY: 0
},
customize: {
title: '1234',

@ -25,7 +25,9 @@ const customConfig = {
// 绕z轴旋转角度
rotateZ: 0,
// 透视距离
perspective: 0
perspective: 0,
skewX: 0,
skewY: 0
},
customize: {
url: '',

@ -128,13 +128,15 @@ import SettingTitle from 'data-room-ui/SettingTitle/index.vue'
import ColorPicker from 'data-room-ui/ColorPicker/index.vue'
import BorderSetting from 'data-room-ui/BigScreenDesign/RightSetting/BorderSetting.vue'
import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue'
import RotateSetting from 'data-room-ui/BigScreenDesign/RightSetting/RotateSetting.vue'
export default {
name: 'BarSetting',
components: {
ColorPicker,
PosWhSetting,
SettingTitle,
BorderSetting
BorderSetting,
RotateSetting
},
data () {
return {

@ -41,7 +41,9 @@ const customConfig = {
// 绕z轴旋转角度
rotateZ: 0,
// 透视距离
perspective: 0
perspective: 0,
skewX: 0,
skewY: 0
},
customize: {
rowNum: 5,

@ -34,7 +34,9 @@ const customConfig = {
// 绕z轴旋转角度
rotateZ: 0,
// 透视距离
perspective: 0
perspective: 0,
skewX: 0,
skewY: 0
},
customize: {
rowNum: 5,

@ -33,7 +33,9 @@ const customConfig = {
// 绕z轴旋转角度
rotateZ: 0,
// 透视距离
perspective: 0
perspective: 0,
skewX: 0,
skewY: 0
},
// 自定义属性
customize: {

@ -43,7 +43,9 @@ const customConfig = {
// 绕z轴旋转角度
rotateZ: 0,
// 透视距离
perspective: 500
perspective: 0,
skewX: 0,
skewY: 0
},
customize: {

@ -48,7 +48,9 @@ const customConfig = {
// 绕z轴旋转角度
rotateZ: 0,
// 透视距离
perspective: 0
perspective: 0,
skewX: 0,
skewY: 0
},
customize: {
title: '文本标签占位符',

@ -26,7 +26,9 @@ const customConfig = {
// 绕z轴旋转角度
rotateZ: 0,
// 透视距离
perspective: 0
perspective: 0,
skewX: 0,
skewY: 0
},
customize: {
title: '文本标签占位符',

@ -26,7 +26,9 @@ const customConfig = {
// 绕z轴旋转角度
rotateZ: 0,
// 透视距离
perspective: 0
perspective: 0,
skewX: 0,
skewY: 0
},
customize: {
activeColor: '#007aff', // 单选框字体激活状态

@ -23,7 +23,9 @@ const customConfig = {
// 绕z轴旋转角度
rotateZ: 0,
// 透视距离
perspective: 0
perspective: 0,
skewX: 0,
skewY: 0
},
customize: {
fontSize: 28,

@ -26,7 +26,9 @@ const customConfig = {
// 绕z轴旋转角度
rotateZ: 0,
// 透视距离
perspective: 0
perspective: 0,
skewX: 0,
skewY: 0
},
// 自定义属性
customize: {

@ -20,7 +20,9 @@ const customConfig = {
// 绕z轴旋转角度
rotateZ: 0,
// 透视距离
perspective: 0
perspective: 0,
skewX: 0,
skewY: 0
},
customize: {
// 边框线颜色

@ -20,7 +20,9 @@ const customConfig = {
// 绕z轴旋转角度
rotateZ: 0,
// 透视距离
perspective: 0
perspective: 0,
skewX: 0,
skewY: 0
},
customize: {
videoType: 'application/x-mpegURL',

@ -51,6 +51,30 @@
:step="1"
/>
</el-form-item>
<el-form-item
:label-width="labelWidth"
label="沿x轴扭曲角度"
>
<el-input-number
v-model="config.skewX"
class="bs-el-input-number"
:min="-180"
:max="180"
:step="1"
/>
</el-form-item>
<el-form-item
:label-width="labelWidth"
label="绕y轴扭曲角度"
>
<el-input-number
v-model="config.skewY"
class="bs-el-input-number"
:min="-180"
:max="180"
:step="1"
/>
</el-form-item>
</div>
</template>
<script>
@ -63,7 +87,9 @@ export default {
rotateX: 0,
rotateY: 0,
rotateZ: 0,
perspective: 0
perspective: 0,
skewX: 0,
skewY: 0
})
},
labelWidth: {

@ -119,6 +119,8 @@ export default {
rotateY: this.config?.rotateY,
rotateZ: this.config?.rotateZ,
perspective: this.config?.perspective,
skewX: this.config?.skewX,
skewY: this.config?.skewY,
setting: cloneDeep(this.config?.setting),
customize: cloneDeep(this.config?.customize),
url: this.config?.url,

@ -29,7 +29,9 @@ const customConfig = {
// 绕z轴旋转角度
rotateZ: 0,
// 透视距离
perspective: 0
perspective: 0,
skewX: 0,
skewY: 0
},
customize: {
borderMainColor: '#83bff6',

@ -29,7 +29,9 @@ const customConfig = {
// 绕z轴旋转角度
rotateZ: 0,
// 透视距离
perspective: 0
perspective: 0,
skewX: 0,
skewY: 0
},
customize: {
// 边框主要颜色

@ -29,7 +29,9 @@ const customConfig = {
// 绕z轴旋转角度
rotateZ: 0,
// 透视距离
perspective: 0
perspective: 0,
skewX: 0,
skewY: 0
},
customize: {
// 边框主要颜色

@ -29,7 +29,9 @@ const customConfig = {
// 绕z轴旋转角度
rotateZ: 0,
// 透视距离
perspective: 0
perspective: 0,
skewX: 0,
skewY: 0
},
customize: {
// 边框主要颜色

@ -29,7 +29,9 @@ const customConfig = {
// 绕z轴旋转角度
rotateZ: 0,
// 透视距离
perspective: 0
perspective: 0,
skewX: 0,
skewY: 0
},
customize: {
// 边框主要颜色

@ -19,7 +19,9 @@ const customConfig = {
// 绕z轴旋转角度
rotateZ: 0,
// 透视距离
perspective: 0
perspective: 0,
skewX: 0,
skewY: 0
},
customize: {
// 边框线颜色

@ -19,7 +19,9 @@ const customConfig = {
// 绕z轴旋转角度
rotateZ: 0,
// 透视距离
perspective: 0
perspective: 0,
skewX: 0,
skewY: 0
},
customize: {
// 边框线颜色

@ -29,7 +29,9 @@ const customConfig = {
// 绕z轴旋转角度
rotateZ: 0,
// 透视距离
perspective: 0
perspective: 0,
skewX: 0,
skewY: 0
},
customize: {
borderMainColor: '#83bff6',

@ -29,7 +29,9 @@ const customConfig = {
// 绕z轴旋转角度
rotateZ: 0,
// 透视距离
perspective: 0
perspective: 0,
skewX: 0,
skewY: 0
},
customize: {
borderMainColor: '#83bff6',

@ -29,7 +29,9 @@ const customConfig = {
// 绕z轴旋转角度
rotateZ: 0,
// 透视距离
perspective: 0
perspective: 0,
skewX: 0,
skewY: 0
},
customize: {
// 边框主要颜色

@ -29,7 +29,9 @@ const customConfig = {
// 绕z轴旋转角度
rotateZ: 0,
// 透视距离
perspective: 0
perspective: 0,
skewX: 0,
skewY: 0
},
customize: {
// 边框主要颜色

@ -29,7 +29,9 @@ const customConfig = {
// 绕z轴旋转角度
rotateZ: 0,
// 透视距离
perspective: 0
perspective: 0,
skewX: 0,
skewY: 0
},
customize: {
// 边框主要颜色

@ -29,7 +29,9 @@ const customConfig = {
// 绕z轴旋转角度
rotateZ: 0,
// 透视距离
perspective: 0
perspective: 0,
skewX: 0,
skewY: 0
},
customize: {
// 边框主要颜色

@ -29,7 +29,9 @@ const customConfig = {
// 绕z轴旋转角度
rotateZ: 0,
// 透视距离
perspective: 0
perspective: 0,
skewX: 0,
skewY: 0
},
customize: {
// 边框主要颜色

@ -29,7 +29,9 @@ const customConfig = {
// 绕z轴旋转角度
rotateZ: 0,
// 透视距离
perspective: 0
perspective: 0,
skewX: 0,
skewY: 0
},
customize: {
// 边框主要颜色

@ -25,7 +25,9 @@ const customConfig = {
// 绕z轴旋转角度
rotateZ: 0,
// 透视距离
perspective: 0
perspective: 0,
skewX: 0,
skewY: 0
},
customize: {
decorationColor1: '#fff',

@ -25,7 +25,9 @@ const customConfig = {
// 绕z轴旋转角度
rotateZ: 0,
// 透视距离
perspective: 0
perspective: 0,
skewX: 0,
skewY: 0
},
customize: {
decorationColor1: '#00c2ff',

@ -25,7 +25,9 @@ const customConfig = {
// 绕z轴旋转角度
rotateZ: 0,
// 透视距离
perspective: 0
perspective: 0,
skewX: 0,
skewY: 0
},
customize: {
decorationColor1: '#1a98fc',

@ -25,7 +25,9 @@ const customConfig = {
// 绕z轴旋转角度
rotateZ: 0,
// 透视距离
perspective: 0
perspective: 0,
skewX: 0,
skewY: 0
},
customize: {
decorationColor1: null,

@ -25,7 +25,9 @@ const customConfig = {
// 绕z轴旋转角度
rotateZ: 0,
// 透视距离
perspective: 0
perspective: 0,
skewX: 0,
skewY: 0
},
customize: {
decorationColor1: '#3faacb',

@ -25,7 +25,9 @@ const customConfig = {
// 绕z轴旋转角度
rotateZ: 0,
// 透视距离
perspective: 0
perspective: 0,
skewX: 0,
skewY: 0
},
customize: {
decorationColor1: '#7acaec',

@ -25,7 +25,9 @@ const customConfig = {
// 绕z轴旋转角度
rotateZ: 0,
// 透视距离
perspective: 0
perspective: 0,
skewX: 0,
skewY: 0
},
customize: {
decorationColor1: 'rgba(255, 255, 255, 0.3)',

@ -25,7 +25,9 @@ const customConfig = {
// 绕z轴旋转角度
rotateZ: 0,
// 透视距离
perspective: 0
perspective: 0,
skewX: 0,
skewY: 0
},
customize: {
decorationColor1: 'rgba(255, 255, 255, 0.3)',

@ -25,7 +25,9 @@ const customConfig = {
// 绕z轴旋转角度
rotateZ: 0,
// 透视距离
perspective: 0
perspective: 0,
skewX: 0,
skewY: 0
},
customize: {
decorationColor1: '#3f96a5',

@ -25,7 +25,9 @@ const customConfig = {
// 绕z轴旋转角度
rotateZ: 0,
// 透视距离
perspective: 0
perspective: 0,
skewX: 0,
skewY: 0
},
customize: {
decorationColor1:'#7acaec',

@ -25,7 +25,9 @@ const customConfig = {
// 绕z轴旋转角度
rotateZ: 0,
// 透视距离
perspective: 0
perspective: 0,
skewX: 0,
skewY: 0
},
customize: {
decorationColor1: '#3f96a5',

@ -25,7 +25,9 @@ const customConfig = {
// 绕z轴旋转角度
rotateZ: 0,
// 透视距离
perspective: 0
perspective: 0,
skewX: 0,
skewY: 0
},
customize: {
decorationColor1: '#3f96a5',

@ -25,7 +25,9 @@ const customConfig = {
// 绕z轴旋转角度
rotateZ: 0,
// 透视距离
perspective: 0
perspective: 0,
skewX: 0,
skewY: 0
},
customize: {
decorationColor1: 'rgba(3, 166, 224, 0.8)',

@ -35,6 +35,8 @@ function getEchartsList (files) {
rotateY: config.rotateY || 0,
rotateZ: config.rotateZ || 0,
perspective: config.perspective || 0,
skewX: config.skewX || 0,
skewY: config.skewY || 0,
type: 'echartsComponent',
loading: false,
// 把默认右侧配置与自定义右侧配置集合

@ -45,6 +45,8 @@ function getPlotList (files) {
rotateY: config.rotateY || 0,
rotateZ: config.rotateZ || 0,
perspective: config.perspective || 0,
skewX: config.skewX || 0,
skewY: config.skewY || 0,
type: 'customComponent',
chartType: config.chartType,
loading: false,

@ -43,6 +43,8 @@ export function getRemoteComponents (comList) {
rotateY: config.rotateY || 0,
rotateZ: config.rotateZ || 0,
perspective: config.perspective || 500,
skewX: config.skewX || 0,
skewY: config.skewY || 0,
type: 'remoteComponent',
option: {
...cloneDeep(settingConfig),
@ -79,6 +81,8 @@ export function getRemoteComponentConfig (code, name) {
rotateY: 0,
rotateZ: 0,
perspective: 0,
skewX: 0,
skewY: 0,
type: 'remoteComponent',
option: {
...cloneDeep(settingConfig)

@ -38,7 +38,7 @@
:style="{
zIndex: chart.z || 0,
}"
:transform="`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)`"
:transform="`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) skew(${chart.skewX == undefined ? 0 : chart.skewX}deg, ${chart.skewY == undefined? 0 : chart.skewY}deg)`"
:grid="[1,1]"
:handles="handlesList"
class-name-handle="bs-handle-class"

Loading…
Cancel
Save