@@ -153,11 +166,12 @@ const hasKey = (obj, path) => {
const that = reactive({
effect: 'dark',
showImageLib: false,
+ total:0,
queryParams: {
pageNo: 1,
- pageSize: 80,
+ pageSize: 20,
shapeType: ShapeType.vueShapeImage,
- name: undefined,
+ name: '',
},
imgLoading: false,
imageKeySet: [],
@@ -204,9 +218,12 @@ const uploadSuccess = () => {
const queryImage = async () => {
that.imgLoading = true
+ that.queryParams.name = layout.searchKeyword;
const data = await ShapeTemplateApi.getShapeTemplatePage(that.queryParams)
const domain = await FileApi.getDomain();
-
+ that.total = data.total;
+ that.imageUrlList = [];
+ that.imageKeySet = [];
for (let i = 0; i < data.list.length; i++) {
let config = JSON.parse(data.list[i].initData)
config.filterKeyword = function () {
@@ -293,8 +310,8 @@ const layout = reactive({
shape: ShapeType.vueShapeRect,
data: {
label: '',
- width: 80,
- height: 80,
+ width: 10,
+ height: 10,
shape: VueCellShapeType.Rect,
style: {
fontSize: 12,
@@ -314,8 +331,8 @@ const layout = reactive({
shape: ShapeType.vueShapeRect,
data: {
label: '',
- width: 80,
- height: 80,
+ width: 10,
+ height: 10,
shape: VueCellShapeType.Rect,
style: {
fontSize: 12,
@@ -336,8 +353,8 @@ const layout = reactive({
shape: ShapeType.vueShapeRect,
data: {
label: '',
- width: 80,
- height: 80,
+ width: 10,
+ height: 10,
shape: VueCellShapeType.Rect,
style: {
fontSize: 12,
@@ -383,7 +400,7 @@ $height: 600px;
$mainPanelWidth: 368px;
$mainPanelToggleLeft: 367px;
$mainPanelLeft: 67px;
-$panelZIndex: 10;
+$panelZIndex: 20;
.mainPanel {
@@ -411,6 +428,7 @@ $panelZIndex: 10;
}
.mainPanel-mainContent-toggle {
+
width: 10px;
height: 88px;
position: absolute;
diff --git a/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/layout/RightPanel.vue b/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/layout/RightPanel.vue
index 2fc5f0d..4796cc9 100644
--- a/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/layout/RightPanel.vue
+++ b/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/layout/RightPanel.vue
@@ -183,6 +183,7 @@ defineExpose({
$height: 600px;
$mainPanelWidth: 260px;
.mainPanel {
+ z-index: 20;
background-color: #ffffff;
width: $mainPanelWidth;
height: $height;
diff --git a/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/layout/index.vue b/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/layout/index.vue
index 1383e8d..28241de 100644
--- a/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/layout/index.vue
+++ b/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/layout/index.vue
@@ -4,7 +4,8 @@
@@ -17,8 +18,8 @@
@@ -38,6 +39,14 @@
v-model="that.pageConfig.editArea.height"
@change="changePageConfig"/>
+
+ onLoadZoom
+
+
-
+
+
+
+
+ 动态属性排序
+
+
+
+
+
+
将关键必要属性进行排序,让布局更清晰
+
按下鼠标左键进行拖拽进行排序,拖拽结束后,即可生效。
+
+
+
+ {{index+1}}
+
+
+
+ {{element.name}}
+
+
+
+
+
+
+
+
+
@@ -77,9 +128,13 @@
- Settings
+ Settings
+
+
+
+
+
-
@@ -190,6 +246,7 @@
@@ -197,6 +254,7 @@
@@ -204,6 +262,7 @@
@@ -597,7 +656,7 @@
-
+
-
-
+ -
@@ -1532,10 +1574,11 @@ $panelZIndex: 10;
}
.center-panel {
+ overflow: hidden;
padding: 0;
width: 100%;
background-color: #6fa9ba;
- height: 600px;
+ height: calc(86vh - 100px);
}
@@ -1555,4 +1598,26 @@ $panelZIndex: 10;
transform: rotate(133deg);
}
+
+.draggable-ghost {
+ background: #2ba4f8;
+ border: 2px solid #2ba4f8;
+ outline-width: 0;
+ height: 38px;
+ box-sizing: border-box;
+ font-size: 0;
+ content: '';
+ overflow: hidden;
+ padding: 0;
+}
+.order-by-item:hover{
+ cursor: move;
+}
+.order-by-item{
+ margin: 6px;
+ border: 1px solid #8e8b8b;
+ width: 100%;
+ padding: 10px
+}
+
diff --git a/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/node/ShapeCellNode.vue b/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/node/ShapeCellNode.vue
index 43d628a..4d1209f 100644
--- a/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/node/ShapeCellNode.vue
+++ b/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/node/ShapeCellNode.vue
@@ -329,7 +329,6 @@ export default defineComponent({
}
}
}
- console.log("text##", info)
this.cellInfo = mergeDeepObject({
showInput: false,
id: nextId(),
diff --git a/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/node/ShapeCircleNode.vue b/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/node/ShapeCircleNode.vue
index 9d8ee55..c87e2e8 100644
--- a/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/node/ShapeCircleNode.vue
+++ b/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/node/ShapeCircleNode.vue
@@ -209,7 +209,6 @@ export default defineComponent({
}
}
}
- console.log("text##", info)
this.cellInfo = mergeDeepObject({
showInput: false,
id: nextId(),
diff --git a/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/node/ShapeEllipseNode.vue b/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/node/ShapeEllipseNode.vue
index f877c72..7eb2eac 100644
--- a/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/node/ShapeEllipseNode.vue
+++ b/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/node/ShapeEllipseNode.vue
@@ -217,7 +217,6 @@ export default defineComponent({
}
}
}
- console.log("text##", info)
this.cellInfo = mergeDeepObject({
showInput: false,
id: nextId(),
diff --git a/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/node/ShapeImageNode.vue b/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/node/ShapeImageNode.vue
index b9a6088..7f91936 100644
--- a/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/node/ShapeImageNode.vue
+++ b/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/node/ShapeImageNode.vue
@@ -3,8 +3,8 @@