@gct-paas/core 0.1.4-dev.0 → 0.1.4-dev.2

package/es/types/index.d.ts

@@ -1,5 +1,6 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import 'systemjs';
+import 'vite/types/import-meta';
 import type { GctGlobal } from '../global';
 
 declare module 'pluralize';
@@ -19,6 +20,10 @@ declare global {
     _gct: GctGlobal;
   }
 
+  interface ImportMetaEnv {
+    VITE_GLOBAL_HOST: string;
+  }
+
   /**
    * 任意参数对象
    *

package/es/utils/index.d.ts

@@ -1,8 +1,7 @@
-export { HttpUtil } from './axios/axios';
 export { DictionaryUtil } from './dictionary/dictionary';
 export { t } from './i18n';
 export { Namespace } from './namespace/namespace';
 export { PluginPgkUtil, type IModuleMap, type LoadPluginResult, } from './plugin-pkg-util/plugin-pkg-util';
 export { PluginStaticResource } from './plugin-static-resource/plugin-static-resource';
-export { deepMerge, getToken, setToken, getPathQuery, getTenant, getTimezone, isMobile, setTenant, } from './tools/tools';
+export { getToken, setToken, getPathQuery, getTenant, getTimezone, isMobile, setTenant, } from './tools/tools';
 export { widthEditorInstall } from './width-install/width-install';

package/es/utils/index.mjs

@@ -1,10 +1,9 @@
-export { HttpUtil } from './axios/axios.mjs';
 export { DictionaryUtil } from './dictionary/dictionary.mjs';
 export { t } from './i18n/index.mjs';
 export { Namespace } from './namespace/namespace.mjs';
 export { PluginPgkUtil } from './plugin-pkg-util/plugin-pkg-util.mjs';
 export { PluginStaticResource } from './plugin-static-resource/plugin-static-resource.mjs';
-export { deepMerge, getPathQuery, getTenant, getTimezone, getToken, isMobile, setTenant, setToken } from './tools/tools.mjs';
+export { getPathQuery, getTenant, getTimezone, getToken, isMobile, setTenant, setToken } from './tools/tools.mjs';
 export { widthEditorInstall } from './width-install/width-install.mjs';
 
 "use strict";

package/es/utils/tools/tools.d.ts

@@ -1,14 +1,3 @@
-/**
- * 递归合并两个对象
- *
- * @export
- * @template T
- * @template U
- * @param {T} target 目标对象，合并后结果存放于此。The target object to merge into.
- * @param {U} source 要合并的源对象。The source object to merge from.
- * @returns {*}  {(T & U)} 合并后的对象。The merged object.
- */
-export declare function deepMerge<T extends object | null | undefined, U extends object | null | undefined>(target: T, source: U): T & U;
 /**
  * 获取认证令牌
  *

package/es/utils/tools/tools.mjs

@@ -1,26 +1,11 @@
-import { mergeWith, cloneDeep, unionWith, isEqual } from 'lodash-es';
 import '../../node_modules/.pnpm/qx-util@0.4.8/node_modules/qx-util/out/index.mjs';
 import '../../constants/index.mjs';
 import '../../enums/index.mjs';
-import { isObject, isArray } from '../../node_modules/.pnpm/qx-util@0.4.8/node_modules/qx-util/out/utils/type-util/type-util.mjs';
 import { getCookie, setCookie, clearCookie } from '../../node_modules/.pnpm/qx-util@0.4.8/node_modules/qx-util/out/utils/util/util.mjs';
 import { CoreConst } from '../../constants/core.mjs';
 import { TIMEZONE_KEY } from '../../enums/cacheEnum.mjs';
 
 "use strict";
-function deepMerge(target, source) {
-  return mergeWith(cloneDeep(target), source, (objValue, srcValue) => {
-    if (isObject(objValue) && isObject(srcValue)) {
-      return mergeWith(
-        cloneDeep(objValue),
-        srcValue,
-        (prevValue, nextValue) => {
-          return isArray(prevValue) ? unionWith(prevValue, nextValue, isEqual) : void 0;
-        }
-      );
-    }
-  });
-}
 function getToken() {
   return getCookie(CoreConst.TOKEN);
 }
@@ -59,4 +44,4 @@ function getTimezone() {
   return localStorage.getItem(TIMEZONE_KEY) || "UTC+08:00";
 }
 
-export { deepMerge, getPathQuery, getTenant, getTimezone, getToken, isMobile, setTenant, setToken };
+export { getPathQuery, getTenant, getTimezone, getToken, isMobile, setTenant, setToken };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gct-paas/core",
-  "version": "0.1.4-dev.0",
+  "version": "0.1.4-dev.2",
   "type": "module",
   "description": "paas 平台核心包",
   "main": "dist/index.min.cjs",
@@ -34,7 +34,9 @@
     "dev": "rollup -c -w --environment=NODE_ENV:development",
     "build": "npm run lint && rollup -c --environment=NODE_ENV:production && vite build --mode production --config vite.config.ts",
     "lint": "eslint src/",
-    "link2global": "pnpm link --global",
+    "test": "vitest",
+    "test:run": "vitest run",
+    "test:coverage": "vitest run --coverage",
     "publish:next": "npm run build && npm publish --access public --tag=next --registry=https://registry.npmjs.org/",
     "publish:dev": "npm run build && npm publish --access public --tag=dev --registry=https://registry.npmjs.org/",
     "publish:alpha": "npm run build && npm publish --access public --tag=alpha --registry=https://registry.npmjs.org/",
@@ -45,26 +47,44 @@
     "gen-api:platform": "gct-paas gen-api --url=http://paas.paasdev.gct-paas.com --tag=platform -t ../cli/hbs-temp -o ./src/service/gct-platform && prettier './src/service/gct-platform' --write"
   },
   "dependencies": {
+    "@gct-paas/api-apaas": "0.0.2-dev.2",
+    "@gct-paas/api-platform": "0.0.2-dev.2",
+    "@gct-paas/base": "0.1.4-dev.2",
+    "@vueuse/core": "^13.7.0",
     "async-validator": "^4.2.5",
-    "axios": "^1.8.1",
+    "axios": "^1.11.0",
+    "dayjs": "^1.11.13",
     "lodash-es": "^4.17.21",
     "path-browserify": "^1.0.1",
-    "pinia": "^2.3.1",
-    "qs": "^6.14.0",
+    "pinia": "^3.0.3",
     "qx-util": "^0.4.8",
     "systemjs": "^6.15.1",
-    "vue": "^3.5.13",
-    "vue-i18n": "9.6.5"
+    "vue": "^3.5.18",
+    "vue-i18n": "11.1.11",
+    "vue-router": "^4.5.1"
   },
   "devDependencies": {
-    "@gct-paas/build": "0.1.4-dev.0",
-    "@gct-paas/cli": "0.1.4-dev.0",
+    "@gct-paas/build": "0.1.4-dev.2",
+    "@gct-paas/cli": "0.1.4-dev.2",
+    "@types/lodash-es": "^4.17.12",
     "@types/path-browserify": "^1.0.3",
-    "@types/qs": "^6.9.18",
-    "fs-extra": "^11.3.0"
+    "@types/qs": "^6.14.0",
+    "@vitejs/plugin-vue": "^6.0.1",
+    "@vitejs/plugin-vue-jsx": "^5.0.1",
+    "@vitest/browser": "^3.2.4",
+    "@vitest/coverage-istanbul": "^3.2.4",
+    "@vitest/coverage-v8": "^3.2.4",
+    "@vitest/ui": "^3.2.4",
+    "@vue/test-utils": "^2.4.6",
+    "fs-extra": "^11.3.1",
+    "playwright": "^1.54.2",
+    "vite": "^7.1.3",
+    "vitest": "^3.2.4"
   },
   "peerDependencies": {
+    "@gct-paas/api-apaas": "*",
+    "@gct-paas/api-platform": "*",
     "vue": "^3.x"
   },
-  "gitHead": "c9621d762856690ccbe36c93a3cf50dd1060602a"
+  "gitHead": "d837ea9836db8bae169908326208cc031b2e9eac"
 }

package/es/service/base.service.d.ts

@@ -1,19 +0,0 @@
-import { HttpUtil } from '../utils';
-import { IHttpResponse } from '../interface';
-/**
- * 服务基类
- *
- * @export
- * @class BaseService
- */
-export declare class BaseService {
-    readonly http: HttpUtil;
-    constructor(url: string);
-    protected _put(method: string, data: IObject | null, query: IParams | null, config: IParams): Promise<IHttpResponse>;
-    protected _get(method: string, data: IObject | null, query: IParams | null, config: IParams): Promise<IHttpResponse>;
-    protected _delete(method: string, data: IObject | null, query: IParams | null, config: IParams): Promise<IHttpResponse>;
-    protected _post(method: string, data: IObject | null, query: IParams | null, config: IParams): Promise<IHttpResponse>;
-    protected _options(method: string, data: IObject | null, query: IParams | null, config: IParams): Promise<IHttpResponse>;
-    protected _patch(method: string, data: IObject | null, query: IParams | null, config: IParams): Promise<IHttpResponse>;
-    protected _head(method: string, data: IObject | null, query: IParams | null, config: IParams): Promise<IHttpResponse>;
-}

