@ibiz-template/core 0.0.1-alpha.1 → 0.0.1-alpha.2

package/out/utils/net/http-response.js

@@ -0,0 +1,53 @@
+/**
+ * 本地请求仿造响应
+ *
+ * @author chitanda
+ * @date 2022-08-21 17:08:00
+ * @export
+ * @class HttpResponse
+ * @implements {IHttpResponse<T>}
+ * @template T
+ */
+export class HttpResponse {
+    /**
+     * Creates an instance of HttpResponse.
+     *
+     * @author chitanda
+     * @date 2022-08-18 15:08:11
+     * @param {unknown} [data] 返回的数据
+     * @param {number} [status] 状态码 (默认为 200)
+     * @param {string} [statusText] 状态描述 (默认为空字符)
+     */
+    constructor(data, status, statusText) {
+        /**
+         * 本地仿造响应
+         *
+         * @author chitanda
+         * @date 2022-08-18 15:08:06
+         */
+        this.local = true;
+        this.ok = false;
+        /**
+         * header 本地仿造时值为空
+         *
+         * @author chitanda
+         * @date 2022-08-18 15:08:46
+         * @type {AxiosResponseHeaders}
+         */
+        this.headers = {};
+        /**
+         * AxiosResponse 本地仿造时值为空
+         *
+         * @author chitanda
+         * @date 2022-08-18 15:08:22
+         * @type {AxiosRequestConfig<IData>}
+         */
+        this.config = {};
+        this.data = data;
+        this.status = status || 200;
+        this.statusText = statusText || '';
+        if (this.status >= 200 && this.status < 300) {
+            this.ok = true;
+        }
+    }
+}

package/out/utils/net/net.d.ts

@@ -1,24 +1,5 @@
-import { AxiosRequestHeaders, AxiosResponse } from 'axios';
-/**
- * 返回值扩展
- *
- * @author chitanda
- * @date 2022-07-14 16:07:50
- * @export
- * @interface NetResponse
- * @extends {AxiosResponse}
- */
-export interface NetResponse extends AxiosResponse {
-    /**
-     * 是否请求成功
-     *
-     * @description 当状态码为 200-299 时认为成功
-     * @author chitanda
-     * @date 2022-07-14 16:07:59
-     * @type {boolean}
-     */
-    ok: boolean;
-}
+import { AxiosRequestHeaders } from 'axios';
+import { IHttpResponse } from './http-response';
 /**
  * 全局请求工具类
  *
@@ -36,7 +17,8 @@ export declare class Net {
      * @protected
      * @type {string}
      */
-    protected prefix: string;
+    protected _prefix: string;
+    get prefix(): string;
     /**
      * Creates an instance of Net.
      *
@@ -52,9 +34,9 @@ export declare class Net {
      * @date 2022-07-14 15:07:01
      * @param {string} url
      * @param {IParams} [params={}]
-     * @return {*}  {Promise<NetResponse>}
+     * @return {*}  {Promise<IHttpResponse>}
      */
-    post(url: string, data: IData, params?: IParams, headers?: AxiosRequestHeaders): Promise<NetResponse>;
+    post(url: string, data: IData, params?: IParams, headers?: AxiosRequestHeaders): Promise<IHttpResponse>;
     /**
      * Get 请求
      *
@@ -62,9 +44,9 @@ export declare class Net {
      * @date 2022-07-14 15:07:08
      * @param {string} url
      * @param {IParams} [params={}]
-     * @return {*}  {Promise<NetResponse>}
+     * @return {*}  {Promise<IHttpResponse>}
      */
-    get(url: string, params?: IParams, headers?: AxiosRequestHeaders): Promise<NetResponse>;
+    get(url: string, params?: IParams, headers?: AxiosRequestHeaders, option?: IParams): Promise<IHttpResponse>;
     /**
      * Delete 请求
      *
@@ -72,19 +54,19 @@ export declare class Net {
      * @date 2022-07-14 15:07:43
      * @param {string} url
      * @param {IParams} [params]
-     * @return {*}  {Promise<NetResponse>}
+     * @return {*}  {Promise<IHttpResponse>}
      */
