@@ -93,6 +92,13 @@ const props = defineProps({
},
});
+const emit = defineEmits(["update:modelValue", "update:visible"]);
+
+const innerVisible = computed({
+ get: () => props.visible,
+ set: (value) => emit("update:visible", value),
+});
+
const loadData = async () => {
const { page, size } = pagination.value;
const params = { ...search.value, page, size };
@@ -141,19 +147,12 @@ const onSelectedImage = (image: any) => {
watch(
() => props.visible,
- async (value) => {
- if (!value) return;
-
- loadData();
+ (value) => {
+ if (value) {
+ loadData();
+ }
}
);
-
-const emit = defineEmits(["update:modelValue", "update:visible"]);
-
-const innerVisible = computed({
- get: () => props.visible,
- set: (value) => emit("update:visible", value),
-});
diff --git a/src/components/editor/panel-left/index.vue b/src/components/editor/panel-left/index.vue
index 9192dc2..52b379f 100644
--- a/src/components/editor/panel-left/index.vue
+++ b/src/components/editor/panel-left/index.vue
@@ -15,7 +15,7 @@
当前组件
-
+
- -
-
+
-
图片
-
+
+ {{ item.title }}
+
@@ -55,17 +59,20 @@
diff --git a/src/components/editor/panel-main/components/block.vue b/src/components/editor/panel-main/components/block.vue
index 0ff5917..66a554c 100644
--- a/src/components/editor/panel-main/components/block.vue
+++ b/src/components/editor/panel-main/components/block.vue
@@ -17,7 +17,7 @@
@resizing="onItemDragOrResize"
@activated="setCurrentBlock(data)"
>
-
+
diff --git a/src/components/editor/panel-main/components/header.vue b/src/components/editor/panel-main/components/header.vue
index c1537ac..f35aee4 100644
--- a/src/components/editor/panel-main/components/header.vue
+++ b/src/components/editor/panel-main/components/header.vue
@@ -12,7 +12,7 @@
{{ Math.floor(container.x) }} , {{ Math.floor(container.y) }}
- 尺寸:
+ 画布:
{{ container.width }} * {{ container.height }}
diff --git a/src/components/editor/panel-main/components/texter.vue b/src/components/editor/panel-main/components/texter.vue
index f310257..ec9458a 100644
--- a/src/components/editor/panel-main/components/texter.vue
+++ b/src/components/editor/panel-main/components/texter.vue
@@ -7,7 +7,7 @@
>
-
+
@@ -22,11 +22,18 @@
-
-
diff --git a/src/components/editor/panel-right/index.vue b/src/components/editor/panel-right/index.vue
index 5c3dbf4..0dafeb9 100644
--- a/src/components/editor/panel-right/index.vue
+++ b/src/components/editor/panel-right/index.vue
@@ -2,16 +2,13 @@
diff --git a/src/components/editor/panel-right/text-attr.vue b/src/components/editor/panel-right/text-attr.vue
deleted file mode 100644
index 94b5ad0..0000000
--- a/src/components/editor/panel-right/text-attr.vue
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/types/auto-component.d.ts b/src/types/auto-component.d.ts
index 0b9225d..0bb0cab 100644
--- a/src/types/auto-component.d.ts
+++ b/src/types/auto-component.d.ts
@@ -7,43 +7,34 @@ export {}
declare module '@vue/runtime-core' {
export interface GlobalComponents {
- AAvatar: typeof import('@arco-design/web-vue')['Avatar']
- ABreadcrumb: typeof import('@arco-design/web-vue')['Breadcrumb']
- ABreadcrumbItem: typeof import('@arco-design/web-vue')['BreadcrumbItem']
AButton: typeof import('@arco-design/web-vue')['Button']
ACheckbox: typeof import('@arco-design/web-vue')['Checkbox']
- ACheckboxGroup: typeof import('@arco-design/web-vue')['CheckboxGroup']
- AConfigProvider: typeof import('@arco-design/web-vue')['ConfigProvider']
ADivider: typeof import('@arco-design/web-vue')['Divider']
ADoption: typeof import('@arco-design/web-vue')['Doption']
- ADrawer: typeof import('@arco-design/web-vue')['Drawer']
- ADropdown: typeof import('@arco-design/web-vue')['Dropdown']
ADropdownButton: typeof import('@arco-design/web-vue')['DropdownButton']
+ AEmpty: typeof import('@arco-design/web-vue')['Empty']
AForm: typeof import('@arco-design/web-vue')['Form']
AFormItem: typeof import('@arco-design/web-vue')['FormItem']
AInput: typeof import('@arco-design/web-vue')['Input']
AInputNumber: typeof import('@arco-design/web-vue')['InputNumber']
+ AInputPassword: typeof import('@arco-design/web-vue')['InputPassword']
AInputSearch: typeof import('@arco-design/web-vue')['InputSearch']
- ALayout: typeof import('@arco-design/web-vue')['Layout']
- ALayoutContent: typeof import('@arco-design/web-vue')['LayoutContent']
- ALayoutHeader: typeof import('@arco-design/web-vue')['LayoutHeader']
- ALayoutSider: typeof import('@arco-design/web-vue')['LayoutSider']
ALink: typeof import('@arco-design/web-vue')['Link']
AMenu: typeof import('@arco-design/web-vue')['Menu']
AMenuItem: typeof import('@arco-design/web-vue')['MenuItem']
- AMenuItemGroup: typeof import('@arco-design/web-vue')['MenuItemGroup']
AModal: typeof import('@arco-design/web-vue')['Modal']
APagination: typeof import('@arco-design/web-vue')['Pagination']
APopover: typeof import('@arco-design/web-vue')['Popover']
ARadio: typeof import('@arco-design/web-vue')['Radio']
+ ARadioButton: typeof import('@arco-design/web-vue')['RadioButton']
ARadioGroup: typeof import('@arco-design/web-vue')['RadioGroup']
- AScrollbar: typeof import('@arco-design/web-vue')['Scrollbar']
ASelect: typeof import('@arco-design/web-vue')['Select']
+ ASpace: typeof import('@arco-design/web-vue')['Space']
ASpin: typeof import('@arco-design/web-vue')['Spin']
ATag: typeof import('@arco-design/web-vue')['Tag']
ATextarea: typeof import('@arco-design/web-vue')['Textarea']
ATooltip: typeof import('@arco-design/web-vue')['Tooltip']
- AUpload: typeof import('@arco-design/web-vue')['Upload']
+ BaseOption: typeof import('./../components/editor/components/BaseOption.vue')['default']
Block: typeof import('./../components/editor/panel-main/components/block.vue')['default']
BlockAttr: typeof import('./../components/editor/panel-right/block-attr.vue')['default']
BreadCrumb: typeof import('./../components/breadcrumb/bread-crumb.vue')['default']
@@ -55,14 +46,15 @@ declare module '@vue/runtime-core' {
ImagePicker: typeof import('./../components/editor/components/ImagePicker.vue')['default']
InputColor: typeof import('./../components/editor/components/InputColor.vue')['default']
InputImage: typeof import('./../components/editor/components/InputImage.vue')['default']
- Option: typeof import('./../components/editor/blocks/text/option.vue')['default']
+ Marquee: typeof import('./../components/editor/blocks/text/marquee.vue')['default']
+ Option: typeof import('./../components/editor/blocks/font/option.vue')['default']
Page403: typeof import('./../components/error/page-403.vue')['default']
PanelHeader: typeof import('./../components/editor/panel-header/index.vue')['default']
PanelLeft: typeof import('./../components/editor/panel-left/index.vue')['default']
PanelMain: typeof import('./../components/editor/panel-main/index.vue')['default']
PanelRight: typeof import('./../components/editor/panel-right/index.vue')['default']
Preview: typeof import('./../components/editor/preview/index.vue')['default']
- Render: typeof import('./../components/editor/blocks/text/render.vue')['default']
+ Render: typeof import('./../components/editor/blocks/font/render.vue')['default']
RouterLink: typeof import('vue-router')['RouterLink']
RouterView: typeof import('vue-router')['RouterView']
TextAttr: typeof import('./../components/editor/panel-right/text-attr.vue')['default']