zhoucg 1 år sedan
förälder
incheckning
47f2781663

+ 36 - 36
components.d.ts

@@ -46,18 +46,18 @@ declare module 'vue' {
     Line: typeof import('./src/components/sketch-ruler/line.vue')['default']
     PagePalette: typeof import('./src/components/PagePalette.vue')['default']
     PageToc: typeof import('./src/components/PageToc.vue')['default']
-    RoyCircle: typeof import('./src/components/PageComponents/RoyCircle.vue')['default']
-    RoyComplexTable: typeof import('./src/components/PageComponents/YvanTable/RoyComplexTable.vue')['default']
-    RoyGroup: typeof import('./src/components/PageComponents/RoyGroup.vue')['default']
-    RoyImage: typeof import('./src/components/PageComponents/YvanImage.vue')['default']
-    RoyLine: typeof import('./src/components/PageComponents/YvanLine.vue')['default']
+    RoyCircle: typeof import('./src/components/elements/RoyCircle.vue')['default']
+    RoyComplexTable: typeof import('./src/components/elements/YvanTable/RoyComplexTable.vue')['default']
+    RoyGroup: typeof import('./src/components/elements/RoyGroup.vue')['default']
+    RoyImage: typeof import('./src/components/elements/YvanImage.vue')['default']
+    RoyLine: typeof import('./src/components/elements/YvanLine.vue')['default']
     RoyModal: typeof import('./src/components/yvan-ui/yvan-model/RoyModal.vue')['default']
-    RoyRect: typeof import('./src/components/PageComponents/RoyRect.vue')['default']
-    RoySimpleTable: typeof import('./src/components/PageComponents/RoyTable/RoySimpleTable.vue')['default']
-    RoySimpleText: typeof import('./src/components/PageComponents/YvanSimpleText.vue')['default']
-    RoySimpleTextInTable: typeof import('./src/components/PageComponents/YvanTable/RoySimpleTextInTable.vue')['default']
-    RoyStar: typeof import('./src/components/PageComponents/RoyStar.vue')['default']
-    RoyTextInTable: typeof import('./src/components/PageComponents/YvanTable/RoyTextInTable.vue')['default']
+    RoyRect: typeof import('./src/components/elements/RoyRect.vue')['default']
+    RoySimpleTable: typeof import('./src/components/elements/RoyTable/RoySimpleTable.vue')['default']
+    RoySimpleText: typeof import('./src/components/elements/YvanSimpleText.vue')['default']
+    RoySimpleTextInTable: typeof import('./src/components/elements/YvanTable/RoySimpleTextInTable.vue')['default']
+    RoyStar: typeof import('./src/components/elements/RoyStar.vue')['default']
+    RoyTextInTable: typeof import('./src/components/elements/YvanTable/RoyTextInTable.vue')['default']
     RulerWrapper: typeof import('./src/components/sketch-ruler/rulerWrapper.vue')['default']
     SidebarMenu: typeof import('./src/components/yvan-ui/yvan-sidebar-menu/SidebarMenu.vue')['default']
     SidebarMenuBadge: typeof import('./src/components/yvan-ui/yvan-sidebar-menu/SidebarMenuBadge.vue')['default']
@@ -65,21 +65,21 @@ declare module 'vue' {
     SidebarMenuItem: typeof import('./src/components/yvan-ui/yvan-sidebar-menu/SidebarMenuItem.vue')['default']
     SidebarMenuLink: typeof import('./src/components/yvan-ui/yvan-sidebar-menu/SidebarMenuLink.vue')['default']
     SketchRuler: typeof import('./src/components/sketch-ruler/sketchRuler.vue')['default']
-    TableDataSetting: typeof import('./src/components/PageComponents/yvan-table/TableDataSetting.vue')['default']
+    TableDataSetting: typeof import('./src/components/elements/yvan-table/TableDataSetting.vue')['default']
     Toast: typeof import('./src/components/yvan-ui/yvan-print-toast/toast.vue')['default']
-    WangEditor: typeof import('./src/components/PageComponents/WangEditorVue/WangEditor.vue')['default']
-    WangToolbar: typeof import('./src/components/PageComponents/WangEditorVue/WangToolbar.vue')['default']
-    YvanBarcode: typeof import('./src/components/PageComponents/YvanBarcode.vue')['default']
-    YvanBarcodeProps: typeof import('./src/components/PageComponents/YvanBarcodeProps.vue')['default']
-    YvanCircle: typeof import('./src/components/PageComponents/YvanCircle.vue')['default']
-    YvanCircleProps: typeof import('./src/components/PageComponents/YvanCircleProps.vue')['default']
-    YvanComplexTable: typeof import('./src/components/PageComponents/yvan-table/YvanComplexTable.vue')['default']
-    YvanComplexTableProps: typeof import('./src/components/PageComponents/yvan-table/YvanComplexTableProps.vue')['default']
-    YvanImage: typeof import('./src/components/PageComponents/YvanImage.vue')['default']
-    YvanImageProps: typeof import('./src/components/PageComponents/YvanImageProps.vue')['default']
-    YvanLine: typeof import('./src/components/PageComponents/YvanLine.vue')['default']
-    YvanLineProps: typeof import('./src/components/PageComponents/YvanLineProps.vue')['default']
-    YvanLinePropsTemplate: typeof import('./src/components/PageComponents/YvanLinePropsTemplate.vue')['default']
+    WangEditor: typeof import('./src/components/elements/WangEditorVue/WangEditor.vue')['default']
+    WangToolbar: typeof import('./src/components/elements/WangEditorVue/WangToolbar.vue')['default']
+    YvanBarcode: typeof import('./src/components/elements/YvanBarcode.vue')['default']
+    YvanBarcodeProps: typeof import('./src/components/elements/YvanBarcodeProps.vue')['default']
+    YvanCircle: typeof import('./src/components/elements/YvanCircle.vue')['default']
+    YvanCircleProps: typeof import('./src/components/elements/YvanCircleProps.vue')['default']
+    YvanComplexTable: typeof import('./src/components/elements/yvan-table/YvanComplexTable.vue')['default']
+    YvanComplexTableProps: typeof import('./src/components/elements/yvan-table/YvanComplexTableProps.vue')['default']
+    YvanImage: typeof import('./src/components/elements/YvanImage.vue')['default']
+    YvanImageProps: typeof import('./src/components/elements/YvanImageProps.vue')['default']
+    YvanLine: typeof import('./src/components/elements/YvanLine.vue')['default']
+    YvanLineProps: typeof import('./src/components/elements/YvanLineProps.vue')['default']
+    YvanLinePropsTemplate: typeof import('./src/components/elements/YvanLinePropsTemplate.vue')['default']
     YvanPrintAside: typeof import('./src/components/yvan-ui/YvanPrintAside.vue')['default']
     YvanPrintContainer: typeof import('./src/components/yvan-ui/YvanPrintContainer.vue')['default']
     YvanPrintDesigner: typeof import('./src/components/YvanPrintDesigner.vue')['default']
@@ -95,18 +95,18 @@ declare module 'vue' {
     YvanPrintPageFormat: typeof import('./src/components/YvanPrintPageFormat.vue')['default']
     YvanPrintTextEditor: typeof import('./src/components/yvan-ui/YvanPrintTextEditor.vue')['default']
     YvanPrintToolbar: typeof import('./src/components/yvan-ui/YvanPrintToolbar.vue')['default']
-    YvanRect: typeof import('./src/components/PageComponents/YvanRect.vue')['default']
-    YvanRectProps: typeof import('./src/components/PageComponents/YvanRectProps.vue')['default']
-    YvanRichText: typeof import('./src/components/PageComponents/YvanRichText.vue')['default']
+    YvanRect: typeof import('./src/components/elements/YvanRect.vue')['default']
+    YvanRectProps: typeof import('./src/components/elements/YvanRectProps.vue')['default']
+    YvanRichText: typeof import('./src/components/elements/YvanRichText.vue')['default']
     YvanRichTextEditor: typeof import('./src/components/yvan-ui/YvanRichTextEditor.vue')['default']
-    YvanRichTextInTable: typeof import('./src/components/PageComponents/yvan-table/YvanRichTextInTable.vue')['default']
-    YvanRichTextProps: typeof import('./src/components/PageComponents/YvanRichTextProps.vue')['default']
-    YvanSimpleTable: typeof import('./src/components/PageComponents/yvan-table/YvanSimpleTable.vue')['default']
-    YvanSimpleTableProps: typeof import('./src/components/PageComponents/yvan-table/YvanSimpleTableProps.vue')['default']
-    YvanSimpleText: typeof import('./src/components/PageComponents/YvanSimpleText.vue')['default']
-    YvanSimpleTextInTable: typeof import('./src/components/PageComponents/yvan-table/YvanSimpleTextInTable.vue')['default']
-    YvanSimpleTextProps: typeof import('./src/components/PageComponents/YvanSimpleTextProps.vue')['default']
+    YvanRichTextInTable: typeof import('./src/components/elements/yvan-table/YvanRichTextInTable.vue')['default']
+    YvanRichTextProps: typeof import('./src/components/elements/YvanRichTextProps.vue')['default']
+    YvanSimpleTable: typeof import('./src/components/elements/yvan-table/YvanSimpleTable.vue')['default']
+    YvanSimpleTableProps: typeof import('./src/components/elements/yvan-table/YvanSimpleTableProps.vue')['default']
+    YvanSimpleText: typeof import('./src/components/elements/YvanSimpleText.vue')['default']
+    YvanSimpleTextInTable: typeof import('./src/components/elements/yvan-table/YvanSimpleTextInTable.vue')['default']
+    YvanSimpleTextProps: typeof import('./src/components/elements/YvanSimpleTextProps.vue')['default']
     YvanTextEditor: typeof import('./src/components/yvan-ui/YvanTextEditor.vue')['default']
-    YvanTextInTable: typeof import('./src/components/PageComponents/yvan-table/YvanTextInTable.vue')['default']
+    YvanTextInTable: typeof import('./src/components/elements/yvan-table/YvanTextInTable.vue')['default']
   }
 }

+ 2 - 2
src/components/elements/RoyGroup.vue

@@ -18,8 +18,8 @@
 
 <script>
 import commonMixin from '@/mixin/commonMixin'
-import RoyText from '@/components/PageComponents/YvanRichText.vue'
-import RoyRect from '@/components/PageComponents/YvanRect.vue'
+import RoyText from '@/components/elements/YvanRichText.vue'
+import RoyRect from '@/components/elements/YvanRect.vue'
 
 /**
  * roy-group

+ 2 - 2
src/components/elements/YvanBarcode.vue

@@ -8,8 +8,8 @@
 
 <script>
 import commonMixin from '@/mixin/commonMixin'
-import { StyledImage } from '@/components/PageComponents/style'
-import YvanBarcodeProps from "@/components/PageComponents/YvanBarcodeProps.vue";
+import { StyledImage } from '@/components/elements/style'
+import YvanBarcodeProps from "@/components/elements/YvanBarcodeProps.vue";
 
 export default {
   name: 'YvanBarcode',

+ 2 - 2
src/components/elements/YvanCircle.vue

@@ -6,8 +6,8 @@
 
 <script>
 import commonMixin from '@/mixin/commonMixin'
-import { StyledCircle } from '@/components/PageComponents/style'
-import YvanCircleProps from "@/components/PageComponents/YvanCircleProps.vue";
+import { StyledCircle } from '@/components/elements/style'
+import YvanCircleProps from "@/components/elements/YvanCircleProps.vue";
 
 export default {
   name: 'YvanCircle',

+ 2 - 2
src/components/elements/YvanImage.vue

@@ -8,8 +8,8 @@
 
 <script>
 import commonMixin from '@/mixin/commonMixin'
-import { StyledImage } from '@/components/PageComponents/style'
-import YvanImageProps from "@/components/PageComponents/YvanImageProps.vue";
+import { StyledImage } from '@/components/elements/style'
+import YvanImageProps from "@/components/elements/YvanImageProps.vue";
 
 export default {
   name: 'YvanImage',

+ 2 - 2
src/components/elements/YvanLine.vue

@@ -6,8 +6,8 @@
 
 <script>
 import commonMixin from '@/mixin/commonMixin'
-import { StyledLine } from '@/components/PageComponents/style'
-import YvanLineProps from '@/components/PageComponents/YvanLineProps.vue'
+import { StyledLine } from '@/components/elements/style'
+import YvanLineProps from '@/components/elements/YvanLineProps.vue'
 
 export default {
   name: 'YvanLine',

+ 2 - 2
src/components/elements/YvanRect.vue

@@ -6,8 +6,8 @@
 
 <script>
 import commonMixin from '@/mixin/commonMixin'
-import {StyledRect} from '@/components/PageComponents/style'
-import YvanRectProps from "@/components/PageComponents/YvanRectProps.vue";
+import {StyledRect} from '@/components/elements/style'
+import YvanRectProps from "@/components/elements/YvanRectProps.vue";
 
 export default {
   name: 'YvanRect',

+ 2 - 2
src/components/elements/YvanRichText.vue

@@ -10,9 +10,9 @@
 import {mapState} from 'pinia';
 import {globalStore} from '@/store';
 import commonMixin from '@/mixin/commonMixin';
-import {StyledText} from '@/components/PageComponents/style';
+import {StyledText} from '@/components/elements/style';
 import {toolBarConfig, editorConfig, mode} from '@/components/config/editorConfig';
-import YvanRichTextProps from "@/components/PageComponents/YvanRichTextProps.vue";
+import YvanRichTextProps from "@/components/elements/YvanRichTextProps.vue";
 import YvanRichTextEditor from "@/components/yvan-ui/YvanRichTextEditor.vue";
 
 export default {

+ 2 - 2
src/components/elements/YvanSimpleText.vue

@@ -32,8 +32,8 @@
 import {mapState} from 'pinia';
 import {globalStore} from "@/store";
 import commonMixin from '@/mixin/commonMixin';
-import {StyledSimpleText} from '@/components/PageComponents/style';
-import YvanSimpleTextProps from "@/components/PageComponents/YvanSimpleTextProps.vue";
+import {StyledSimpleText} from '@/components/elements/style';
+import YvanSimpleTextProps from "@/components/elements/YvanSimpleTextProps.vue";
 
 export default {
   name: 'YvanSimpleText',

+ 9 - 9
src/components/elements/index.js

@@ -1,12 +1,12 @@
-import YvanLine from "@/components/PageComponents/YvanLine.vue";
-import YvanRect from "@/components/PageComponents/YvanRect.vue";
-import YvanImage from "@/components/PageComponents/YvanImage.vue";
-import YvanCircle from "@/components/PageComponents/YvanCircle.vue";
-import YvanBarcode from "@/components/PageComponents/YvanBarcode.vue";
-import YvanRichText from "@/components/PageComponents/YvanRichText.vue";
-import YvanSimpleText from "@/components/PageComponents/YvanSimpleText.vue";
-import YvanSimpleTable from "@/components/PageComponents/yvan-table/YvanSimpleTable.vue";
-import YvanComplexTable from "@/components/PageComponents/yvan-table/YvanComplexTable.vue";
+import YvanLine from "@/components/elements/YvanLine.vue";
+import YvanRect from "@/components/elements/YvanRect.vue";
+import YvanImage from "@/components/elements/YvanImage.vue";
+import YvanCircle from "@/components/elements/YvanCircle.vue";
+import YvanBarcode from "@/components/elements/YvanBarcode.vue";
+import YvanRichText from "@/components/elements/YvanRichText.vue";
+import YvanSimpleText from "@/components/elements/YvanSimpleText.vue";
+import YvanSimpleTable from "@/components/elements/yvan-table/YvanSimpleTable.vue";
+import YvanComplexTable from "@/components/elements/yvan-table/YvanComplexTable.vue";
 
 export const install = (Vue) => {
     YvanLine.install(Vue)

+ 6 - 6
src/components/elements/yvan-table/YvanComplexTable.vue

@@ -106,12 +106,12 @@
 import { mapState } from 'pinia'
 import {globalStore} from "@/store"
 import commonMixin from '@/mixin/commonMixin'
-import { StyledComplexTable } from '@/components/PageComponents/style'
-import ResizeObserver from '@/components/PageComponents/yvan-table/ResizeObserver'
-import TableDataSetting from '@/components/PageComponents/yvan-table/TableDataSetting.vue'
-import YvanSimpleTable from '@/components/PageComponents/yvan-table/YvanSimpleTable.vue';
-import YvanRichTextInTable from '@/components/PageComponents/yvan-table/YvanRichTextInTable.vue'
-import YvanComplexTableProps from '@/components/PageComponents/yvan-table/YvanComplexTableProps.vue'
+import { StyledComplexTable } from '@/components/elements/style'
+import ResizeObserver from '@/components/elements/yvan-table/ResizeObserver'
+import TableDataSetting from '@/components/elements/yvan-table/TableDataSetting.vue'
+import YvanSimpleTable from '@/components/elements/yvan-table/YvanSimpleTable.vue';
+import YvanRichTextInTable from '@/components/elements/yvan-table/YvanRichTextInTable.vue'
+import YvanComplexTableProps from '@/components/elements/yvan-table/YvanComplexTableProps.vue'
 
 const defaultTextProp = {
   icon: 'ri-text',

+ 1 - 1
src/components/elements/yvan-table/YvanRichTextInTable.vue

@@ -10,7 +10,7 @@
 import {mapState} from 'pinia';
 import {globalStore} from "@/store";
 import commonMixin from '@/mixin/commonMixin';
-import {StyledText} from '@/components/PageComponents/style';
+import {StyledText} from '@/components/elements/style';
 import {toolBarConfig, editorConfig, mode} from '@/components/config/editorConfig';
 import YvanRichTextEditor from "@/components/yvan-ui/YvanRichTextEditor.vue";
 

+ 4 - 4
src/components/elements/yvan-table/YvanSimpleTable.vue

@@ -72,11 +72,11 @@ import {mapState} from 'pinia'
 import {globalStore} from "@/store"
 import toast from '@/utils/toast'
 import commonMixin from '@/mixin/commonMixin'
-import {StyledSimpleTable} from '@/components/PageComponents/style'
+import {StyledSimpleTable} from '@/components/elements/style'
 import {Context, ContextItem, directive} from '@/components/yvan-context'
-import YvanRichTextIn from '@/components/PageComponents/yvan-table/YvanRichTextInTable.vue'
-import YvanSimpleTextIn from '@/components/PageComponents/yvan-table/YvanSimpleTextInTable.vue'
-import YvanSimpleTableProps from '@/components/PageComponents/yvan-table/YvanSimpleTableProps.vue'
+import YvanRichTextIn from '@/components/elements/yvan-table/YvanRichTextInTable.vue'
+import YvanSimpleTextIn from '@/components/elements/yvan-table/YvanSimpleTextInTable.vue'
+import YvanSimpleTableProps from '@/components/elements/yvan-table/YvanSimpleTableProps.vue'
 
 const defaultTableCell = {
   icon: 'ri-text',

+ 1 - 1
src/components/elements/yvan-table/YvanSimpleTextInTable.vue

@@ -33,7 +33,7 @@
 import {mapState} from 'pinia'
 import {globalStore} from "@/store"
 import commonMixin from '@/mixin/commonMixin'
-import {StyledSimpleText} from '@/components/PageComponents/style'
+import {StyledSimpleText} from '@/components/elements/style'
 
 /**
  *

+ 10 - 10
src/components/yvan-editor/Editor.vue

@@ -84,16 +84,16 @@ import {Context, ContextItem, directive} from '@/components/yvan-context'
 import ComponentAdjuster from '@/components/yvan-editor/ComponentAdjuster.vue'
 import {getComponentRotatedStyle, getShapeStyle} from '@/utils/style-util.js'
 import Big from 'big.js'
-// import RoyText from '@/components/PageComponents/YvanRichText.vue'
-// import YvanSimpleText from '@/components/PageComponents/YvanSimpleText.vue'
-// import RoyRect from '@/components/PageComponents/RoyRect'
-// import RoyLine from '@/components/PageComponents/YvanLine.vue'
-// import RoyImage from '@/components/PageComponents/RoyImage'
-// import RoyStar from '@/components/PageComponents/RoyStar'
-// import RoyCircle from '@/components/PageComponents/RoyCircle'
-// import RoySimpleTable from '@/components/PageComponents/RoyTable/RoySimpleTable.vue'
-// import RoyComplexTable from '@/components/PageComponents/RoyTable/RoyComplexTable'
-// import RoyGroup from '@/components/PageComponents/RoyGroup'
+// import RoyText from '@/components/elements/YvanRichText.vue'
+// import YvanSimpleText from '@/components/elements/YvanSimpleText.vue'
+// import RoyRect from '@/components/elements/RoyRect'
+// import RoyLine from '@/components/elements/YvanLine.vue'
+// import RoyImage from '@/components/elements/RoyImage'
+// import RoyStar from '@/components/elements/RoyStar'
+// import RoyCircle from '@/components/elements/RoyCircle'
+// import RoySimpleTable from '@/components/elements/RoyTable/RoySimpleTable.vue'
+// import RoyComplexTable from '@/components/elements/RoyTable/RoyComplexTable'
+// import RoyGroup from '@/components/elements/RoyGroup'
 import Area from '@/components/yvan-editor/Area.vue'
 import commonMixin from '@/mixin/commonMixin'
 import {isPreventDrop} from '@/utils/html-util.js'

+ 1 - 1
src/main.ts

@@ -8,7 +8,7 @@ import 'element-plus/theme-chalk/index.css'
 import * as Icons from '@ant-design/icons-vue'
 import System from "@/utils/system";
 import App from '@/App.vue'
-import {install} from "@/components/PageComponents"
+import {install} from "@/components/elements"
 
 const pinia = createPinia()