-    delete(url: string, params?: IParams, headers?: AxiosRequestHeaders): Promise<NetResponse>;
+    delete(url: string, params?: IParams, headers?: AxiosRequestHeaders): Promise<IHttpResponse>;
     /**
      * Put 请求
      *
      * @author chitanda
      * @date 2022-07-14 15:07:49
      * @param {string} url
-     * @param {IParams} params
-     * @return {*}  {Promise<NetResponse>}
+     * @param {IData} data
+     * @return {*}  {Promise<IHttpResponse>}
      */
-    put(url: string, params: IParams, headers?: AxiosRequestHeaders): Promise<NetResponse>;
+    put(url: string, data: IData, headers?: AxiosRequestHeaders): Promise<IHttpResponse>;
     /**
      * 获取模型数据
      *
@@ -92,9 +74,9 @@ export declare class Net {
      * @date 2022-07-14 15:07:15
      * @param {string} url
      * @param {AxiosRequestHeaders} [headers={}]
-     * @return {*}  {Promise<NetResponse>}
+     * @return {*}  {Promise<IHttpResponse>}
      */
-    getModel(url: string, headers?: AxiosRequestHeaders): Promise<NetResponse>;
+    getModel(url: string, headers?: AxiosRequestHeaders): Promise<IHttpResponse>;
     /**
      * 统一处理请求返回
      *
@@ -102,7 +84,7 @@ export declare class Net {
      * @date 2022-07-14 16:07:23
      * @private
      * @param {AxiosResponse} response
-     * @return {*}  {NetResponse}
+     * @return {*}  {IHttpResponse}
      */
     private doResponseResult;
     /**

package/out/utils/net/net.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"net.d.ts","sourceRoot":"","sources":["../../../src/utils/net/net.ts"],"names":[],"mappings":"AAAA,OAAc,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAIlE;;;;;;;;GAQG;AACH,MAAM,WAAW,WAAY,SAAQ,aAAa;IAChD;;;;;;;OAOG;IACH,EAAE,EAAE,OAAO,CAAC;CACb;AAED;;;;;;;GAOG;AACH,qBAAa,GAAG;IACd;;;;;;;OAOG;IACH,SAAS,CAAC,MAAM,EAAE,MAAM,CAAM;IAE9B;;;;;;OAMG;gBACS,MAAM,CAAC,EAAE,MAAM;IAM3B;;;;;;;;OAQG;IACG,IAAI,CACR,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,KAAK,EACX,MAAM,GAAE,OAAY,EACpB,OAAO,GAAE,mBAAwB,GAChC,OAAO,CAAC,WAAW,CAAC;IAevB;;;;;;;;OAQG;IACG,GAAG,CACP,GAAG,EAAE,MAAM,EACX,MAAM,GAAE,OAAY,EACpB,OAAO,GAAE,mBAAwB,GAChC,OAAO,CAAC,WAAW,CAAC;IAUvB;;;;;;;;OAQG;IACG,MAAM,CACV,GAAG,EAAE,MAAM,EACX,MAAM,CAAC,EAAE,OAAO,EAChB,OAAO,GAAE,mBAAwB,GAChC,OAAO,CAAC,WAAW,CAAC;IAMvB;;;;;;;;OAQG;IACG,GAAG,CACP,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,OAAO,EACf,OAAO,GAAE,mBAAwB,GAChC,OAAO,CAAC,WAAW,CAAC;IAMvB;;;;;;;;OAQG;IACG,QAAQ,CACZ,GAAG,EAAE,MAAM,EACX,OAAO,GAAE,mBAAwB,GAChC,OAAO,CAAC,WAAW,CAAC;IAOvB;;;;;;;;OAQG;IACH,OAAO,CAAC,gBAAgB;IAQxB;;;;;;;;;OASG;IACH,OAAO,CAAC,oBAAoB;IAc5B;;;;;;;;;OASG;IACH,OAAO,CAAC,cAAc;IAiBtB;;;;;;;;OAQG;IACH,OAAO,CAAC,SAAS;CAGlB"}
+{"version":3,"file":"net.d.ts","sourceRoot":"","sources":["../../../src/utils/net/net.ts"],"names":[],"mappings":"AAAA,OAAc,EAAE,mBAAmB,EAAiB,MAAM,OAAO,CAAC;AAGlE,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD;;;;;;;GAOG;AACH,qBAAa,GAAG;IACd;;;;;;;OAOG;IACH,SAAS,CAAC,OAAO,EAAE,MAAM,CAAM;IAE/B,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED;;;;;;OAMG;gBACS,MAAM,CAAC,EAAE,MAAM;IAM3B;;;;;;;;OAQG;IACG,IAAI,CACR,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,KAAK,EACX,MAAM,GAAE,OAAY,EACpB,OAAO,GAAE,mBAAwB,GAChC,OAAO,CAAC,aAAa,CAAC;IAezB;;;;;;;;OAQG;IACG,GAAG,CACP,GAAG,EAAE,MAAM,EACX,MAAM,GAAE,OAAY,EACpB,OAAO,GAAE,mBAAwB,EACjC,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC;IAUzB;;;;;;;;OAQG;IACG,MAAM,CACV,GAAG,EAAE,MAAM,EACX,MAAM,CAAC,EAAE,OAAO,EAChB,OAAO,GAAE,mBAAwB,GAChC,OAAO,CAAC,aAAa,CAAC;IAMzB;;;;;;;;OAQG;IACG,GAAG,CACP,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,KAAK,EACX,OAAO,GAAE,mBAAwB,GAChC,OAAO,CAAC,aAAa,CAAC;IAMzB;;;;;;;;OAQG;IACG,QAAQ,CACZ,GAAG,EAAE,MAAM,EACX,OAAO,GAAE,mBAAwB,GAChC,OAAO,CAAC,aAAa,CAAC;IAOzB;;;;;;;;OAQG;IACH,OAAO,CAAC,gBAAgB;IAQxB;;;;;;;;;OASG;IACH,OAAO,CAAC,oBAAoB;IAc5B;;;;;;;;;OASG;IACH,OAAO,CAAC,cAAc;IAiBtB;;;;;;;;OAQG;IACH,OAAO,CAAC,SAAS;CAGlB"}

package/out/utils/net/net.js

@@ -26,11 +26,14 @@ export class Net {
          * @protected
          * @type {string}
          */
