@ibiz-template/core 0.7.38-alpha.57 → 0.7.39

package/out/environment/environment.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"environment.d.ts","sourceRoot":"","sources":["../../src/environment/environment.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAE5C;;GAEG;AACH,eAAO,MAAM,WAAW,EAAE,YA2CzB,CAAC"}
+{"version":3,"file":"environment.d.ts","sourceRoot":"","sources":["../../src/environment/environment.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAE5C;;GAEG;AACH,eAAO,MAAM,WAAW,EAAE,YAgDzB,CAAC"}

package/out/environment/environment.js

@@ -45,4 +45,9 @@ export const Environment = {
     appLoadingTheme: 'DEFAULT',
     environmentTag: 'development',
     mobMenuShowMode: 'DEFAULT',
+    devtoolConfig: {
+        studioBaseUrl: 'https://open.ibizlab.cn/modeldesign/#/',
+        v9Mode: false,
+    },
+    enableAI: true,
 };

package/out/interface/i-environment/i-environment.d.ts

@@ -335,5 +335,12 @@ export interface IEnvironment {
      * @type {'DEFAULT'}
      */
     mobMenuShowMode?: 'DEFAULT' | 'ALWAYS';
+    /**
+     * 启用AI支持
+     *
+     * @type {boolean}
+     * @memberof IEnvironment
+     */
+    enableAI: boolean;
 }
 //# sourceMappingURL=i-environment.d.ts.map

package/out/interface/i-environment/i-environment.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i-environment.d.ts","sourceRoot":"","sources":["../../../src/interface/i-environment/i-environment.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"i-environment.d.ts","sourceRoot":"","sources":["../../../src/interface/i-environment/i-environment.ts"],"names":[],"mappings":"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"}

package/out/utils/interceptor/core-interceptor.d.ts

@@ -11,5 +11,15 @@ import { Interceptor } from './interceptor';
  */
 export declare class CoreInterceptor extends Interceptor {
     protected onBeforeRequest(config: InternalAxiosRequestConfig): Promise<InternalAxiosRequestConfig>;
+    /**
+     * 响应失败之后处理
+     *
+     * @author tony001
+     * @date 2025-03-24 14:03:23
+     * @protected
+     * @param {Error} error
+     * @return {*}  {Promise<never>}
+     */
+    protected onResponseError(error: Error): Promise<never>;
 }
 //# sourceMappingURL=core-interceptor.d.ts.map

package/out/utils/interceptor/core-interceptor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"core-interceptor.d.ts","sourceRoot":"","sources":["../../../src/utils/interceptor/core-interceptor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,MAAM,OAAO,CAAC;AAEnD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C;;;;;;;;GAQG;AACH,qBAAa,eAAgB,SAAQ,WAAW;cAC9B,eAAe,CAC7B,MAAM,EAAE,0BAA0B,GACjC,OAAO,CAAC,0BAA0B,CAAC;CA6BvC"}
+{"version":3,"file":"core-interceptor.d.ts","sourceRoot":"","sources":["../../../src/utils/interceptor/core-interceptor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,MAAM,OAAO,CAAC;AAEnD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C;;;;;;;;GAQG;AACH,qBAAa,eAAgB,SAAQ,WAAW;cAC9B,eAAe,CAC7B,MAAM,EAAE,0BAA0B,GACjC,OAAO,CAAC,0BAA0B,CAAC;IA8BtC;;;;;;;;OAQG;cACa,eAAe,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;CAmD9D"}

package/out/utils/interceptor/core-interceptor.js

@@ -32,4 +32,60 @@ export class CoreInterceptor extends Interceptor {
         headers.set('srfsystemid', systemId);
         return config;
     }
+    /**
+     * 响应失败之后处理
+     *
+     * @author tony001
+     * @date 2025-03-24 14:03:23
+     * @protected
+     * @param {Error} error
+     * @return {*}  {Promise<never>}
+     */
+    async onResponseError(error) {
+        const { config, response } = error;
+        if (this.instance &&
+            (response === null || response === void 0 ? void 0 : response.status) === 401 &&
+            config &&
+            !config._retry &&
+            config.url &&
+            // 排除获取系统信息、应用数据、刷新 token 预定义接口
+            (config.url.indexOf('/uaa/getbydcsystem/') === -1 ||
+                config.url.indexOf('/appdata') !== -1 ||
+                config.url.indexOf('/uaa/refresh_token/') !== -1)) {
+            try {
+                // 标记为已重试
+                config._retry = true;
+                // 刷新 token
+                await ibiz.auth.refreshToken();
+                // 重新加载应用数据
+                const res = await ibiz.net.get('/appdata');
+                if (res && res.ok) {
+                    ibiz.appData = res.data;
+                }
+                // 重新发起原始请求
+                const { headers } = config;
+                const token = getToken();
+                if (token) {
+                    headers.set(`${ibiz.env.tokenHeader}Authorization`, `${ibiz.env.tokenPrefix}Bearer ${token}`);
+                }
+                let systemId = ibiz.env.dcSystem;
+                const { orgData } = ibiz;
+                if (orgData) {
+                    if (orgData.systemid) {
+                        systemId = orgData.systemid;
+                    }
+                    if (orgData.orgid) {
+                        headers.set('srforgid', orgData.orgid);
+                    }
+                }
+                headers.set('srfsystemid', systemId);
+                return this.instance(config);
+            }
+            catch (err) {
+                return Promise.reject(error);
+            }
+        }
+        // 处理响应错误
+        return Promise.reject(error);
+    }
 }

