diff --git a/apps/jingrow/frontend/src/core/pagetype/default.vue b/apps/jingrow/frontend/src/core/pagetype/default.vue index 6853b40..e39028b 100644 --- a/apps/jingrow/frontend/src/core/pagetype/default.vue +++ b/apps/jingrow/frontend/src/core/pagetype/default.vue @@ -261,25 +261,25 @@ import { onMounted, onUnmounted, ref, shallowRef, markRaw, computed, watch } from 'vue' import { useRoute, useRouter } from 'vue-router' import { NButton, NSpace, NIcon, useMessage, useDialog, NLayout, NLayoutSider, NLayoutContent } from 'naive-ui' -import FieldRenderer from '@/core/components/form/FieldRenderer.vue' +import FieldRenderer from '@/core/pagetype/form/FieldRenderer.vue' import { Icon } from '@iconify/vue' import { resolveSidebarPanel } from '@/core/registry/sidebarOverride' import { defineAsyncComponent } from 'vue' const FormPanel = defineAsyncComponent(async () => { const mod = await resolveSidebarPanel(entity.value, 'FormPanel.vue') - return mod || (await import('@/core/components/form/panel/FormPanel.vue')) + return mod || (await import('@/core/pagetype/form/panel/FormPanel.vue')) }) const ImageSection = defineAsyncComponent(async () => { const mod = await resolveSidebarPanel(entity.value, 'ImageSection.vue') - return mod || (await import('@/core/components/form/panel/ImageSection.vue')) + return mod || (await import('@/core/pagetype/form/panel/ImageSection.vue')) }) const AttachmentSection = defineAsyncComponent(async () => { const mod = await resolveSidebarPanel(entity.value, 'AttachmentSection.vue') - return mod || (await import('@/core/components/form/panel/AttachmentSection.vue')) + return mod || (await import('@/core/pagetype/form/panel/AttachmentSection.vue')) }) const TagSection = defineAsyncComponent(async () => { const mod = await resolveSidebarPanel(entity.value, 'TagSection.vue') - return mod || (await import('@/core/components/form/panel/TagSection.vue')) + return mod || (await import('@/core/pagetype/form/panel/TagSection.vue')) }) import axios from 'axios' import { t } from '@/shared/i18n' diff --git a/apps/jingrow/frontend/src/core/pagetype/default_single.vue b/apps/jingrow/frontend/src/core/pagetype/default_single.vue index 1323c0d..26a92d6 100644 --- a/apps/jingrow/frontend/src/core/pagetype/default_single.vue +++ b/apps/jingrow/frontend/src/core/pagetype/default_single.vue @@ -416,7 +416,7 @@ import { onMounted, ref, computed, watch } from 'vue' import { useRoute, useRouter } from 'vue-router' import { NButton, NSpace, NIcon, NProgress, NInput, NSelect, NInputNumber, NCheckbox, NDatePicker, NTimePicker, NRate, NColorPicker, NAutoComplete, NDataTable, useMessage } from 'naive-ui' -import JeditorControl from '@/core/components/form/controls/Jeditor.vue' +import JeditorControl from '@/core/pagetype/form/controls/Jeditor.vue' import { Icon } from '@iconify/vue' import axios from 'axios' import { t } from '@/shared/i18n' diff --git a/apps/jingrow/frontend/src/core/components/form/FieldRenderer.vue b/apps/jingrow/frontend/src/core/pagetype/form/FieldRenderer.vue similarity index 100% rename from apps/jingrow/frontend/src/core/components/form/FieldRenderer.vue rename to apps/jingrow/frontend/src/core/pagetype/form/FieldRenderer.vue diff --git a/apps/jingrow/frontend/src/core/components/form/controls/Attach.vue b/apps/jingrow/frontend/src/core/pagetype/form/controls/Attach.vue similarity index 100% rename from apps/jingrow/frontend/src/core/components/form/controls/Attach.vue rename to apps/jingrow/frontend/src/core/pagetype/form/controls/Attach.vue diff --git a/apps/jingrow/frontend/src/core/components/form/controls/AttachImage.vue b/apps/jingrow/frontend/src/core/pagetype/form/controls/AttachImage.vue similarity index 100% rename from apps/jingrow/frontend/src/core/components/form/controls/AttachImage.vue rename to apps/jingrow/frontend/src/core/pagetype/form/controls/AttachImage.vue diff --git a/apps/jingrow/frontend/src/core/components/form/controls/Autocomplete.vue b/apps/jingrow/frontend/src/core/pagetype/form/controls/Autocomplete.vue similarity index 100% rename from apps/jingrow/frontend/src/core/components/form/controls/Autocomplete.vue rename to apps/jingrow/frontend/src/core/pagetype/form/controls/Autocomplete.vue diff --git a/apps/jingrow/frontend/src/core/components/form/controls/Barcode.vue b/apps/jingrow/frontend/src/core/pagetype/form/controls/Barcode.vue similarity index 100% rename from apps/jingrow/frontend/src/core/components/form/controls/Barcode.vue rename to apps/jingrow/frontend/src/core/pagetype/form/controls/Barcode.vue diff --git a/apps/jingrow/frontend/src/core/components/form/controls/Button.vue b/apps/jingrow/frontend/src/core/pagetype/form/controls/Button.vue similarity index 100% rename from apps/jingrow/frontend/src/core/components/form/controls/Button.vue rename to apps/jingrow/frontend/src/core/pagetype/form/controls/Button.vue diff --git a/apps/jingrow/frontend/src/core/components/form/controls/Check.vue b/apps/jingrow/frontend/src/core/pagetype/form/controls/Check.vue similarity index 100% rename from apps/jingrow/frontend/src/core/components/form/controls/Check.vue rename to apps/jingrow/frontend/src/core/pagetype/form/controls/Check.vue diff --git a/apps/jingrow/frontend/src/core/components/form/controls/Code.vue b/apps/jingrow/frontend/src/core/pagetype/form/controls/Code.vue similarity index 100% rename from apps/jingrow/frontend/src/core/components/form/controls/Code.vue rename to apps/jingrow/frontend/src/core/pagetype/form/controls/Code.vue diff --git a/apps/jingrow/frontend/src/core/components/form/controls/Color.vue b/apps/jingrow/frontend/src/core/pagetype/form/controls/Color.vue similarity index 100% rename from apps/jingrow/frontend/src/core/components/form/controls/Color.vue rename to apps/jingrow/frontend/src/core/pagetype/form/controls/Color.vue diff --git a/apps/jingrow/frontend/src/core/components/form/controls/Comment.vue b/apps/jingrow/frontend/src/core/pagetype/form/controls/Comment.vue similarity index 100% rename from apps/jingrow/frontend/src/core/components/form/controls/Comment.vue rename to apps/jingrow/frontend/src/core/pagetype/form/controls/Comment.vue diff --git a/apps/jingrow/frontend/src/core/components/form/controls/CronEditor.vue b/apps/jingrow/frontend/src/core/pagetype/form/controls/CronEditor.vue similarity index 100% rename from apps/jingrow/frontend/src/core/components/form/controls/CronEditor.vue rename to apps/jingrow/frontend/src/core/pagetype/form/controls/CronEditor.vue diff --git a/apps/jingrow/frontend/src/core/components/form/controls/Currency.vue b/apps/jingrow/frontend/src/core/pagetype/form/controls/Currency.vue similarity index 100% rename from apps/jingrow/frontend/src/core/components/form/controls/Currency.vue rename to apps/jingrow/frontend/src/core/pagetype/form/controls/Currency.vue diff --git a/apps/jingrow/frontend/src/core/components/form/controls/Data.vue b/apps/jingrow/frontend/src/core/pagetype/form/controls/Data.vue similarity index 100% rename from apps/jingrow/frontend/src/core/components/form/controls/Data.vue rename to apps/jingrow/frontend/src/core/pagetype/form/controls/Data.vue diff --git a/apps/jingrow/frontend/src/core/components/form/controls/Date.vue b/apps/jingrow/frontend/src/core/pagetype/form/controls/Date.vue similarity index 100% rename from apps/jingrow/frontend/src/core/components/form/controls/Date.vue rename to apps/jingrow/frontend/src/core/pagetype/form/controls/Date.vue diff --git a/apps/jingrow/frontend/src/core/components/form/controls/DateRange.vue b/apps/jingrow/frontend/src/core/pagetype/form/controls/DateRange.vue similarity index 100% rename from apps/jingrow/frontend/src/core/components/form/controls/DateRange.vue rename to apps/jingrow/frontend/src/core/pagetype/form/controls/DateRange.vue diff --git a/apps/jingrow/frontend/src/core/components/form/controls/Datetime.vue b/apps/jingrow/frontend/src/core/pagetype/form/controls/Datetime.vue similarity index 100% rename from apps/jingrow/frontend/src/core/components/form/controls/Datetime.vue rename to apps/jingrow/frontend/src/core/pagetype/form/controls/Datetime.vue diff --git a/apps/jingrow/frontend/src/core/components/form/controls/Duration.vue b/apps/jingrow/frontend/src/core/pagetype/form/controls/Duration.vue similarity index 100% rename from apps/jingrow/frontend/src/core/components/form/controls/Duration.vue rename to apps/jingrow/frontend/src/core/pagetype/form/controls/Duration.vue diff --git a/apps/jingrow/frontend/src/core/components/form/controls/DynamicLink.vue b/apps/jingrow/frontend/src/core/pagetype/form/controls/DynamicLink.vue similarity index 100% rename from apps/jingrow/frontend/src/core/components/form/controls/DynamicLink.vue rename to apps/jingrow/frontend/src/core/pagetype/form/controls/DynamicLink.vue diff --git a/apps/jingrow/frontend/src/core/components/form/controls/Float.vue b/apps/jingrow/frontend/src/core/pagetype/form/controls/Float.vue similarity index 100% rename from apps/jingrow/frontend/src/core/components/form/controls/Float.vue rename to apps/jingrow/frontend/src/core/pagetype/form/controls/Float.vue diff --git a/apps/jingrow/frontend/src/core/components/form/controls/Geolocation.vue b/apps/jingrow/frontend/src/core/pagetype/form/controls/Geolocation.vue similarity index 100% rename from apps/jingrow/frontend/src/core/components/form/controls/Geolocation.vue rename to apps/jingrow/frontend/src/core/pagetype/form/controls/Geolocation.vue diff --git a/apps/jingrow/frontend/src/core/components/form/controls/HTML.vue b/apps/jingrow/frontend/src/core/pagetype/form/controls/HTML.vue similarity index 100% rename from apps/jingrow/frontend/src/core/components/form/controls/HTML.vue rename to apps/jingrow/frontend/src/core/pagetype/form/controls/HTML.vue diff --git a/apps/jingrow/frontend/src/core/components/form/controls/HTMLEditor.vue b/apps/jingrow/frontend/src/core/pagetype/form/controls/HTMLEditor.vue similarity index 100% rename from apps/jingrow/frontend/src/core/components/form/controls/HTMLEditor.vue rename to apps/jingrow/frontend/src/core/pagetype/form/controls/HTMLEditor.vue diff --git a/apps/jingrow/frontend/src/core/components/form/controls/Heading.vue b/apps/jingrow/frontend/src/core/pagetype/form/controls/Heading.vue similarity index 100% rename from apps/jingrow/frontend/src/core/components/form/controls/Heading.vue rename to apps/jingrow/frontend/src/core/pagetype/form/controls/Heading.vue diff --git a/apps/jingrow/frontend/src/core/components/form/controls/Icon.vue b/apps/jingrow/frontend/src/core/pagetype/form/controls/Icon.vue similarity index 100% rename from apps/jingrow/frontend/src/core/components/form/controls/Icon.vue rename to apps/jingrow/frontend/src/core/pagetype/form/controls/Icon.vue diff --git a/apps/jingrow/frontend/src/core/components/form/controls/Image.vue b/apps/jingrow/frontend/src/core/pagetype/form/controls/Image.vue similarity index 100% rename from apps/jingrow/frontend/src/core/components/form/controls/Image.vue rename to apps/jingrow/frontend/src/core/pagetype/form/controls/Image.vue diff --git a/apps/jingrow/frontend/src/core/components/form/controls/Int.vue b/apps/jingrow/frontend/src/core/pagetype/form/controls/Int.vue similarity index 100% rename from apps/jingrow/frontend/src/core/components/form/controls/Int.vue rename to apps/jingrow/frontend/src/core/pagetype/form/controls/Int.vue diff --git a/apps/jingrow/frontend/src/core/components/form/controls/JSON.vue b/apps/jingrow/frontend/src/core/pagetype/form/controls/JSON.vue similarity index 100% rename from apps/jingrow/frontend/src/core/components/form/controls/JSON.vue rename to apps/jingrow/frontend/src/core/pagetype/form/controls/JSON.vue diff --git a/apps/jingrow/frontend/src/core/components/form/controls/Jeditor.vue b/apps/jingrow/frontend/src/core/pagetype/form/controls/Jeditor.vue similarity index 100% rename from apps/jingrow/frontend/src/core/components/form/controls/Jeditor.vue rename to apps/jingrow/frontend/src/core/pagetype/form/controls/Jeditor.vue diff --git a/apps/jingrow/frontend/src/core/components/form/controls/Link.vue b/apps/jingrow/frontend/src/core/pagetype/form/controls/Link.vue similarity index 100% rename from apps/jingrow/frontend/src/core/components/form/controls/Link.vue rename to apps/jingrow/frontend/src/core/pagetype/form/controls/Link.vue diff --git a/apps/jingrow/frontend/src/core/components/form/controls/LongText.vue b/apps/jingrow/frontend/src/core/pagetype/form/controls/LongText.vue similarity index 100% rename from apps/jingrow/frontend/src/core/components/form/controls/LongText.vue rename to apps/jingrow/frontend/src/core/pagetype/form/controls/LongText.vue diff --git a/apps/jingrow/frontend/src/core/components/form/controls/MarkdownEditor.vue b/apps/jingrow/frontend/src/core/pagetype/form/controls/MarkdownEditor.vue similarity index 100% rename from apps/jingrow/frontend/src/core/components/form/controls/MarkdownEditor.vue rename to apps/jingrow/frontend/src/core/pagetype/form/controls/MarkdownEditor.vue diff --git a/apps/jingrow/frontend/src/core/components/form/controls/MultiCheck.vue b/apps/jingrow/frontend/src/core/pagetype/form/controls/MultiCheck.vue similarity index 100% rename from apps/jingrow/frontend/src/core/components/form/controls/MultiCheck.vue rename to apps/jingrow/frontend/src/core/pagetype/form/controls/MultiCheck.vue diff --git a/apps/jingrow/frontend/src/core/components/form/controls/MultiSelect.vue b/apps/jingrow/frontend/src/core/pagetype/form/controls/MultiSelect.vue similarity index 100% rename from apps/jingrow/frontend/src/core/components/form/controls/MultiSelect.vue rename to apps/jingrow/frontend/src/core/pagetype/form/controls/MultiSelect.vue diff --git a/apps/jingrow/frontend/src/core/components/form/controls/MultiSelectList.vue b/apps/jingrow/frontend/src/core/pagetype/form/controls/MultiSelectList.vue similarity index 100% rename from apps/jingrow/frontend/src/core/components/form/controls/MultiSelectList.vue rename to apps/jingrow/frontend/src/core/pagetype/form/controls/MultiSelectList.vue diff --git a/apps/jingrow/frontend/src/core/components/form/controls/MultiSelectPills.vue b/apps/jingrow/frontend/src/core/pagetype/form/controls/MultiSelectPills.vue similarity index 100% rename from apps/jingrow/frontend/src/core/components/form/controls/MultiSelectPills.vue rename to apps/jingrow/frontend/src/core/pagetype/form/controls/MultiSelectPills.vue diff --git a/apps/jingrow/frontend/src/core/components/form/controls/Password.vue b/apps/jingrow/frontend/src/core/pagetype/form/controls/Password.vue similarity index 100% rename from apps/jingrow/frontend/src/core/components/form/controls/Password.vue rename to apps/jingrow/frontend/src/core/pagetype/form/controls/Password.vue diff --git a/apps/jingrow/frontend/src/core/components/form/controls/Percent.vue b/apps/jingrow/frontend/src/core/pagetype/form/controls/Percent.vue similarity index 100% rename from apps/jingrow/frontend/src/core/components/form/controls/Percent.vue rename to apps/jingrow/frontend/src/core/pagetype/form/controls/Percent.vue diff --git a/apps/jingrow/frontend/src/core/components/form/controls/Phone.vue b/apps/jingrow/frontend/src/core/pagetype/form/controls/Phone.vue similarity index 100% rename from apps/jingrow/frontend/src/core/components/form/controls/Phone.vue rename to apps/jingrow/frontend/src/core/pagetype/form/controls/Phone.vue diff --git a/apps/jingrow/frontend/src/core/components/form/controls/Rating.vue b/apps/jingrow/frontend/src/core/pagetype/form/controls/Rating.vue similarity index 100% rename from apps/jingrow/frontend/src/core/components/form/controls/Rating.vue rename to apps/jingrow/frontend/src/core/pagetype/form/controls/Rating.vue diff --git a/apps/jingrow/frontend/src/core/components/form/controls/Select.vue b/apps/jingrow/frontend/src/core/pagetype/form/controls/Select.vue similarity index 100% rename from apps/jingrow/frontend/src/core/components/form/controls/Select.vue rename to apps/jingrow/frontend/src/core/pagetype/form/controls/Select.vue diff --git a/apps/jingrow/frontend/src/core/components/form/controls/Signature.vue b/apps/jingrow/frontend/src/core/pagetype/form/controls/Signature.vue similarity index 100% rename from apps/jingrow/frontend/src/core/components/form/controls/Signature.vue rename to apps/jingrow/frontend/src/core/pagetype/form/controls/Signature.vue diff --git a/apps/jingrow/frontend/src/core/components/form/controls/SmallText.vue b/apps/jingrow/frontend/src/core/pagetype/form/controls/SmallText.vue similarity index 100% rename from apps/jingrow/frontend/src/core/components/form/controls/SmallText.vue rename to apps/jingrow/frontend/src/core/pagetype/form/controls/SmallText.vue diff --git a/apps/jingrow/frontend/src/core/components/form/controls/Table.vue b/apps/jingrow/frontend/src/core/pagetype/form/controls/Table.vue similarity index 99% rename from apps/jingrow/frontend/src/core/components/form/controls/Table.vue rename to apps/jingrow/frontend/src/core/pagetype/form/controls/Table.vue index 07da63b..68a654a 100644 --- a/apps/jingrow/frontend/src/core/components/form/controls/Table.vue +++ b/apps/jingrow/frontend/src/core/pagetype/form/controls/Table.vue @@ -1,7 +1,7 @@