From aa9f2504f07c21537b7612bd6471bb64bd0a9077 Mon Sep 17 00:00:00 2001 From: YuanFeng <770153798@qq.com> Date: Thu, 5 Sep 2024 21:59:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=20admin=E7=AB=AF=E7=A8=BF?= =?UTF-8?q?=E4=BB=B6=E7=AE=A1=E7=90=86=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hangtag-ui/hangtag-ui-admin/src/App.vue | 4 + .../src/api/oms/brand/index.ts | 16 +- .../src/api/oms/productcareitem/index.ts | 47 + .../src/BrandDataListDialog/DataForm.vue | 69 ++ .../src/BrandDataListDialog/config.data.ts | 102 ++ .../Dialog/src/BrandDataListDialog/index.vue | 293 ++++++ .../DraftDesignDataListDialog/DataForm.vue | 74 ++ .../DraftDesignDataListDialog/config.data.ts | 82 ++ .../src/DraftDesignDataListDialog/index.vue | 294 ++++++ .../src/DraftDesignImageLibDialog/index.vue | 248 +++++ .../ProductTypeDataListDialog/DataForm.vue | 70 ++ .../ProductTypeDataListDialog/config.data.ts | 89 ++ .../src/ProductTypeDataListDialog/index.vue | 294 ++++++ .../components/DesignPreviewDialog.vue | 65 ++ .../DraftDesign/components/DesignPropEdit.vue | 475 +++++++++ .../components/DynamicPropConfig.vue | 109 ++- .../components/ImageLibraryManage.vue | 15 +- .../components/layout/LeftPanel.vue | 40 +- .../components/layout/RightPanel.vue | 1 + .../DraftDesign/components/layout/index.vue | 211 ++-- .../components/node/ShapeCellNode.vue | 1 - .../components/node/ShapeCircleNode.vue | 1 - .../components/node/ShapeEllipseNode.vue | 1 - .../components/node/ShapeImageNode.vue | 42 +- .../components/node/ShapeLozengeNode.vue | 1 - .../components/node/ShapeRightArrowNode.vue | 1 - .../node/ShapeRightTriangleNode.vue | 1 - .../components/node/ShapeTriangleNode.vue | 1 - .../components/node/TextCellNode.vue | 22 +- .../components/DraftDesign/config/index.ts | 4 +- .../components/DraftDesign/icons/demo.html | 72 +- .../DraftDesign/icons/fonts/icomoon.eot | Bin 13592 -> 14540 bytes .../DraftDesign/icons/fonts/icomoon.svg | 5 + .../DraftDesign/icons/fonts/icomoon.ttf | Bin 13428 -> 14376 bytes .../DraftDesign/icons/fonts/icomoon.woff | Bin 13504 -> 14452 bytes .../DraftDesign/icons/selection.json | 2 +- .../components/DraftDesign/icons/style.css | 25 +- .../src/components/DraftDesign/index.vue | 900 +++++++++++------- .../src/components/DraftDesign/utils/Dpi.ts | 29 +- .../components/DraftDesign/utils/FuncUtil.ts | 4 +- .../hangtag-ui-admin/src/views/Home/Index.vue | 151 +-- .../src/views/Login/components/LoginForm.vue | 2 +- .../src/views/oms/brand/BrandForm.vue | 4 +- .../oms/draftdesigndata/detials/index.vue | 4 +- .../src/views/oms/draftdesigndata/index.vue | 9 +- .../productcareitem/ProductCareItemForm.vue | 214 +++++ .../src/views/oms/productcareitem/index.vue | 256 +++++ .../views/oms/productinfo/ProductInfoForm.vue | 140 ++- .../src/views/oms/productinfo/index.vue | 86 +- .../src/views/Login/components/LoginForm.vue | 5 +- 50 files changed, 3825 insertions(+), 756 deletions(-) create mode 100644 hangtag-ui/hangtag-ui-admin/src/api/oms/productcareitem/index.ts create mode 100644 hangtag-ui/hangtag-ui-admin/src/components/Dialog/src/BrandDataListDialog/DataForm.vue create mode 100644 hangtag-ui/hangtag-ui-admin/src/components/Dialog/src/BrandDataListDialog/config.data.ts create mode 100644 hangtag-ui/hangtag-ui-admin/src/components/Dialog/src/BrandDataListDialog/index.vue create mode 100644 hangtag-ui/hangtag-ui-admin/src/components/Dialog/src/DraftDesignDataListDialog/DataForm.vue create mode 100644 hangtag-ui/hangtag-ui-admin/src/components/Dialog/src/DraftDesignDataListDialog/config.data.ts create mode 100644 hangtag-ui/hangtag-ui-admin/src/components/Dialog/src/DraftDesignDataListDialog/index.vue create mode 100644 hangtag-ui/hangtag-ui-admin/src/components/Dialog/src/DraftDesignImageLibDialog/index.vue create mode 100644 hangtag-ui/hangtag-ui-admin/src/components/Dialog/src/ProductTypeDataListDialog/DataForm.vue create mode 100644 hangtag-ui/hangtag-ui-admin/src/components/Dialog/src/ProductTypeDataListDialog/config.data.ts create mode 100644 hangtag-ui/hangtag-ui-admin/src/components/Dialog/src/ProductTypeDataListDialog/index.vue create mode 100644 hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/DesignPreviewDialog.vue create mode 100644 hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/DesignPropEdit.vue create mode 100644 hangtag-ui/hangtag-ui-admin/src/views/oms/productcareitem/ProductCareItemForm.vue create mode 100644 hangtag-ui/hangtag-ui-admin/src/views/oms/productcareitem/index.vue diff --git a/hangtag-ui/hangtag-ui-admin/src/App.vue b/hangtag-ui/hangtag-ui-admin/src/App.vue index 7407d97..3eb87f0 100644 --- a/hangtag-ui/hangtag-ui-admin/src/App.vue +++ b/hangtag-ui/hangtag-ui-admin/src/App.vue @@ -23,11 +23,15 @@ const setDefaultTheme = () => { appStore.setIsDark(isDarkTheme) } setDefaultTheme() +import { getTeleport } from '@antv/x6-vue-shape'; +// 处理 节点重复渲染 问题 TeleportContainer +const TeleportContainer = defineComponent(getTeleport()); diff --git a/hangtag-ui/hangtag-ui-admin/src/components/Dialog/src/DraftDesignDataListDialog/DataForm.vue b/hangtag-ui/hangtag-ui-admin/src/components/Dialog/src/DraftDesignDataListDialog/DataForm.vue new file mode 100644 index 0000000..1539714 --- /dev/null +++ b/hangtag-ui/hangtag-ui-admin/src/components/Dialog/src/DraftDesignDataListDialog/DataForm.vue @@ -0,0 +1,74 @@ + + diff --git a/hangtag-ui/hangtag-ui-admin/src/components/Dialog/src/DraftDesignDataListDialog/config.data.ts b/hangtag-ui/hangtag-ui-admin/src/components/Dialog/src/DraftDesignDataListDialog/config.data.ts new file mode 100644 index 0000000..36cb202 --- /dev/null +++ b/hangtag-ui/hangtag-ui-admin/src/components/Dialog/src/DraftDesignDataListDialog/config.data.ts @@ -0,0 +1,82 @@ +import type { CrudSchema } from '@/hooks/web/useCrudSchemas' +import { dateFormatter } from '@/utils/formatTime' + +// 表单校验 +export const rules = reactive({ + code: [required], + name: [required], +}) + +// CrudSchema https://doc.iocoder.cn/vue3/crud-schema/ +const crudSchemas = reactive([ + { + label: 'id', + field: 'id', + isForm: false, + }, + { + label: '编码', + field: 'code', + isSearch: true, + }, + { + label: '设计搞名称', + field: 'name', + isSearch: true, + }, + { + label: '作者', + field: 'author', + isSearch: true, + }, + { + label: '版本', + field: 'version', + isSearch: false, + form: { + component: 'InputNumber', + componentProps:{ + disabled: true + }, + value: 0 + }, + }, + { + label: '语言标识', + field: 'locale', + dictType: DICT_TYPE.LANGUAGE_LOCALE, + dictClass: 'string', + search: { + show: true, + }, + form: { + component: 'SelectV2' + }, + }, + { + label: '启用状态', + field: 'enabled', + isSearch: false, + }, + { + label: '备注', + field: 'remark', + isSearch: false, + }, + { + label: '创建时间', + field: 'createTime', + formatter: dateFormatter, + isSearch: true, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + isForm: false, + } +]) +export const { allSchemas } = useCrudSchemas(crudSchemas) diff --git a/hangtag-ui/hangtag-ui-admin/src/components/Dialog/src/DraftDesignDataListDialog/index.vue b/hangtag-ui/hangtag-ui-admin/src/components/Dialog/src/DraftDesignDataListDialog/index.vue new file mode 100644 index 0000000..c55ca3b --- /dev/null +++ b/hangtag-ui/hangtag-ui-admin/src/components/Dialog/src/DraftDesignDataListDialog/index.vue @@ -0,0 +1,294 @@ + + + + + diff --git a/hangtag-ui/hangtag-ui-admin/src/components/Dialog/src/DraftDesignImageLibDialog/index.vue b/hangtag-ui/hangtag-ui-admin/src/components/Dialog/src/DraftDesignImageLibDialog/index.vue new file mode 100644 index 0000000..d9d1828 --- /dev/null +++ b/hangtag-ui/hangtag-ui-admin/src/components/Dialog/src/DraftDesignImageLibDialog/index.vue @@ -0,0 +1,248 @@ + + + + + diff --git a/hangtag-ui/hangtag-ui-admin/src/components/Dialog/src/ProductTypeDataListDialog/DataForm.vue b/hangtag-ui/hangtag-ui-admin/src/components/Dialog/src/ProductTypeDataListDialog/DataForm.vue new file mode 100644 index 0000000..030f7ab --- /dev/null +++ b/hangtag-ui/hangtag-ui-admin/src/components/Dialog/src/ProductTypeDataListDialog/DataForm.vue @@ -0,0 +1,70 @@ + + diff --git a/hangtag-ui/hangtag-ui-admin/src/components/Dialog/src/ProductTypeDataListDialog/config.data.ts b/hangtag-ui/hangtag-ui-admin/src/components/Dialog/src/ProductTypeDataListDialog/config.data.ts new file mode 100644 index 0000000..ad995f9 --- /dev/null +++ b/hangtag-ui/hangtag-ui-admin/src/components/Dialog/src/ProductTypeDataListDialog/config.data.ts @@ -0,0 +1,89 @@ +import type { CrudSchema } from '@/hooks/web/useCrudSchemas' +import { dateFormatter } from '@/utils/formatTime' + +// 表单校验 +export const rules = reactive({ + value: [required], + label: [required], +}) + +// CrudSchema https://doc.iocoder.cn/vue3/crud-schema/ +const crudSchemas = reactive([ + { + label: 'id', + field: 'id', + isForm: false, + }, + { + label: '编码', + field: 'value', + isSearch: true, + }, + { + label: '名称', + field: 'label', + isSearch: true, + }, + { + label: '排序号', + field: 'sort', + isSearch: true, + form: { + component: 'InputNumber', + value: 0 + }, + }, + { + label: '语言标识', + field: 'locale', + dictType: DICT_TYPE.LANGUAGE_LOCALE, + dictClass: 'string', + search: { + show: true, + }, + form: { + component: 'SelectV2' + }, + }, + { + label: '扩展项', + field: 'extendInfo', + isTable: false, + form: { + component: 'Input', + componentProps: { + type: 'textarea', + rows: 4 + }, + colProps: { + span: 24 + } + }, + }, + { + label: '备注', + field: 'remark', + isTable: false, + }, + { + label: '创建时间', + field: 'createTime', + formatter: dateFormatter, + isSearch: true, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + isForm: false, + }, + { + label: '操作', + field: 'action', + isForm: false + } +]) +export const { allSchemas } = useCrudSchemas(crudSchemas) diff --git a/hangtag-ui/hangtag-ui-admin/src/components/Dialog/src/ProductTypeDataListDialog/index.vue b/hangtag-ui/hangtag-ui-admin/src/components/Dialog/src/ProductTypeDataListDialog/index.vue new file mode 100644 index 0000000..682f211 --- /dev/null +++ b/hangtag-ui/hangtag-ui-admin/src/components/Dialog/src/ProductTypeDataListDialog/index.vue @@ -0,0 +1,294 @@ + + + + + diff --git a/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/DesignPreviewDialog.vue b/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/DesignPreviewDialog.vue new file mode 100644 index 0000000..56ccc7e --- /dev/null +++ b/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/DesignPreviewDialog.vue @@ -0,0 +1,65 @@ + + + + + diff --git a/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/DesignPropEdit.vue b/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/DesignPropEdit.vue new file mode 100644 index 0000000..f5fdfb6 --- /dev/null +++ b/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/DesignPropEdit.vue @@ -0,0 +1,475 @@ + + + + + + diff --git a/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/DynamicPropConfig.vue b/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/DynamicPropConfig.vue index 60a6294..0c085d9 100644 --- a/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/DynamicPropConfig.vue +++ b/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/DynamicPropConfig.vue @@ -2,10 +2,11 @@ -
+
- + @@ -28,28 +29,82 @@ + + + +
+ + 允许调整数量 + +
+
+ +
+ + 允许输入值 + +
+
+
+
+ + + + min + + + + max + + + +
-
+
追加 追加10个 删除
+
+ 两个或者以上允许追加更多位置信息 +
-
+
- {{index +1}} + {{ index + 1 }} - X向右 + + {{ index === 0 ? 'text' : 'icon' }} + X向右 - Y向下 + + + {{ index === 0 ? 'text' : 'icon' }} + + Y向下
-
@@ -72,13 +127,18 @@ import {calculateVectorDifference} from "@/components/DraftDesign/utils/FuncUtil import {useMessage} from "@/hooks/web/useMessage"; // 动态属性配置 -const emit = defineEmits(['update:visible','submit']) +const emit = defineEmits(['update:visible', 'submit']) const that = reactive({ allGroupList: [], show: false, - configInfo:{ + configInfo: { groupName: '', // 父节点名称 + isCombo: false, // 是否是组合节点 + minSize: 1, + maxSize: 100, + canChange: false, + canInput: false, cellIds: [], // 节点id groupId: `g_${Math.random().toString(36).substring(2)}`, data: {}, //节点是数据 @@ -93,7 +153,7 @@ const props = defineProps({ } }) const delLast = () => { - if(that.configInfo.pointList.length === 1){ + if (that.configInfo.pointList.length === 1) { useMessage().warning(`至少需要1个位置信息`) return; } @@ -101,11 +161,12 @@ const delLast = () => { useMessage().success(`成功删除1个位置信息`) } const appendNode = () => { - const arr = that.configInfo.pointList - const tmp = calculateVectorDifference(arr[arr.length - 1],arr[arr.length - 2]) + const arr = that.configInfo.pointList + const tmp = calculateVectorDifference(arr[arr.length - 1], arr[arr.length - 2]) - const dx = arr[arr.length - 1].x + tmp.x - const dy = arr[arr.length - 1].y + tmp.y + //@ts-ignore + const dx = arr[arr.length - 1].x + tmp.x, dy = arr[arr.length - 1].y + tmp.y; + //@ts-ignore that.configInfo.pointList.push({ x: dx, y: dy, @@ -113,19 +174,25 @@ const appendNode = () => { size: {...arr[arr.length - 1].size} }) } -const append = (count = 1)=>{ +const append = (count = 1) => { let i = 0; - while (i < count){ - appendNode() - i++; - } + while (i < count) { + appendNode() + i++; + } useMessage().success(`成功添加${count}个位置信息`) } const init = (allGroupList, data) => { that.allGroupList = allGroupList; + that.configInfo = { groupName: '', // 父节点名称 groupId: `g_${Math.random().toString(36).substring(2)}`, + isCombo: false, // 是否是组合节点 + minSize: 1, // 节点组最小数量 + maxSize: 100, // 节点组最大数量 + canChange: false, // 是否允许调整数量 + canInput: false,// 是否允许输入值 cellIds: [], // 节点id data: {}, //节点是数据 shape: '', // 节点类型 diff --git a/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/ImageLibraryManage.vue b/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/ImageLibraryManage.vue index 42a193b..be0a280 100644 --- a/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/ImageLibraryManage.vue +++ b/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/ImageLibraryManage.vue @@ -88,6 +88,8 @@ const props = defineProps({ tipsText: propTypes.string.def('点击选择图片上传'), }) +const emit = defineEmits( ["close",'update:modelValue']) + const { uploadUrl, httpRequest } = useUpload() const fileList = ref([]) @@ -116,20 +118,14 @@ const beforeUpload: UploadProps['beforeUpload'] = (rawFile) => { return imgType.includes(rawFile.type as FileTypes) && imgSize } -const emit = defineEmits( ["close",'update:modelValue']) -const formData = ref({ - id: undefined, - shapeType: undefined, - name: undefined, - initData: undefined, -}) const uploadSuccess: UploadProps['onSuccess'] = (res: any): void => { message.success('上传成功') - // 删除自身 + //@ts-ignore 删除自身 const index = fileList.value.findIndex((item) => item.response?.data === res.data) fileList.value.splice(index, 1) uploadList.value.push({ + // @ts-ignore filename: res.filename || res.data , name : res.data, url: res.data }) @@ -181,15 +177,18 @@ const addNew = async () => { } }, icon: fileList.value[i].url, + //@ts-ignore label: fileList.value[i].filename || '未命名图片', filterKeyword: function (){ return this.label } }; const data = { id: undefined, shapeType: ShapeType.vueShapeImage, + //@ts-ignore name: fileList.value[i].filename, initData: JSON.stringify(info), } + //@ts-ignore await ShapeTemplateApi.createShapeTemplate(data) } diff --git a/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/layout/LeftPanel.vue b/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/layout/LeftPanel.vue index 1d2acc4..075a2e7 100644 --- a/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/layout/LeftPanel.vue +++ b/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/layout/LeftPanel.vue @@ -16,8 +16,12 @@ v-loading="that.imgLoading" style="margin: 8px;padding-top: 12px" v-if="`shape_image` === layout.leftActive"> - +
+ + 查询 +
图片上传 +
+ +
+ +
@@ -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 @@ - + + + + + + + +
@@ -77,9 +128,13 @@
- Settings + Settings +
+
+ + +
-
@@ -190,6 +246,7 @@
@@ -197,6 +254,7 @@
@@ -204,6 +262,7 @@
@@ -597,7 +656,7 @@
- +
main
@@ -614,7 +673,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 @@
{ + // @ts-ignore + this.hrefBase64 = res + }) + } setTimeout(() => { if (this.nodeInfo.store && this.nodeInfo.store.data) { this.nodeInfo.store.data.data = this.cellInfo diff --git a/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/node/ShapeLozengeNode.vue b/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/node/ShapeLozengeNode.vue index 1750894..305fe2a 100644 --- a/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/node/ShapeLozengeNode.vue +++ b/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/node/ShapeLozengeNode.vue @@ -249,7 +249,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/ShapeRightArrowNode.vue b/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/node/ShapeRightArrowNode.vue index 7ba22b1..3b2e933 100644 --- a/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/node/ShapeRightArrowNode.vue +++ b/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/node/ShapeRightArrowNode.vue @@ -255,7 +255,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/ShapeRightTriangleNode.vue b/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/node/ShapeRightTriangleNode.vue index ed86739..c297821 100644 --- a/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/node/ShapeRightTriangleNode.vue +++ b/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/node/ShapeRightTriangleNode.vue @@ -239,7 +239,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/ShapeTriangleNode.vue b/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/node/ShapeTriangleNode.vue index 3338a70..3c3a39e 100644 --- a/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/node/ShapeTriangleNode.vue +++ b/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/node/ShapeTriangleNode.vue @@ -240,7 +240,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/TextCellNode.vue b/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/node/TextCellNode.vue index f32fdb1..3c6f2b6 100644 --- a/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/node/TextCellNode.vue +++ b/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/node/TextCellNode.vue @@ -52,8 +52,9 @@ export default defineComponent({ data() { return { textElId: nextId(), + cellInfo: { - id: '', + id: nextId(), label: '新文本', showInput: false, style: { @@ -100,18 +101,15 @@ export default defineComponent({ mounted() { const node = (this as any).getNode() this.nodeInfo = node - - if (node && node.data) { this.setCellInfo(node.data) } node.on('change:data', ({current}) => { - this.setCellInfo(current) }) - }, unmounted() { + }, methods: { safeHtml(val) { @@ -208,7 +206,6 @@ export default defineComponent({ } } } - this.cellInfo = mergeDeepObject({ showInput: false, id: nextId(), @@ -237,15 +234,14 @@ export default defineComponent({ } }, info) - console.log("text##", this.nodeInfo) - setTimeout(() => { - if (this.nodeInfo.store && this.nodeInfo.store.data) { - this.nodeInfo.store.data.data = this.cellInfo - } - }, 300) + // setTimeout(() => { + // if (this.nodeInfo.store && this.nodeInfo.store.data) { + // this.nodeInfo.store.data.data = this.cellInfo + // } + // }, 300) this.fontSize = parseInt(getSafeValue(this.cellInfo.style.text, 'fontSizeVal') || '12') - console.log(" this.fontSize", this.cellInfo) + // this.fontSize = parseInt(getSafeValue(this.cellInfo.style.text, 'fontSize') || '14') this.setInput(this.cellInfo.showInput) this.cellInfo.editMode = getDraftDesignState(); diff --git a/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/config/index.ts b/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/config/index.ts index b39336b..7a6dea1 100644 --- a/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/config/index.ts +++ b/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/config/index.ts @@ -73,7 +73,7 @@ export const graphOptions = (elId:string, viewMode = false) => { // 显示网格 grid: { - visible: false, + visible: true, size: 2, // 网格大小 type: 'doubleMesh', // // 'dot' | 'fixedDot' | 'mesh' args: [{ @@ -87,7 +87,7 @@ export const graphOptions = (elId:string, viewMode = false) => { }, // 滚轮缩放 MouseWheel mousewheel: { - enabled: true, zoomAtMousePosition: true, modifiers: ['ctrl', 'meta'], maxScale: 10, minScale: 0.3 + enabled: true, zoomAtMousePosition: true, modifiers: ['ctrl', 'meta'], maxScale: 10, minScale: 0.5 }, panning: { // 画布移动 diff --git a/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/icons/demo.html b/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/icons/demo.html index b3acf7d..a33d4d7 100644 --- a/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/icons/demo.html +++ b/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/icons/demo.html @@ -9,10 +9,80 @@
-

Font Name: icomoon (Glyphs: 62)

+

Font Name: icomoon (Glyphs: 67)

Grid Size: Unknown

+
+
+ + icon-lk_order_by +
+
+ + +
+
+ liga: + +
+
+
+
+ + icon-lk_search +
+
+ + +
+
+ liga: + +
+
+
+
+ + icon-lk_reduce +
+
+ + +
+
+ liga: + +
+
+
+
+ + icon-lk_edit +
+
+ + +
+
+ liga: + +
+
+
+
+ + icon-lk_add +
+
+ + +
+
+ liga: + +
+
diff --git a/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/icons/fonts/icomoon.eot b/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/icons/fonts/icomoon.eot index 3f431576794f26d85c77732ddde8a450b7573f0d..5fa3021f185cc6d5fdd6c813fbb6a758d05d8705 100644 GIT binary patch delta 1212 zcmaJaAj+EEj4Z}Wp}mOC3Peu;~HF$gdP7hBqYK%*lpY> zI4y=AgG;$jI#ph~Hy$?pE9I6rfJc;6ecmk58cbavr9@Du^7mBoSQ@oi-q)0nN? z!Y?qpzKh?+%L2gLO@58vgbzUi9Ws!Ila!xG>S|c?i5-F*mLi7gdC#H#$5VIkgk?}d zQljU7EF25AbI=|PwwLX?Y8ZR(W16gJnj&j^HEyz8cI-7zFz8`7?k6UhWv{Uec5tkj zTN`gyVvKP0p_gdrayQWWFoi}U8pCKrmYgnh3Sx&pgnpl{CDZ6Pqb46hVuC_6AmNNe z(o7*u$^Gm*7zm7-Ryu83BLR9wEHfQDrX2WlV5@ChQWQy=JbZXkl6ra?H#{Sc_N6Uz zlz~Uhax*g+*ta#f<-#1{)rkgvLS>nXLLJj0X-&V@*A#|0fL9WTVxJz?l7=S{k;758 zEk-)q1=|*~3+cudANjhwecS~mYu_K>R^pjVyjF~tN#RR-!!3$#%#!4-E&}`u?i$L( zYQHtb7GNN>O@iXggvY)*3|n=s{O=U#2bxB zPIRFg1s`!-P80VgCKFL~nnblTYWn#TZn0LtMfNTGQmD5##N7?`ic1BtU$hrEo||fE z5uDz(9lnLbtD$sp0h}bKTf`so1Yh7=_?Mc&ODg`)1+o|nWq^7(a`KZC z+m==>VPG&)0SdO|CRP+M_%fUT^49?Q3VDgSsWZJee*^hvfa=={@{3Ctm_hnYLO}8i z%*>4cCZ{mkGulpG!syLtyZHlSslGBJNCnW2H5OOn`E9;3aI=81A&Q~*Lb diff --git a/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/icons/fonts/icomoon.svg b/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/icons/fonts/icomoon.svg index 343305d..2321bad 100644 --- a/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/icons/fonts/icomoon.svg +++ b/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/icons/fonts/icomoon.svg @@ -69,4 +69,9 @@ + + + + + \ No newline at end of file diff --git a/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/icons/fonts/icomoon.ttf b/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/icons/fonts/icomoon.ttf index 27e233e2726580c970ccc5fab10b56b7b5ff5759..a741cf3c80d2dccfb1aea0e331822892292454dd 100644 GIT binary patch delta 1215 zcmaJ>O>7fa5T4mh>|h{U+pK?3YU16Et)|8Hu77q#Q@b`wBc+vXCFG~5Rau3fpeDsA zfPy$U7f{I|J zZ)U!Ep7~~X|C+v5s{;bSc31!rQkBu9A^BV%lIJe%LsPSMEja$mj{w+1_JL#eT#fWg zWV7x%Hgopq{XdL5WX}T_zfK>q55IEd(W?NNNs8yD$dqEvt*; zAd1gFUnyYe3w#?(OYh+6WZebud_`OoSEx<}(olp7yiduQTw0GB0eP28jViIM?%m|j z|L18rM8YzZkd)|sfrVpXp8&pa*jIO2YQxxi9y3(UFf`TJs&R#Lc{_{VaM;Ty;W|sU zoJG#yjbrWH=6L%irbB2oy+BQSdcmS@^O(&vzVXTRTmge-+!P~7ox8h{8j2?yF;N-(<&59Ya~Q##4-zs1KQ4q``0|XfNzR3S}`#`0ZjEKx`T_!SpX8c0WtT-KY3snIx3he>Ac zc{<1k(i>B|7wGK`2d97$HT{u4+|ld z@0Km6WR=SnE?Z@1_28{r^uu0}k?osq*KAR_sdm{tu*qr?8!Pr}f*j zpC;P6@q5a|p`{+Z3mb3hyBeBtVRtAJIulwBzZR~wK2SsO19)1ALc`AZmmU~b@gH9~ B0nPvb delta 292 zcmZ2c@Fk<3fsuiMft#U$ftkU;KUm+0Ux+OgD6$8L6OwZi3&g`N9bsT#lmYTX(i4jd zfV2RR5288Jb1KvLY^BSA{0asJeUFUP#1ze(ZK@0m1_yxhW*I;Mj!>2iOPUnL{A zq~iZvAdA5eXdWX+PJXguV%yTHB@7HkDnQY;+{B6k2498~K>ivaUm-6sH+7~L=WihY z3{XQ`L4I)w(4jzJ5(1KEU}pX|@qj&}?IcETM%&FkjHUX@ApZb?;Tnsp@%%Pl8Ms-% z{73gJu7DUIdUB14Iiu6&EhZd{lP{RI2?2#cx||q}F>ry@FfdIPv=H9hY_^mU09#B% Au>b%7 diff --git a/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/icons/fonts/icomoon.woff b/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/icons/fonts/icomoon.woff index 482c6c0afa72bc2e168377bcb90d0fa10d6b5c46..3c6c0d8c92848574a40da4e767d04af4d1d201e4 100644 GIT binary patch delta 1256 zcmaJ7fa5T4mh><}Q1W3PWIYT{kThS1pA_0O(oYRg7Rq!ig!LViFXWCe<&CSa7b z1ohxth@gjx$~}|=AS4b|!vV+z2}mQvAywhREwl&30U_nmN>r+ZykW-15(-kEcHX?1 z_s#6gH*a<7P04vKH!uJQw2V2}UekMibnYvEJvmb-0br3_hgjTW&wf8um}TDsvRmFu z`>E;kUy<)IfcApr=_~Di@nqoyKzr*;q`Wu&6=tkThF7K6411OqHWc<%CRiwlHKdI z^GW!XceczWj$pyjMr?Jgk%@=^q1N;QHC^rmgSt&(JQfOLD5%KRHndtKr`v~aS5!-+ z(5;7b(TBtYT~ULCi^mdr5~)k!j_VVTXGAwrDcuA-MRQOO}=ko*Wtz&W^Aj=cI zy%VzB)m1;?v@+6@GV~D!kLcw_q}Q`;y??z8vxHa2>-ce%BLnLj=Gf zTZm#;)UPGt_E=Eyhj>~{I?sZqg?u1gpW;JTXQxZJzOrTo0$sPbC}UY!VgJR4ZtM3JO3Uy_x}HkxJTyl4|$c zxhgK|!y?r_;w|V11!XI?p$#oA;<%h5?sZJWLTJ^AYHLV$i$`rzHIMWBFY}_WyW1z+ z_H|1Od8tn_X9ZE1Y;Lw#9jzN;vw%NHlG*?L=jh6pzQ`x@xJG>lX#OJH=0dxD)jTJ_ z33A#b{3%E9S+QB%XmwbuO-(1tC~^);+`s=4x^rifxnyoD-8}$Z4OSa0JGQomN?eIY z<54LpDdLXm>!GQsA;H7@;jCe1jBM7x6(eh|9l3j#KCItnriK_QT;ux&%FHn02)|V1 z4Ip@3oKYBYKzpTCg&y=FfcG?0Hs1eSUl{~ zk@Uo3kk}p|p96{o(sL@)fMQ1&81y|rn9o+aJR>zRg@M742dKsjgf(-vsb&BLfnqK| zz6uC)gtAP@$StV=iUI9l1e(Xl@qaD@Lr#7&P@SI<&?1I55N=yqwInyO0?0S|0pu%y zu`k1kyu{p81_omZphloN# @@ -1352,7 +1540,6 @@ defineExpose({