修正类型导入写法,补上 pnpm 锁文件

- ItemType / ColumnItem / EleProTableDone 等纯类型改用 import type,
  避免打包器把类型当运行时依赖处理
- 提交 pnpm-lock.yaml 与 pnpm-workspace.yaml

注:仓库里原有的 package-lock.json 与 yarn.lock 未动,三份锁文件并存。
This commit is contained in:
2026-09-18 23:30:55 +08:00
parent add24cfde8
commit 6b967b6b69
46 changed files with 6741 additions and 44 deletions
+6688
View File
File diff suppressed because it is too large Load Diff
+9
View File
@@ -0,0 +1,9 @@
allowBuilds:
'@parcel/watcher': true
'@vue-office/docx': true
'@vue-office/excel': true
core-js: true
es5-ext: true
esbuild: true
vue-demi: true
vue-echarts: true
@@ -47,7 +47,7 @@
<script lang="ts" setup>
import { ref } from 'vue';
import {
import type {
ColumnItem,
DatasourceFunction
} from 'ele-admin-pro/es/ele-pro-table/types';
@@ -51,7 +51,7 @@
<script lang="ts" setup>
import { ref } from 'vue';
import {
import type {
ColumnItem,
DatasourceFunction
} from 'ele-admin-pro/es/ele-pro-table/types';
@@ -47,7 +47,7 @@
<script lang="ts" setup>
import { ref } from 'vue';
import {
import type {
ColumnItem,
DatasourceFunction
} from 'ele-admin-pro/es/ele-pro-table/types';
@@ -71,7 +71,7 @@
import { toTreeData, eachTreeData } from 'ele-admin-pro/es';
import type { EleProTable } from 'ele-admin-pro/es';
import { listOrganizations } from '@/api/system/organization';
import {
import type {
Organization,
OrganizationParam
} from '@/api/system/organization/model';
@@ -39,7 +39,7 @@
<script lang="ts" setup>
import { ref } from 'vue';
import {
import type {
ColumnItem,
DatasourceFunction
} from 'ele-admin-pro/es/ele-pro-table/types';
@@ -41,7 +41,7 @@
<script lang="ts" setup>
import { ref } from 'vue';
import {
import type {
ColumnItem,
DatasourceFunction
} from 'ele-admin-pro/es/ele-pro-table/types';
@@ -39,7 +39,7 @@
<script lang="ts" setup>
import { ref } from 'vue';
import {
import type {
ColumnItem,
DatasourceFunction
} from 'ele-admin-pro/es/ele-pro-table/types';
@@ -41,7 +41,7 @@
<script lang="ts" setup>
import { ref } from 'vue';
import {
import type {
ColumnItem,
DatasourceFunction
} from 'ele-admin-pro/es/ele-pro-table/types';
@@ -39,7 +39,7 @@
<script lang="ts" setup>
import { ref } from 'vue';
import {
import type {
ColumnItem,
DatasourceFunction
} from 'ele-admin-pro/es/ele-pro-table/types';
@@ -40,7 +40,7 @@
<script lang="ts" setup>
import { ref } from 'vue';
import {
import type {
ColumnItem,
DatasourceFunction
} from 'ele-admin-pro/es/ele-pro-table/types';
@@ -40,7 +40,7 @@
<script lang="ts" setup>
import { ref } from 'vue';
import {
import type {
ColumnItem,
DatasourceFunction
} from 'ele-admin-pro/es/ele-pro-table/types';
@@ -85,7 +85,7 @@ import { useUserStore } from "@/store/modules/user";
import type { Article } from "@/api/cms/article/model";
import { addArticle, updateArticle } from "@/api/cms/article";
import { FILE_SERVER, FILE_THUMBNAIL } from "@/config/setting";
import { ItemType } from "ele-admin-pro/es/ele-image-upload/types";
import type { ItemType } from "ele-admin-pro/es/ele-image-upload/types";
import { uploadFile } from "@/api/system/file";
import TinymceEditor from "@/components/TinymceEditor/index.vue";
import { FormInstance, Rule, RuleObject } from "ant-design-vue/es/form";
+1 -1
View File
@@ -106,7 +106,7 @@
import { FormInstance } from 'ant-design-vue/es/form';
import { FILE_SERVER, FILE_THUMBNAIL } from "@/config/setting";
import { uploadFile } from '@/api/system/file';
import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
import type { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
import { App } from '@/api/app/model';
import { addApp } from '@/api/app';
import { assignObject } from 'ele-admin-pro';
@@ -161,7 +161,7 @@
import type { Merchant } from '@/api/merchant/model';
import { addMerchant, updateMerchant } from '@/api/merchant';
import { FormInstance, Rule, RuleObject } from 'ant-design-vue/es/form';
import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
import type { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
import { uploadFile } from '@/api/system/file';
import OwnerChoose from '@/components/UserChoose/index.vue';
import { FILE_SERVER, FILE_THUMBNAIL } from "@/config/setting";
@@ -76,7 +76,7 @@
MerchantClerk,
MerchantClerkParam
} from '@/api/merchant/clerk/model';
import {
import type {
ColumnItem,
DatasourceFunction
} from 'ele-admin-pro/es/ele-pro-table/types';
@@ -162,7 +162,7 @@
import type { Merchant } from '@/api/merchant/model';
import { addMerchant, updateMerchant } from '@/api/merchant';
import { FormInstance, Rule, RuleObject } from 'ant-design-vue/es/form';
import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
import type { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
import { uploadFile } from '@/api/system/file';
// import OwnerChoose from '@/components/UserChoose/index.vue';
import { FILE_SERVER, FILE_THUMBNAIL } from '@/config/setting';
@@ -101,7 +101,7 @@
updateMerchantWithdraw
} from '@/api/merchant/withdraw';
import { FormInstance, Rule, RuleObject } from 'ant-design-vue/es/form';
import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
import type { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
import { uploadFile } from '@/api/system/file';
import { FILE_SERVER, FILE_THUMBNAIL } from '@/config/setting';
import useFormData from '@/utils/use-form-data';
+1 -1
View File
@@ -517,7 +517,7 @@
import { UploadOutlined } from '@/layout/menu-icons';
import { FormInstance } from 'ant-design-vue/es/form';
import { Company } from '@/api/system/company/model';
import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
import type { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
import DictSelect from '@/views/search/components/dict-select.vue';
import { User } from '@/api/system/user/model';
import { uploadFile } from "@/api/system/file";
@@ -39,7 +39,7 @@
<script lang="ts" setup>
import { ref } from 'vue';
import {
import type {
ColumnItem,
DatasourceFunction
} from 'ele-admin-pro/es/ele-pro-table/types';
@@ -39,7 +39,7 @@
<script lang="ts" setup>
import { ref } from 'vue';
import {
import type {
ColumnItem,
DatasourceFunction
} from 'ele-admin-pro/es/ele-pro-table/types';
+1 -1
View File
@@ -72,7 +72,7 @@ import { useThemeStore } from "@/store/modules/theme";
import { uploadFile } from "@/api/system/file";
import type { Notice } from "@/api/oa/notice/model";
import { FILE_SERVER } from "@/config/setting";
import { ItemType } from "ele-admin-pro/es/ele-image-upload/types";
import type { ItemType } from "ele-admin-pro/es/ele-image-upload/types";
import { listNotice, removeNotice } from "@/api/oa/notice";
import { chat, send } from "@/api/oa/chatgpt";
import {
+1 -1
View File
@@ -135,7 +135,7 @@ import zh_Hans from 'bytemd/locales/zh_Hans.json';
import gfm from '@bytemd/plugin-gfm';
// 插件的中文语言文件
import zh_HansGfm from '@bytemd/plugin-gfm/locales/zh_Hans.json';
import { ItemType } from "ele-admin-pro/es/ele-image-upload/types";
import type { ItemType } from "ele-admin-pro/es/ele-image-upload/types";
import { UploadOutlined } from '@ant-design/icons-vue';
import { User } from "@/api/system/user/model";
import { Company } from "@/api/system/company/model";
+1 -1
View File
@@ -298,7 +298,7 @@ import { FILE_SERVER } from "@/config/setting";
import { getDictionaryOptions, isImage, openUrl } from "@/utils/common";
import { TaskRecord } from "@/api/oa/task-record/model";
import { App } from "@/api/app/model"
import { ItemType } from "ele-admin-pro/es/ele-image-upload/types";
import type { ItemType } from "ele-admin-pro/es/ele-image-upload/types";
import { addTaskRecord, listTaskRecord, removeTaskRecord } from "@/api/oa/task-record";
import SelectStaff from '@/components/SelectStaff/index.vue';
import { UploadOutlined } from '@ant-design/icons-vue';
@@ -135,7 +135,7 @@ import zh_Hans from 'bytemd/locales/zh_Hans.json';
import gfm from '@bytemd/plugin-gfm';
// 插件的中文语言文件
import zh_HansGfm from '@bytemd/plugin-gfm/locales/zh_Hans.json';
import { ItemType } from "ele-admin-pro/es/ele-image-upload/types";
import type { ItemType } from "ele-admin-pro/es/ele-image-upload/types";
import { UploadOutlined } from '@ant-design/icons-vue';
import { User } from "@/api/system/user/model";
import { Company } from "@/api/system/company/model";
@@ -298,7 +298,7 @@ import { FILE_SERVER } from "@/config/setting";
import { getDictionaryOptions, isImage, openUrl } from "@/utils/common";
import { TaskRecord } from "@/api/oa/task-record/model";
import { App } from "@/api/app/model"
import { ItemType } from "ele-admin-pro/es/ele-image-upload/types";
import type { ItemType } from "ele-admin-pro/es/ele-image-upload/types";
import { addTaskRecord, listTaskRecord, removeTaskRecord } from "@/api/oa/task-record";
import SelectStaff from '@/components/SelectStaff/index.vue';
import { UploadOutlined } from '@ant-design/icons-vue';
@@ -148,7 +148,7 @@ import iconData from 'ele-admin-pro/es/ele-icon-picker/icons';
import {assignObject, isExternalLink} from 'ele-admin-pro';
import {addApp, updateApp} from '@/api/dashboard/appstore';
import type {App} from '@/api/dashboard/appstore/model';
import {ItemType} from "ele-admin-pro/es/ele-image-upload/types";
import type {ItemType} from "ele-admin-pro/es/ele-image-upload/types";
import {uploadFile} from "@/api/system/file";
import {getDictionaryOptions} from "@/utils/common";
@@ -148,7 +148,7 @@ import iconData from 'ele-admin-pro/es/ele-icon-picker/icons';
import {assignObject, isExternalLink} from 'ele-admin-pro';
import {addApp, updateApp} from '@/api/dashboard/appstore';
import type {App} from '@/api/dashboard/appstore/model';
import {ItemType} from "ele-admin-pro/es/ele-image-upload/types";
import type {ItemType} from "ele-admin-pro/es/ele-image-upload/types";
import {uploadFile} from "@/api/system/file";
import {getDictionaryOptions} from "@/utils/common";
+1 -1
View File
@@ -151,7 +151,7 @@
import { timeAgo } from 'ele-admin-pro';
import type { App, AppParam } from '@/api/dashboard/appstore/model';
import { useUserStore } from '@/store/modules/user';
import { EleProTableDone } from 'ele-admin-pro/es/ele-pro-table/types';
import type { EleProTableDone } from 'ele-admin-pro/es/ele-pro-table/types';
import { openUrl } from '@/utils/common';
import type { Menu } from '@/api/system/menu/model';
// import type { RoleMenu } from '@/api/system/menu/model/role-menu';
@@ -70,7 +70,7 @@
MerchantClerk,
MerchantClerkParam
} from '@/api/merchant/clerk/model';
import {
import type {
ColumnItem,
DatasourceFunction
} from 'ele-admin-pro/es/ele-pro-table/types';
+1 -1
View File
@@ -178,7 +178,7 @@
import { assignObject } from 'ele-admin-pro';
import { getFileSize } from '@/utils/common';
import { Company } from '@/api/system/company/model';
import { ItemType } from "ele-admin-pro/es/ele-image-upload/types";
import type { ItemType } from "ele-admin-pro/es/ele-image-upload/types";
import { uploadFile } from "@/api/system/file";
const useForm = Form.useForm;
@@ -133,7 +133,7 @@
import { FormInstance } from 'ant-design-vue/es/form';
import useFormData from '@/utils/use-form-data';
import { addSetting, listSetting, updateSetting } from "@/api/system/setting";
import { ItemType } from "ele-admin-pro/es/ele-image-upload/types";
import type { ItemType } from "ele-admin-pro/es/ele-image-upload/types";
import { uploadFile } from "@/api/system/file";
import { FILE_SERVER } from "@/config/setting";
import { Project } from "@/api/oa/project/model";
@@ -36,7 +36,7 @@ import { useThemeStore } from '@/store/modules/theme';
import { storeToRefs } from 'pinia';
import { FormInstance } from 'ant-design-vue/es/form';
import useFormData from '@/utils/use-form-data';
import { ItemType } from "ele-admin-pro/es/ele-image-upload/types";
import type { ItemType } from "ele-admin-pro/es/ele-image-upload/types";
import { uploadFile } from "@/api/system/file";
import { FILE_SERVER } from "@/config/setting";
import { listDictionaries } from "@/api/system/dict";
@@ -26,7 +26,7 @@
import { FormInstance } from 'ant-design-vue/es/form';
import useFormData from '@/utils/use-form-data';
import { addSetting, listSetting, updateSetting } from "@/api/system/setting";
import { ItemType } from "ele-admin-pro/es/ele-image-upload/types";
import type { ItemType } from "ele-admin-pro/es/ele-image-upload/types";
import { uploadFile } from "@/api/system/file";
import { FILE_SERVER } from "@/config/setting";
import { Project } from "@/api/oa/project/model";
@@ -87,7 +87,7 @@ import { storeToRefs } from 'pinia';
import { FormInstance } from 'ant-design-vue/es/form';
import useFormData from '@/utils/use-form-data';
import { addSetting, updateSetting } from "@/api/system/setting";
import { ItemType } from "ele-admin-pro/es/ele-image-upload/types";
import type { ItemType } from "ele-admin-pro/es/ele-image-upload/types";
import { uploadFile } from "@/api/system/file";
import { FILE_SERVER } from "@/config/setting";
import {
@@ -143,7 +143,7 @@ import { storeToRefs } from "pinia";
import { FormInstance } from "ant-design-vue/es/form";
import useFormData from "@/utils/use-form-data";
import { addSetting, updateSetting } from "@/api/system/setting";
import { ItemType } from "ele-admin-pro/es/ele-image-upload/types";
import type { ItemType } from "ele-admin-pro/es/ele-image-upload/types";
import { uploadFile } from "@/api/system/file";
import Upload from "@/components/UploadFile/index.vue";
import { FILE_SERVER } from "@/config/setting";
@@ -89,7 +89,7 @@ import { storeToRefs } from 'pinia';
import { FormInstance } from 'ant-design-vue/es/form';
import useFormData from '@/utils/use-form-data';
import { addSetting, updateSetting } from "@/api/system/setting";
import { ItemType } from "ele-admin-pro/es/ele-image-upload/types";
import type { ItemType } from "ele-admin-pro/es/ele-image-upload/types";
import { uploadFile } from "@/api/system/file";
import { FILE_SERVER } from "@/config/setting";
@@ -79,7 +79,7 @@ import { storeToRefs } from 'pinia';
import { FormInstance } from 'ant-design-vue/es/form';
import useFormData from '@/utils/use-form-data';
import { addSetting, updateSetting } from "@/api/system/setting";
import { ItemType } from "ele-admin-pro/es/ele-image-upload/types";
import type { ItemType } from "ele-admin-pro/es/ele-image-upload/types";
import { uploadFile } from "@/api/system/file";
import RoleSelect from './role-select.vue';
import { FILE_SERVER } from "@/config/setting";
+1 -1
View File
@@ -110,7 +110,7 @@ import { storeToRefs } from 'pinia';
import { FormInstance } from 'ant-design-vue/es/form';
import useFormData from '@/utils/use-form-data';
import { addSetting, listSetting, updateSetting } from "@/api/system/setting";
import { ItemType } from "ele-admin-pro/es/ele-image-upload/types";
import type { ItemType } from "ele-admin-pro/es/ele-image-upload/types";
import { uploadFile } from "@/api/system/file";
import { FILE_SERVER } from "@/config/setting";
@@ -166,7 +166,7 @@
import { formatNumber } from 'ele-admin-pro/es';
import { storeToRefs } from 'pinia';
import { Order } from '@/api/order/model';
import { ColumnItem } from 'ele-admin-pro/es/ele-pro-table/types';
import type { ColumnItem } from 'ele-admin-pro/es/ele-pro-table/types';
import { OrderGoods } from '@/api/order/goods/model';
import { listOrderGoods } from '@/api/order/goods';
+1 -1
View File
@@ -268,7 +268,7 @@
import { getMobile } from '@/utils/common';
import request from '@/utils/request';
import { FILE_SERVER } from '@/config/setting';
import { CenterPoint } from 'ele-admin-pro/es/ele-map-picker/types';
import type { CenterPoint } from 'ele-admin-pro/es/ele-map-picker/types';
const useForm = Form.useForm;
@@ -175,7 +175,7 @@
import { formatNumber } from 'ele-admin-pro/es';
import { storeToRefs } from 'pinia';
import { Order } from '@/api/order/model';
import { ColumnItem } from 'ele-admin-pro/es/ele-pro-table/types';
import type { ColumnItem } from 'ele-admin-pro/es/ele-pro-table/types';
import { OrderGoods } from '@/api/order/goods/model';
import { getOrder } from '@/api/order';
import { listOrderGoods } from '@/api/order/goods';
+1 -1
View File
@@ -86,7 +86,7 @@ import zh_Hans from 'bytemd/locales/zh_Hans.json';
import gfm from '@bytemd/plugin-gfm';
//
import zh_HansGfm from '@bytemd/plugin-gfm/locales/zh_Hans.json';
import { ItemType } from "ele-admin-pro/es/ele-image-upload/types";
import type { ItemType } from "ele-admin-pro/es/ele-image-upload/types";
import { UploadOutlined } from '@ant-design/icons-vue';
import { useRouter } from "vue-router";
+1 -1
View File
@@ -135,7 +135,7 @@ import zh_Hans from 'bytemd/locales/zh_Hans.json';
import gfm from '@bytemd/plugin-gfm';
//
import zh_HansGfm from '@bytemd/plugin-gfm/locales/zh_Hans.json';
import { ItemType } from "ele-admin-pro/es/ele-image-upload/types";
import type { ItemType } from "ele-admin-pro/es/ele-image-upload/types";
import { UploadOutlined } from '@ant-design/icons-vue';
const useForm = Form.useForm;
+1 -1
View File
@@ -284,7 +284,7 @@ import { FILE_SERVER } from "@/config/setting";
import { getDictionaryOptions, isImage, openUrl } from "@/utils/common";
import { TaskRecord } from "@/api/oa/task-record/model";
import { App } from "@/api/app/model"
import { ItemType } from "ele-admin-pro/es/ele-image-upload/types";
import type { ItemType } from "ele-admin-pro/es/ele-image-upload/types";
import { addTaskRecord, listTaskRecord, removeTaskRecord } from "@/api/oa/task-record";
import SelectStaff from '@/components/SelectStaff/index.vue';
import { UploadOutlined } from '@ant-design/icons-vue';