package/out/utils/interceptor/interceptor.d.ts

@@ -26,6 +26,15 @@ export declare class Interceptor {
      * @type {number}
      */
     private responseTag?;
+    /**
+     * axios实例
+     *
+     * @author tony001
+     * @date 2025-03-21 19:03:26
+     * @protected
+     * @type {(AxiosInstance | undefined)}
+     */
+    protected instance: AxiosInstance | undefined;
     /**
      * 请求之前处理
      *

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

@@ -1 +1 @@
-{"version":3,"file":"interceptor.d.ts","sourceRoot":"","sources":["../../../src/utils/interceptor/interceptor.ts"],"names":[],"mappings":"AACA,OAAO,EACL,aAAa,EACb,0BAA0B,EAC1B,aAAa,EACd,MAAM,OAAO,CAAC;AAEf;;;;;;;GAOG;AACH,qBAAa,WAAW;IACtB;;;;;;;OAOG;IACH,OAAO,CAAC,UAAU,CAAC,CAAS;IAE5B;;;;;;;OAOG;IACH,OAAO,CAAC,WAAW,CAAC,CAAS;IAE7B;;;;;;;;OAQG;cACa,eAAe,CAC7B,MAAM,EAAE,0BAA0B,GACjC,OAAO,CAAC,0BAA0B,CAAC;IAItC;;;;;;;OAOG;IACH,SAAS,CAAC,cAAc,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IAKtD;;;;;;;;OAQG;cACa,iBAAiB,CAC/B,MAAM,EAAE,aAAa,GACpB,OAAO,CAAC,aAAa,CAAC;IAIzB;;;;;;;OAOG;IACH,SAAS,CAAC,eAAe,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IAKvD;;;;;;OAMG;IACH,GAAG,CAAC,QAAQ,EAAE,aAAa,GAAG,IAAI;IAWlC;;;;;;OAMG;IACH,KAAK,CAAC,QAAQ,EAAE,aAAa,GAAG,IAAI;CAQrC"}
+{"version":3,"file":"interceptor.d.ts","sourceRoot":"","sources":["../../../src/utils/interceptor/interceptor.ts"],"names":[],"mappings":"AACA,OAAO,EACL,aAAa,EACb,0BAA0B,EAC1B,aAAa,EACd,MAAM,OAAO,CAAC;AAEf;;;;;;;GAOG;AACH,qBAAa,WAAW;IACtB;;;;;;;OAOG;IACH,OAAO,CAAC,UAAU,CAAC,CAAS;IAE5B;;;;;;;OAOG;IACH,OAAO,CAAC,WAAW,CAAC,CAAS;IAE7B;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,EAAE,aAAa,GAAG,SAAS,CAAC;IAE9C;;;;;;;;OAQG;cACa,eAAe,CAC7B,MAAM,EAAE,0BAA0B,GACjC,OAAO,CAAC,0BAA0B,CAAC;IAItC;;;;;;;OAOG;IACH,SAAS,CAAC,cAAc,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IAKtD;;;;;;;;OAQG;cACa,iBAAiB,CAC/B,MAAM,EAAE,aAAa,GACpB,OAAO,CAAC,aAAa,CAAC;IAIzB;;;;;;;OAOG;IACH,SAAS,CAAC,eAAe,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IAKvD;;;;;;OAMG;IACH,GAAG,CAAC,QAAQ,EAAE,aAAa,GAAG,IAAI;IAgBlC;;;;;;OAMG;IACH,KAAK,CAAC,QAAQ,EAAE,aAAa,GAAG,IAAI;CAQrC"}

package/out/utils/interceptor/interceptor.js

@@ -63,6 +63,11 @@ export class Interceptor {
      * @param {AxiosInstance} instance
      */
     use(instance) {
+        this.instance = instance;
+        this.onBeforeRequest = this.onBeforeRequest.bind(this);
+        this.onRequestError = this.onRequestError.bind(this);
+        this.onResponseSuccess = this.onResponseSuccess.bind(this);
+        this.onResponseError = this.onResponseError.bind(this);
         this.requestTag = instance.interceptors.request.use(this.onBeforeRequest, this.onRequestError);
         this.responseTag = instance.interceptors.response.use(this.onResponseSuccess, this.onResponseError);
     }

package/out/utils/string-util/string-util.d.ts

@@ -23,23 +23,30 @@ export declare class StringUtil {
      * @static
      */
     static dataReg: RegExp;
+    /**
+     * 参数替换正则
+     *
+     * @static
+     * @memberof StringUtil
+     */
+    static paramsReg: RegExp;
     /**
      * 填充字符串中的数据
      *
      * @description 填充字符串中的数据 用法：传入需要替换的字符串和对象 返回值是string类型
      * @example
      * ```
-     * StringUtil.fill('姓名:${context.name},年龄:${data.age}', { name: '张三', age: 10 }, { name: '李四', age: 25 }); // => '姓名:张三,年龄:25'
-     * StringUtil.fill('', { name: '张三', age: 10 }, { name: '李四', age: 25 }); // => ''
+     * StringUtil.fill('姓名:${context.name},年龄:${data.age}', { name: '张三', age: 10 }, {name: '王二', age: 19}, { name: '李四', age: 25 }); // => '姓名:张三,年龄:25'
+     * StringUtil.fill('', { name: '张三', age: 10 }, {name: '王二', age: 19}, { name: '李四', age: 25 }); // => ''
      * ```
-     * @author chitanda
-     * @date 2021-04-23 20:04:17
      * @static
-     * @param {string} str
-     * @param {*} [context]
-     * @param {*} [data]
+     * @param {string} str 需填充字符串
+     * @param {IContext} [context] 上下文
+     * @param {IParams} [params] 参数
+     * @param {IData} [data] 数据
      * @return {*}  {string}
+     * @memberof StringUtil
      */
-    static fill(str: string, context?: IContext, data?: IData): string;
+    static fill(str: string, context?: IContext, params?: IParams, data?: IData): string;
 }
 //# sourceMappingURL=string-util.d.ts.map

package/out/utils/string-util/string-util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"string-util.d.ts","sourceRoot":"","sources":["../../../src/utils/string-util/string-util.ts"],"names":[],"mappings":"AAEA;;;;;;;GAOG;AACH,qBAAa,UAAU;IACrB;;;;;;OAMG;IACH,MAAM,CAAC,UAAU,SAAgD;IAEjE;;;;;;OAMG;IACH,MAAM,CAAC,OAAO,SAA6C;IAE3D;;;;;;;;;;;;;;;;OAgBG;IACH,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,EAAE,KAAK,GAAG,MAAM;CAmBnE"}
+{"version":3,"file":"string-util.d.ts","sourceRoot":"","sources":["../../../src/utils/string-util/string-util.ts"],"names":[],"mappings":"AAEA;;;;;;;GAOG;AACH,qBAAa,UAAU;IACrB;;;;;;OAMG;IACH,MAAM,CAAC,UAAU,SAAgD;IAEjE;;;;;;OAMG;IACH,MAAM,CAAC,OAAO,SAA6C;IAE3D;;;;;OAKG;IACH,MAAM,CAAC,SAAS,SAA+C;IAE/D;;;;;;;;;;;;;;;;OAgBG;IACH,MAAM,CAAC,IAAI,CACT,GAAG,EAAE,MAAM,EACX,OAAO,CAAC,EAAE,QAAQ,EAClB,MAAM,CAAC,EAAE,OAAO,EAChB,IAAI,CAAC,EAAE,KAAK,GACX,MAAM;CA4BV"}