package/es/service/base.service.mjs

@@ -1,41 +0,0 @@
-import path from '../_virtual/index.mjs';
-import '../utils/index.mjs';
-import { HttpUtil } from '../utils/axios/axios.mjs';
-
-"use strict";
-class BaseService {
-  http;
-  constructor(url) {
-    this.http = new HttpUtil({
-      baseURL: url
-    });
-  }
-  _put(method, data, query, config) {
-    return this.http.put(
-      query?.id ? path.join(method, query?.id) : method,
-      data || {},
-      query || {},
-      config
-    );
-  }
-  _get(method, data, query, config) {
-    return this.http.get(method, data || {}, query || {}, config);
-  }
-  _delete(method, data, query, config) {
-    return this.http.delete(method, data || {}, query || {}, config);
-  }
-  _post(method, data, query, config) {
-    return this.http.post(method, data || {}, query || {}, config);
-  }
-  _options(method, data, query, config) {
-    return this.http.options(method, data || {}, query || {}, config);
-  }
-  _patch(method, data, query, config) {
-    return this.http.patch(method, data || {}, query || {}, config);
-  }
-  _head(method, data, query, config) {
-    return this.http.head(method, data || {}, query || {}, config);
-  }
-}
-
-export { BaseService };

package/es/service/index.d.ts

