Symbol 引用
diff --git a/frontend/src/styles/deicon/iconfont.css b/frontend/src/styles/deicon/iconfont.css
index 799b75f850..a53c94ee5d 100644
--- a/frontend/src/styles/deicon/iconfont.css
+++ b/frontend/src/styles/deicon/iconfont.css
@@ -1,8 +1,8 @@
@font-face {
font-family: "iconfont"; /* Project id 2459092 */
- src: url('iconfont.woff2?t=1632382166116') format('woff2'),
- url('iconfont.woff?t=1632382166116') format('woff'),
- url('iconfont.ttf?t=1632382166116') format('truetype');
+ src: url('iconfont.woff2?t=1633678290478') format('woff2'),
+ url('iconfont.woff?t=1633678290478') format('woff'),
+ url('iconfont.ttf?t=1633678290478') format('truetype');
}
.iconfont {
@@ -13,6 +13,30 @@
-moz-osx-font-smoothing: grayscale;
}
+.icon-shujujuzhen:before {
+ content: "\e69c";
+}
+
+.icon-shitujuzhen_o:before {
+ content: "\eb85";
+}
+
+.icon-xuanfu1:before {
+ content: "\e62c";
+}
+
+.icon-youxuanfu-copy:before {
+ content: "\e6db";
+}
+
+.icon-xuanfu:before {
+ content: "\e6f6";
+}
+
+.icon-xuanfuanniu:before {
+ content: "\e8e6";
+}
+
.icon-tabs:before {
content: "\e62a";
}
diff --git a/frontend/src/styles/deicon/iconfont.js b/frontend/src/styles/deicon/iconfont.js
index 037bfa1adb..c035f859d5 100644
--- a/frontend/src/styles/deicon/iconfont.js
+++ b/frontend/src/styles/deicon/iconfont.js
@@ -1 +1 @@
-!function(l){var c,h,a,v,t,i='
',o=(o=document.getElementsByTagName("script"))[o.length-1].getAttribute("data-injectcss"),z=function(l,c){c.parentNode.insertBefore(l,c)};if(o&&!l.__iconfont__svg__cssinject__){l.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(l){console&&console.log(l)}}function s(){t||(t=!0,a())}function m(){try{v.documentElement.doScroll("left")}catch(l){return void setTimeout(m,50)}s()}c=function(){var l,c;(c=document.createElement("div")).innerHTML=i,i=null,(l=c.getElementsByTagName("svg")[0])&&(l.setAttribute("aria-hidden","true"),l.style.position="absolute",l.style.width=0,l.style.height=0,l.style.overflow="hidden",c=l,(l=document.body).firstChild?z(c,l.firstChild):l.appendChild(c))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(c,0):(h=function(){document.removeEventListener("DOMContentLoaded",h,!1),c()},document.addEventListener("DOMContentLoaded",h,!1)):document.attachEvent&&(a=c,v=l.document,t=!1,m(),v.onreadystatechange=function(){"complete"==v.readyState&&(v.onreadystatechange=null,s())})}(window);
\ No newline at end of file
+!function(h){var l,c,a,v,t,i='
',z=(z=document.getElementsByTagName("script"))[z.length-1].getAttribute("data-injectcss"),o=function(h,l){l.parentNode.insertBefore(h,l)};if(z&&!h.__iconfont__svg__cssinject__){h.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(h){console&&console.log(h)}}function m(){t||(t=!0,a())}function s(){try{v.documentElement.doScroll("left")}catch(h){return void setTimeout(s,50)}m()}l=function(){var h,l;(l=document.createElement("div")).innerHTML=i,i=null,(h=l.getElementsByTagName("svg")[0])&&(h.setAttribute("aria-hidden","true"),h.style.position="absolute",h.style.width=0,h.style.height=0,h.style.overflow="hidden",l=h,(h=document.body).firstChild?o(l,h.firstChild):h.appendChild(l))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(l,0):(c=function(){document.removeEventListener("DOMContentLoaded",c,!1),l()},document.addEventListener("DOMContentLoaded",c,!1)):document.attachEvent&&(a=l,v=h.document,t=!1,s(),v.onreadystatechange=function(){"complete"==v.readyState&&(v.onreadystatechange=null,m())})}(window);
diff --git a/frontend/src/styles/deicon/iconfont.json b/frontend/src/styles/deicon/iconfont.json
index b58f19728c..5107217f78 100644
--- a/frontend/src/styles/deicon/iconfont.json
+++ b/frontend/src/styles/deicon/iconfont.json
@@ -5,6 +5,48 @@
"css_prefix_text": "icon-",
"description": "",
"glyphs": [
+ {
+ "icon_id": "1766500",
+ "name": "符号-数据矩阵",
+ "font_class": "shujujuzhen",
+ "unicode": "e69c",
+ "unicode_decimal": 59036
+ },
+ {
+ "icon_id": "5387898",
+ "name": "视图矩阵_o",
+ "font_class": "shitujuzhen_o",
+ "unicode": "eb85",
+ "unicode_decimal": 60293
+ },
+ {
+ "icon_id": "21505923",
+ "name": "悬浮",
+ "font_class": "xuanfu1",
+ "unicode": "e62c",
+ "unicode_decimal": 58924
+ },
+ {
+ "icon_id": "6331823",
+ "name": "右悬浮-选中",
+ "font_class": "youxuanfu-copy",
+ "unicode": "e6db",
+ "unicode_decimal": 59099
+ },
+ {
+ "icon_id": "10788831",
+ "name": "悬浮",
+ "font_class": "xuanfu",
+ "unicode": "e6f6",
+ "unicode_decimal": 59126
+ },
+ {
+ "icon_id": "14541134",
+ "name": "悬浮按钮",
+ "font_class": "xuanfuanniu",
+ "unicode": "e8e6",
+ "unicode_decimal": 59622
+ },
{
"icon_id": "15196968",
"name": "44.tabs",
diff --git a/frontend/src/styles/deicon/iconfont.ttf b/frontend/src/styles/deicon/iconfont.ttf
index b4ade57bae..c1d60ee70c 100644
Binary files a/frontend/src/styles/deicon/iconfont.ttf and b/frontend/src/styles/deicon/iconfont.ttf differ
diff --git a/frontend/src/styles/deicon/iconfont.woff b/frontend/src/styles/deicon/iconfont.woff
index 5ae48f77a2..12454105d9 100644
Binary files a/frontend/src/styles/deicon/iconfont.woff and b/frontend/src/styles/deicon/iconfont.woff differ
diff --git a/frontend/src/styles/deicon/iconfont.woff2 b/frontend/src/styles/deicon/iconfont.woff2
index 415d27b7ee..c702ceeb6f 100644
Binary files a/frontend/src/styles/deicon/iconfont.woff2 and b/frontend/src/styles/deicon/iconfont.woff2 differ
diff --git a/frontend/src/views/panel/AssistComponent/index.vue b/frontend/src/views/panel/AssistComponent/index.vue
index 4d0b242ead..942b2a94a4 100644
--- a/frontend/src/views/panel/AssistComponent/index.vue
+++ b/frontend/src/views/panel/AssistComponent/index.vue
@@ -60,6 +60,8 @@ import toast from '@/components/canvas/utils/toast'
import { commonStyle, commonAttr } from '@/components/canvas/custom-component/component-list'
import generateID from '@/components/canvas/utils/generateID'
import { deepCopy } from '@/components/canvas/utils/utils'
+import eventBus from '@/components/canvas/utils/eventBus'
+import { mapState } from 'vuex'
export default {
name: 'AssisComponent',
@@ -69,6 +71,11 @@ export default {
pictureList
}
},
+ computed: {
+ ...mapState([
+ 'canvasStyleData'
+ ])
+ },
methods: {
handleDragStart(ev) {
@@ -79,6 +86,7 @@ export default {
id: ev.target.dataset.id
}
ev.dataTransfer.setData('componentInfo', JSON.stringify(dataTrans))
+ eventBus.$emit('startMoveIn')
},
goFile() {
this.$refs.files.click()
@@ -133,6 +141,7 @@ export default {
component = deepCopy(componentTemp)
}
})
+ component.auxiliaryMatrix = this.canvasStyleData.auxiliaryMatrix
return component
},
handleDragEnd(ev) {
diff --git a/frontend/src/views/panel/ViewSelect/index.vue b/frontend/src/views/panel/ViewSelect/index.vue
index e19213c975..199c873e3b 100644
--- a/frontend/src/views/panel/ViewSelect/index.vue
+++ b/frontend/src/views/panel/ViewSelect/index.vue
@@ -69,6 +69,9 @@
import { tree, findOne } from '@/api/panel/view'
import componentList from '@/components/canvas/custom-component/component-list'
import { deepCopy } from '@/components/canvas/utils/utils'
+import eventBus from '@/components/canvas/utils/eventBus'
+import { mapState } from 'vuex'
+
export default {
name: 'ViewSelect',
props: {
@@ -92,6 +95,11 @@ export default {
loading: false
}
},
+ computed: {
+ ...mapState([
+ 'canvasStyleData'
+ ])
+ },
watch: {
templateFilterText(val) {
this.$refs.templateTree.filter(val)
@@ -130,6 +138,7 @@ export default {
id: node.data.id
}
ev.dataTransfer.setData('componentInfo', JSON.stringify(dataTrans))
+ eventBus.$emit('startMoveIn')
},
dragEnd() {
console.log('dragEnd')
@@ -178,6 +187,7 @@ export default {
component = deepCopy(componentTemp)
}
})
+ component.auxiliaryMatrix = this.canvasStyleData.auxiliaryMatrix
return component
}
diff --git a/frontend/src/views/panel/drag/base.vue b/frontend/src/views/panel/drag/base.vue
new file mode 100644
index 0000000000..2bec5c0f58
--- /dev/null
+++ b/frontend/src/views/panel/drag/base.vue
@@ -0,0 +1,139 @@
+
+
+
+
+ ←
+ 基本应用
+
+
+
+
+ this is test
+
+
+
+
+
+
+
+
diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue
index 5315426aa3..9b1b56660a 100644
--- a/frontend/src/views/panel/edit/index.vue
+++ b/frontend/src/views/panel/edit/index.vue
@@ -96,7 +96,7 @@
scaleHeight ? scaleWith : scaleHeight
scale = scale > 1 ? scale : 1
- this.$store.commit('addComponent', {
- component: {
- ...commonAttr,
- id: generateID(),
- component: 'Picture',
- label: '图片',
- icon: '',
- propValue: fileResult,
- style: {
- ...commonStyle,
- top: _this.dropComponentInfo.shadowStyle.y,
- left: _this.dropComponentInfo.shadowStyle.x,
- width: _this.dropComponentInfo.shadowStyle.width,
- height: _this.dropComponentInfo.shadowStyle.height
- }
+ const component = {
+ ...commonAttr,
+ id: generateID(),
+ component: 'Picture',
+ label: '图片',
+ icon: '',
+ propValue: fileResult,
+ style: {
+ ...commonStyle
}
+ }
+ component.auxiliaryMatrix = _this.canvasStyleData.auxiliaryMatrix
+ if (_this.canvasStyleData.auxiliaryMatrix) {
+ component.x = _this.dropComponentInfo.x
+ component.y = _this.dropComponentInfo.y
+ component.sizex = _this.dropComponentInfo.sizex
+ component.sizey = _this.dropComponentInfo.sizey
+ component.style.left = (_this.dropComponentInfo.x - 1) * _this.curCanvasScale.matrixStyleOriginWidth
+ component.style.top = (_this.dropComponentInfo.y - 1) * _this.curCanvasScale.matrixStyleOriginHeight
+ component.style.width = _this.dropComponentInfo.sizex * _this.curCanvasScale.matrixStyleOriginWidth
+ component.style.height = _this.dropComponentInfo.sizey * _this.curCanvasScale.matrixStyleOriginHeight
+ } else {
+ component.style.top = _this.dropComponentInfo.shadowStyle.y
+ component.style.left = _this.dropComponentInfo.shadowStyle.x
+ component.style.width = _this.dropComponentInfo.shadowStyle.width
+ component.style.height = _this.dropComponentInfo.shadowStyle.height
+ }
+ this.$store.commit('addComponent', {
+ component: component
})
this.$store.commit('recordSnapshot', 'handleFileChange')
@@ -784,7 +824,8 @@ export default {
.this_canvas{
height: calc(100vh - 91px);
- overflow: auto;
+ overflow-x: hidden;
+ overflow-y: auto;
}
.el-main{
height: calc(100vh - 91px);
diff --git a/frontend/src/views/panel/filter/index.vue b/frontend/src/views/panel/filter/index.vue
index 83e1389500..aa23f51e24 100644
--- a/frontend/src/views/panel/filter/index.vue
+++ b/frontend/src/views/panel/filter/index.vue
@@ -31,6 +31,8 @@