package/out/utils/string-util/string-util.js

@@ -14,18 +14,18 @@ export class StringUtil {
      * @description 填充字符串中的数据 用法：传入需要替换的字符串和对象 返回值是string类型
      * @example
      * ```
-     * StringUtil.fill('姓名:${context.name},年龄:${data.age}', { name: '张三', age: 10 }, { name: '李四', age: 25 }); // => '姓名:张三,年龄:25'
-     * StringUtil.fill('', { name: '张三', age: 10 }, { name: '李四', age: 25 }); // => ''
+     * StringUtil.fill('姓名:${context.name},年龄:${data.age}', { name: '张三', age: 10 }, {name: '王二', age: 19}, { name: '李四', age: 25 }); // => '姓名:张三,年龄:25'
+     * StringUtil.fill('', { name: '张三', age: 10 }, {name: '王二', age: 19}, { name: '李四', age: 25 }); // => ''
      * ```
-     * @author chitanda
-     * @date 2021-04-23 20:04:17
      * @static
-     * @param {string} str
-     * @param {*} [context]
-     * @param {*} [data]
+     * @param {string} str 需填充字符串
+     * @param {IContext} [context] 上下文
+     * @param {IParams} [params] 参数
+     * @param {IData} [data] 数据
      * @return {*}  {string}
+     * @memberof StringUtil
      */
-    static fill(str, context, data) {
+    static fill(str, context, params, data) {
         if (notNilEmpty(str)) {
             if (notNilEmpty(context)) {
                 const strArr = str.match(this.contextReg);
@@ -34,6 +34,15 @@ export class StringUtil {
                     str = str.replace(`\${context.${key}}`, context[key] || '');
                 });
             }
+            if (notNilEmpty(params)) {
+                const strArr = str.match(this.paramsReg);
+                strArr === null || strArr === void 0 ? void 0 : strArr.forEach(_key => {
+                    const key = _key.slice(8, _key.length - 1);
+                    if (params[key]) {
+                        str = str.replace(`\${params.${key}}`, params[key]);
+                    }
+                });
+            }
             if (notNilEmpty(data)) {
                 const strArr = str.match(this.dataReg);
                 strArr === null || strArr === void 0 ? void 0 : strArr.forEach(_key => {
@@ -61,3 +70,10 @@ StringUtil.contextReg = /\$\{context.[a-zA-Z_$][a-zA-Z0-9_$]{1,}\}/g;
  * @static
  */
 StringUtil.dataReg = /\$\{data.[a-zA-Z_$][a-zA-Z0-9_$]{1,}\}/g;
+/**
+ * 参数替换正则
+ *
+ * @static
+ * @memberof StringUtil
+ */
+StringUtil.paramsReg = /\$\{params.[a-zA-Z_$][a-zA-Z0-9_$]{1,}\}/g;

package/package.json

@@ -1,18 +1,15 @@
 {
   "name": "@ibiz-template/core",
-  "version": "0.7.38-alpha.57",
-  "description": "核心包",
+  "version": "0.7.39",
+  "description": "运行时核心库",
   "type": "module",
   "main": "out/index.js",
   "types": "out/index.d.ts",
   "system": "./dist/system/index.system.js",
-  "repository": {
-    "type": "git",
-    "url": "https://gitee.com/iBizModeling/ibiz-template.git"
-  },
   "files": [
     "dist",
-    "out"
+    "out",
+    "README.md"
   ],
   "scripts": {
     "dev": "tsc --watch",
@@ -31,7 +28,7 @@
     "publish:npm": "npm run build && npm publish --access public --registry=https://registry.npmjs.org/",
     "publish:local": "npm run build && npm publish --access public --registry=http://172.16.240.221:8081/repository/local/"
   },
-  "author": "chitanda",
+  "author": "iBiz",
   "license": "MIT",
   "dependencies": {
     "@microsoft/fetch-event-source": "^2.0.1",
@@ -52,5 +49,6 @@
     "qs": "^6.11.0",
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
-  }
+  },
+  "gitHead": "763fadf3223009ad5ac7bbb63fc03b6c7b0d6905"
 }