-        this.prefix = '';
+        this._prefix = '';
         if (prefix) {
-            this.prefix = prefix;
+            this._prefix = prefix;
         }
     }
+    get prefix() {
+        return this._prefix || ibiz.env.baseUrl;
+    }
     /**
      * Post 请求
      *
@@ -38,7 +41,7 @@ export class Net {
      * @date 2022-07-14 15:07:01
      * @param {string} url
      * @param {IParams} [params={}]
-     * @return {*}  {Promise<NetResponse>}
+     * @return {*}  {Promise<IHttpResponse>}
      */
     async post(url, data, params = {}, headers = {}) {
         url = this.handleAppPresetParam(url, params);
@@ -57,15 +60,15 @@ export class Net {
      * @date 2022-07-14 15:07:08
      * @param {string} url
      * @param {IParams} [params={}]
-     * @return {*}  {Promise<NetResponse>}
+     * @return {*}  {Promise<IHttpResponse>}
      */
-    async get(url, params = {}, headers = {}) {
+    async get(url, params = {}, headers = {}, option = {}) {
         // if (params.srfparentdata) {
         //   Object.assign(params, params.srfparentdata);
         //   delete params.srfparentdata;
         // }
         url = this.attachUrlParam(url, params);
-        const response = await axios.get(url, { headers });
+        const response = await axios.get(url, Object.assign({ headers }, option));
         return this.doResponseResult(response);
     }
     /**
@@ -75,7 +78,7 @@ export class Net {
      * @date 2022-07-14 15:07:43
      * @param {string} url
      * @param {IParams} [params]
-     * @return {*}  {Promise<NetResponse>}
+     * @return {*}  {Promise<IHttpResponse>}
      */
     async delete(url, params, headers = {}) {
         url = this.handleAppPresetParam(url, params);
@@ -88,12 +91,12 @@ export class Net {
      * @author chitanda
      * @date 2022-07-14 15:07:49
      * @param {string} url
-     * @param {IParams} params
-     * @return {*}  {Promise<NetResponse>}
+     * @param {IData} data
+     * @return {*}  {Promise<IHttpResponse>}
      */
-    async put(url, params, headers = {}) {
-        url = this.handleAppPresetParam(url, params);
-        const response = await axios.put(url, params, { headers });
+    async put(url, data, headers = {}) {
+        url = this.handleAppPresetParam(url, data);
+        const response = await axios.put(url, data, { headers });
         return this.doResponseResult(response);
     }
     /**
@@ -103,7 +106,7 @@ export class Net {
      * @date 2022-07-14 15:07:15
      * @param {string} url
      * @param {AxiosRequestHeaders} [headers={}]
-     * @return {*}  {Promise<NetResponse>}
+     * @return {*}  {Promise<IHttpResponse>}
      */
     async getModel(url, headers = {}) {
         const response = await axios.get(url, {
@@ -118,7 +121,7 @@ export class Net {
      * @date 2022-07-14 16:07:23
      * @private
      * @param {AxiosResponse} response
-     * @return {*}  {NetResponse}
+     * @return {*}  {IHttpResponse}
      */
     doResponseResult(response) {
         const res = response;

package/out/utils/plural/plural.d.ts

@@ -0,0 +1,21 @@
+/**
+ * 英文转复数写法
+ *
+ * @author chitanda
+ * @date 2022-08-25 18:08:41
+ * @export
+ * @param {string} key
+ * @return {*}  {string}
+ */
+export declare function plural(key: string): string;
+/**
+ * 英文转复数写法并转全小写
+ *
+ * @author chitanda
+ * @date 2022-08-25 18:08:23
+ * @export
+ * @param {string} key
+ * @return {*}  {string}
+ */
+export declare function pluralLower(key: string): string;
+//# sourceMappingURL=plural.d.ts.map

package/out/utils/plural/plural.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"plural.d.ts","sourceRoot":"","sources":["../../../src/utils/plural/plural.ts"],"names":[],"mappings":"AAEA;;;;;;;;GAQG;AACH,wBAAgB,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE1C;AAED;;;;;;;;GAQG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE/C"}

package/out/utils/plural/plural.js

@@ -0,0 +1,25 @@
+import * as pluralize from 'pluralize';
+/**
+ * 英文转复数写法
+ *
+ * @author chitanda
+ * @date 2022-08-25 18:08:41
+ * @export
+ * @param {string} key
+ * @return {*}  {string}
+ */
+export function plural(key) {
+    return pluralize(key);
+}
+/**
+ * 英文转复数写法并转全小写
+ *
+ * @author chitanda
+ * @date 2022-08-25 18:08:23
+ * @export
+ * @param {string} key
+ * @return {*}  {string}
+ */
+export function pluralLower(key) {
+    return plural(key).toLowerCase();
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/core",
-  "version": "0.0.1-alpha.1",
+  "version": "0.0.1-alpha.2",
   "description": "核心包",
   "main": "out/index.js",
   "types": "out/index.d.ts",
@@ -11,23 +11,27 @@
   "scripts": {
     "dev": "tsc --watch",
     "build": "npm run lint && npm run clean && tsc --build",
-    "lint": "eslint src/**/*.ts",
-    "lint:fix": "eslint --fix src/**/*.ts",
+    "lint": "eslint 'src/**/*.ts'",
+    "lint:fix": "eslint --fix 'src/**/*.ts'",
     "clean": "rimraf out",
+    "test": "jest",
     "publish:next": "npm run build && npm publish --access public --tag next",
     "publish:npm": "npm run build && npm publish --access public"
   },
   "author": "chitanda",
   "license": "MIT",
   "dependencies": {
-    "@ibiz-template/command": "^0.0.1-alpha.1",
-    "@ibiz-template/model": "^0.0.1-alpha.1",
     "axios": "^0.27.2",
-    "qs": "^6.11.0",
-    "qx-util": "^0.1.2"
+    "pluralize": "^8.0.0",
+    "qs": "^6.11.0"
   },
   "devDependencies": {
-    "@types/qs": "^6.9.7"
+    "@types/pluralize": "^0.0.29",
+    "@types/qs": "^6.9.7",
+    "qx-util": "^0.4.0"
   },
-  "gitHead": "4ea59555405794d91b25e807a92bbefa080108fb"
+  "peerDependencies": {
+    "qx-util": "^0.4.0"
+  },
+  "gitHead": "03023d73d45b9dc3b6156e996c196ce6705d31cd"
 }

package/src/context/index.ts

@@ -17,14 +17,14 @@ export class IBizContextProxyHandle implements ProxyHandler<IBizContext> {
   }
 
   get(target: IBizContext, p: string | symbol, _receiver: unknown): unknown {
-    if (target[p]) {
+    if (target[p] !== undefined) {
       return target[p];
     }
-    if (target.context[p]) {
+    if (target.context[p] !== undefined) {
       return target.context[p];
     }
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    if ((target as any)._parent) {
+    if ((target as any)._parent && (target as any)._parent[p] !== undefined) {
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       return (target as any)._parent[p];
     }

package/src/environment/environment.ts

@@ -4,5 +4,9 @@ import { IEnvironment } from '../interface';
  * 环境变量
  */
 export const Environment: IEnvironment = {
-  baseUrl: '/trainsys__web',
+  baseUrl: '',
+  assetsUrl: '/assets/',
+  dcSystem: '',
+  ExportFile: '/ibizutil/download',
+  UploadFile: '/ibizutil/upload',
 };

package/src/ibizsys.ts

@@ -1,4 +1,3 @@
-import { commands } from '@ibiz-template/command';
 import { Environment } from './environment/environment';
 import { OrgData } from './interface';
 import { Net } from './utils';
@@ -20,14 +19,6 @@ export class IBizSys {
    */
   env = Environment;
 
-  /**
-   * 指令控制器
-   *
-   * @author chitanda
-   * @date 2022-07-21 17:07:45
-   */
-  commands = commands;
-
   /**
    * 网络请求工具类
    *
@@ -35,7 +26,7 @@ export class IBizSys {
    * @date 2022-07-19 17:07:56
    * @type {Net}
    */
-  net: Net = new Net(this.env.baseUrl);
+  net: Net = new Net();
 
   /**
    * sass 模式下的中心系统标识

package/src/index.ts

@@ -1,7 +1,5 @@
 import './types';
 
-export { commands } from '@ibiz-template/command';
-
 export * from './constant';
 export { IBizContext, IBizContextProxyHandle } from './context';
 export { Environment } from './environment/environment';

package/src/install.ts

@@ -9,8 +9,9 @@ import { Interceptor } from './utils';
  * @export
  */
 export function install(): void {
-  if (!window.ibiz) {
-    window.ibiz = new IBizSys();
+  if (window.ibiz) {
+    throw new Error('ibiz 已经存在, 无需重复安装');
   }
+  window.ibiz = new IBizSys();
   new Interceptor();
 }

package/src/interface/i-environment/i-environment.ts

@@ -7,8 +7,15 @@
  * @interface IEnvironment
  */
 export interface IEnvironment {
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  [key: string | symbol]: any;
+  /**
+   * 命名空间
+   *
+   * @author chitanda
+   * @date 2022-09-06 11:09:32
+   * @type {string}
+   */
+  namespace?: string;
+
   /**
    * 请求根路径
    *
@@ -17,4 +24,40 @@ export interface IEnvironment {
    * @type {string}
    */
   baseUrl: string;
+
+  /**
+   * 资源文件根路径
+   *
+   * @author lxm
+   * @date 2022-08-25 14:08:08
+   * @type {string}
+   */
+  assetsUrl: string;
+
+  /**
+   * 中心系统标识
+   *
+   * @author chitanda
+   * @date 2022-08-22 23:08:46
+   * @type {string}
+   */
+  dcSystem: string;
+
+  /**
+   * 文件导出
+   *
+   * @author chitanda
+   * @date 2022-08-22 23:08:46
+   * @type {string}
+   */
+  ExportFile: string;
+
+  /**
+   * 文件上传
+   *
+   * @author chitanda
+   * @date 2022-08-22 23:08:46
+   * @type {string}
+   */
+  UploadFile: string;
 }

package/src/utils/index.ts

@@ -1,3 +1,6 @@
 export { Interceptor } from './interceptor/interceptor';
-export { Net, NetResponse } from './net/net';
-export { getToken } from './util/util';
+export { Namespace } from './namespace/namespace';
+export { IHttpResponse, HttpResponse } from './net/http-response';
+export { Net } from './net/net';
+export { plural, pluralLower } from './plural/plural';
+export * from './util/util';