@@ -1 +0,0 @@
-export { BaseService } from './base.service';

package/es/utils/axios/axios.d.ts

@@ -1,27 +0,0 @@
-import { AxiosInstance, AxiosRequestConfig, CreateAxiosDefaults } from 'axios';
-import { IHttpResponse } from '../../interface';
-/**
- * 全局请求工具
- *
- * @export
- * @class HttpUtil
- */
-export declare class HttpUtil {
-    protected _options: CreateAxiosDefaults;
-    readonly instance: AxiosInstance;
-    constructor(_options?: CreateAxiosDefaults);
-    /**
-     * 挂载中间件
-     *
-     * @param {(_axios: AxiosInstance) => void} fn
-     */
-    use(fn: (_axios: AxiosInstance) => void): void;
-    get<T = any>(url: string, data?: IObject, query?: IParams, config?: AxiosRequestConfig): Promise<IHttpResponse<T>>;
-    post<T = any>(url: string, data?: IObject, query?: IParams, config?: AxiosRequestConfig): Promise<IHttpResponse<T>>;
-    put<T = any>(url: string, data?: IObject, query?: IParams, config?: AxiosRequestConfig): Promise<IHttpResponse<T>>;
-    delete<T = any>(url: string, data?: IObject, query?: IParams, config?: AxiosRequestConfig): Promise<IHttpResponse<T>>;
-    options<T = any>(url: string, data?: IObject, query?: IParams, config?: AxiosRequestConfig): Promise<IHttpResponse<T>>;
-    patch<T = any>(url: string, data?: IObject, query?: IParams, config?: AxiosRequestConfig): Promise<IHttpResponse<T>>;
-    head<T = any>(url: string, data?: IObject, query?: IParams, config?: AxiosRequestConfig): Promise<IHttpResponse<T>>;
-    request<T = any>(url: string, data: IObject | null, query: IParams | null, config?: AxiosRequestConfig): Promise<IHttpResponse<T>>;
-}