halo-fe 1.0.9 → 1.0.10

package/esm/factorying/IFactory.d.ts

@@ -4,17 +4,17 @@ import { Ref } from "../plugins";
  */
 interface IFactory<T> {
     /**
-     * 开启工厂
+     * 当前驱动所有实例
      */
-    open(): void;
+    get instances(): T[];
     /**
-     * 获取当前驱动所有实例
+     * 开启工厂
      */
-    getInstances(): T[];
+    open(): void;
     /**
      * 创建指定类型的实例
      */
-    create(type: string, conn?: string): Promise<T>;
+    create(type: string): Promise<T>;
     /**
      * 根据主键创建驱动，并返回加载后的驱动信息
      */
@@ -22,6 +22,6 @@ interface IFactory<T> {
     /**
      * 从缓存中获取指定名称的驱动，不存在则创建并执行初始化
      */
-    createIfAbsent(name: string, type: string, open?: (entity: T) => void): Promise<T>;
+    createIfAbsent(name: string, type: string, open?: (entity: T) => Promise<void>): Promise<T>;
 }
 export default IFactory;

package/esm/factorying/index.d.ts

@@ -1,9 +1,14 @@
 import Factories from "./Factories";
-import { IEncoder, IHasher, IHttp, IProvider } from "../drivers";
+import { ICdn, IEncoder, IHasher, IHttp, IMessenger, IProvider } from "../drivers";
+import { CreateFeOptions } from "../types";
 /**
  * 默认base64编码
  */
 declare let base64: IEncoder;
+/**
+ * CDN加载器
+ */
+declare let cdn: ICdn;
 /**
  * 默认Http请求对象
  */
@@ -16,8 +21,12 @@ declare let md5: IHasher;
  * 默认Storage
  */
 declare let storage: IProvider;
+/**
+ * 初始化消息对象，保证后续更新能够被同步更新
+ */
+declare let messenger: IMessenger;
 /**
  * 初始化默认驱动实例
  */
-declare let initDriver: () => Promise<void>;
-export { base64, http, md5, storage, initDriver, Factories };
+declare let initDriver: (options: CreateFeOptions) => Promise<void>;
+export { base64, cdn, http, md5, storage, messenger, initDriver, Factories };

package/esm/helpers/DictionaryHelper.d.ts

@@ -5,7 +5,9 @@ declare class DictionaryHelper {
     /**
      * 从指定字典中提取忽略大小写的key的值
      */
-    static getValueIgnoreCase(key: string, value: object): string;
+    static getValueIgnoreCase<T>(key: string, value: {
+        [key: string]: T;
+    }): T;
     /**
      * 对字典进行排序，并得到新字典
      */

package/esm/helpers/DomHelper.d.ts

@@ -22,7 +22,7 @@ declare class DomHelper {
     /**
      * 根据计算后的样式进行DOM过滤
      */
-    static filterStyle(doms: any[], fun: (style: CSSStyleDeclaration) => boolean): any[];
+    static filterStyle(doms: HTMLElement[], fn: (style: CSSStyleDeclaration) => boolean): HTMLElement[];
     /**
      * 添加样式
      */
@@ -34,11 +34,11 @@ declare class DomHelper {
     /**
      * 查找指定父节点
      */
-    static parentUntil(dom: any, cls: string): any;
+    static parentUntil(dom: HTMLElement, cls: string): HTMLElement;
     /**
      * 查找第一个绝对定位的元素或backdrop元素，否则使用html元素
      */
-    static parentAbsolute(dom: any): any;
+    static parentAbsolute(dom: HTMLElement): HTMLElement;
     /**
      * 查找孩子节点
      */
@@ -83,6 +83,27 @@ declare class DomHelper {
      * 不存在时创建dom，并自动追加到文档
      */
     static createIfAbsent(name: string, cls: string, html?: string): HTMLElement;
+    /**
+     * 根据路径获取标签（无src）
+     */
+    static createEmptyByUrl: (url: string) => HTMLElement;
+    /**
+     * 根据路径获取待加载的元素，同时包含Url
+     */
+    static createByUrl: (url: string) => HTMLElement;
+    /**
+     * 根据路径获取元素
+     * VIP：已废弃，不能用改方法判断资源是否加载完毕，因为可能只是脚本创建，资源还未加载完毕
+     */
+    static getByUrl: (url: string) => HTMLElement;
+    /**
+     * 获取行内标签，如: style（非link）
+     */
+    static getInlineTagByUrl(url: string): string;
+    /**
+     * 获取资源标签，如: link
+     */
+    static getTagByUrl(url: string): string;
     /**
      * 获取文本宽度
      */

package/esm/helpers/JsonHelper.d.ts

@@ -1,24 +1,20 @@
-import { TreeNodeProp } from "./types";
+import { JsonConfig, TreeNodeProp } from "./types";
 /**
  * JSON帮助类
  */
 declare class JsonHelper {
-    /**
-     * 把字符串格式化为Json字符串
-     */
-    static stringify(value: any): string;
     /**
      * 对非字符串进行序列化
      */
-    static stringifyWithString(value: any): string;
+    static serializeWithoutString(value: any): string;
     /**
-     * 把字符串格式化为Json字符串
+     * 把对象格式化为Json字符串
      */
-    static stringifyString(value: string): string;
+    static serialize(value: any, config?: boolean | JsonConfig): string;
     /**
      * 反序列化成json对象
      */
-    static parse(value: string): any;
+    static deserialize(value: string): any;
     /**
      * 根据props中的.自动分割得到属性值
      */
@@ -30,6 +26,18 @@ declare class JsonHelper {
     /**
      * 从树集合构建出Json对象
      */
-    static buildObject(tree: any[], childProp: string, fun: (node: any) => TreeNodeProp): string;
+    static buildObject(tree: any[], childProp: string, fn: (node: any) => TreeNodeProp): string;
+    /**
+     * 从开始层级开始构建Json字符串
+     */
+    private static buildObjectLevel;
+    /**
+     * 填充指定长度的字符串
+     */
+    private static fillSpace;
+    /**
+     * 填充指定长度的字符串
+     */
+    private static fillKey;
 }
 export default JsonHelper;

package/esm/helpers/ObjectHelper.d.ts

@@ -9,11 +9,15 @@ declare class ObjectHelper {
     /**
      * 过滤key，并输出新对象
      */
-    static filter(input: object, filter: (n: any) => boolean, valueHandler: (n: any) => {}): any[];
+    static filter(input: object, filter: (n: any) => boolean, valueFn: (n: any) => {}): any[];
+    /**
+     * 提取部分属性，并得到新对象
+     */
+    static extract(value: object, keys: string[]): any;
     /**
      * 把数组转换成对象
      */
-    static toObject(array: any[], keySelector: (n: any) => string, valueSelector: (n: any) => string): {};
+    static toObject(array: any[], keyFn: (n: any) => string, valueFn: (n: any) => string): any;
     /**
      * 手动复制，并对字段执行指定自定义处理
      */
@@ -27,7 +31,7 @@ declare class ObjectHelper {
      */
     static mergeTo: (target: any, from: any) => any;
     /**
-     * 给对象添加属性集合，并赋值
+     * 给对象添加多层属性，并赋值
      */
     static addProperties: (obj: object, keys: string[], value: string) => void;
     /**

package/esm/helpers/TreeHelper.d.ts

@@ -49,6 +49,6 @@ declare class TreeHelper {
     /**
      * 对树结点的数据进行重新映射，映射得到新的Tree数组
      */
-    static map: (tree: any[], prevChildProp: string, childProp: string, fun: Function) => any[];
+    static map: (tree: any[], prevChildProp: string, childProp: string, fn: Function) => any[];
 }
 export default TreeHelper;

package/esm/helpers/index.d.ts

@@ -11,7 +11,6 @@ import MicroHelper from "./MicroHelper";
 import MountHelper from "./MountHelper";
 import ObjectHelper from "./ObjectHelper";
 import StringHelper from "./StringHelper";
-import ScriptHelper from "./ScriptHelper";
 import TaskHelper from "./TaskHelper";
 import TypeHelper from "./TypeHelper";
 import TimeHelper from "./TimeHelper";
@@ -21,4 +20,4 @@ import JsonHelper from "./JsonHelper";
 import BrowserHelper from "./BrowserHelper";
 import UrlHelper from "./UrlHelper";
 import SignHelper from "./SignHelper";
-export { ComponentHelper, ArrayHelper, DomHelper, DictionaryHelper, EventHelper, FileHelper, HtmlHelper, ImageHelper, MathHelper, MountHelper, ObjectHelper, MicroHelper, StringHelper, ScriptHelper, TaskHelper, TypeHelper, TimeHelper, TreeHelper, ScrollHelper, JsonHelper, BrowserHelper, UrlHelper, SignHelper };
+export { ComponentHelper, ArrayHelper, DomHelper, DictionaryHelper, EventHelper, FileHelper, HtmlHelper, ImageHelper, MathHelper, MountHelper, ObjectHelper, MicroHelper, StringHelper, TaskHelper, TypeHelper, TimeHelper, TreeHelper, ScrollHelper, JsonHelper, BrowserHelper, UrlHelper, SignHelper };

package/esm/helpers/types/JsonConfig.d.ts

@@ -0,0 +1,10 @@
+/**
+ * Json配置
+ */
+declare class JsonConfig {
+    /**
+     * 是否美化
+     */
+    beautify: boolean;
+}
+export default JsonConfig;

package/esm/helpers/types/TreeNodeProp.d.ts

@@ -1,3 +1,6 @@
+/**
+ * 树节点属性
+ */
 interface TreeNodeProp {
     key: string;
     type: string;

package/esm/helpers/types/index.d.ts

@@ -1,2 +1,3 @@
+import JsonConfig from "./JsonConfig";
 import TreeNodeProp from "./TreeNodeProp";
-export { TreeNodeProp };
+export { JsonConfig, type TreeNodeProp };

package/esm/main.d.ts

@@ -1,4 +1,4 @@
-import { IMessenger } from "./plugins";
+import { CreateFeOptions } from "./types";
 import "./styles/index.scss";
 export * from "./coms";
 export * from "./drivers";
@@ -12,5 +12,5 @@ export * from "./utilities";
 /**
  * 初始化前端基础框架
  */
-declare let createFe: (messenger: IMessenger) => Promise<void>;
+declare let createFe: (options?: CreateFeOptions) => Promise<void>;
 export { createFe };

package/esm/plugins/index.d.ts

@@ -6,5 +6,4 @@ import Ref from "./Ref";
  * 异步加载echarts
  */
 declare let loadEcharts: () => Promise<unknown>;
-export * from "./types";
 export { loader, Monaco, moment, loadEcharts, Ref };

package/esm/svcs/ISvc.d.ts

@@ -1,6 +1,7 @@
+import { IDriver } from "../drivers";
 /**
  * 服务接口
  */
-interface ISvc {
+interface ISvc extends IDriver {
 }
 export default ISvc;

package/esm/svcs/Svc.d.ts

@@ -1,4 +1,5 @@
 import ISvc from "./ISvc";
 declare abstract class Svc implements ISvc {
+    abstract type: string;
 }
 export default Svc;

package/esm/svcs/SvcFactory.d.ts

@@ -1,7 +1,10 @@
+import Factory from "../factorying/Factory";
+import ISvc from "./ISvc";
 /**
  * 服务工厂类
  */
-declare class SvcFactory {
+declare class SvcFactory extends Factory<ISvc> {
+    get instances(): ISvc[];
     static(): void;
     /**
      * 获取路由服务

package/esm/svcs/implement/ConfigSvc.d.ts

@@ -22,6 +22,10 @@ declare class ConfigSvc {
      * 字体
      */
     font: string;
+    /**
+     * 默认cdn
+     */
+    cdn: string;
     /**
      * 文件布局方式
      */

package/esm/svcs/implement/I18nSvc.d.ts

@@ -0,0 +1,83 @@
+/**
+ * 多语言服务基类
+ */
+declare class I18nSvc {
+    /**
+     * 多语言处理实体
+     */
+    i18n: any;
+    /**
+     * 记录加载过的语言包，防止重复加载
+     */
+    loadedLocales: string[];
+    /**
+     * 只实例化一次
+     */
+    constructor();
+    /**
+     * 翻译指定key，不存在使用默认值
+     */
+    t(key: string, params?: any, display?: string): any;
+    /**
+     * 判断指定key是否存在
+     */
+    t_exists(key: any): any;
+    /**
+     * 业务翻译：菜单多余言、多个窗口的多语言同时切换，而不用重载接口
+     */
+    t_menu(key: string): any;
+    /**
+     * 模块业务翻译
+     */
+    t_module(type: string, key: string): string;
+    /**
+     * 业务翻译：菜单多余言、多个窗口的多语言同时切换，而不用重载接口
+     */
+    t_table(table: string): any;
+    /**
+     * 业务翻译：菜单多余言、多个窗口的多语言同时切换，而不用重载接口
+     * 注意：如果结果返回未完毕}，则vue编译异常
+     */
+    t_field(table: string, field: string): any;
+    /**
+     * 枚举翻译：菜单多余言、多个窗口的多语言同时切换，而不用重载接口
+     */
+    t_enum(name: string, value: string): any;
+    /**
+     * 字段占位符翻译
+     */
+    t_field_placeholder(table: string, field: string): any;
+    /**
+     * 字段占位符翻译
+     */
+    t_field_choose_placeholder(table: string, field: string): any;
+    /**
+     * 系统翻译
+     */
+    t_sys(key: string): any;
+    /**
+     * 系统标题
+     */
+    t_title(): any;
+    /**
+     * 根据key设置多语言标题
+     */
+    setI18nTitle: (key: string) => void;
+    /**
+     * 设置标题
+     */
+    setTitle: (title?: string, env?: string) => void;
+    /**
+     * 添加多语言包
+     */
+    addMessages(messages: object): void;
+    /**
+     * 加载语言包
+     */
+    loadI18n(lang: string): Promise<void>;
+    /**
+     * 切换语言，自动加载菜单
+     */
+    switchI18n(lang: string): Promise<void>;
+}
+export default I18nSvc;

package/esm/svcs/implement/SettingSvc.d.ts

@@ -32,6 +32,10 @@ declare class SettingSvc {
      * 本地化语言集合
      */
     locales: any[];
+    /**
+     * CDN类型集合
+     */
+    cdns: any[];
     fonts: any;
     /**
      * SSO信息

package/esm/svcs/implement/index.d.ts

@@ -0,0 +1,2 @@
+import I18nSvc from "./I18nSvc";
+export { I18nSvc };

package/esm/svcs/index.d.ts

@@ -1,9 +1,11 @@
+import { I18nSvc } from "./implement";
 import ConfigSvc from "./implement/ConfigSvc";
 import EnvSvc from "./implement/EnvSvc";
 import LogSvc from "./implement/LogSvc";
 import SocketSvc from "./implement/SocketSvc";
 import UserSvc from "./implement/UserSvc";
 import SvcFactory from "./SvcFactory";
+import { CreateFeOptions } from "../types";
 /**
  * 驱动服务实例
  */
@@ -26,6 +28,7 @@ declare let driverSvc: {
     loadEnvs: (reload?: boolean) => Promise<void>;
 };
 declare let envSvc: EnvSvc;
+declare let i18nSvc: I18nSvc;
 declare let logSvc: LogSvc;
 declare let settingSvc: {
     loaded: boolean;
@@ -40,6 +43,7 @@ declare let settingSvc: {
     layouts: any[];
     backgrounds: any[];
     locales: any[];
+    cdns: any[];
     fonts: any;
     ssos: any[];
     size: string;
@@ -55,4 +59,13 @@ declare let settingSvc: {
 };
 declare let socketSvc: SocketSvc;
 declare let userSvc: UserSvc;
-export { configSvc, driverSvc, envSvc, logSvc, settingSvc, socketSvc, userSvc, SvcFactory };
+/**
+ * 初始化服务
+ */
+declare let initSvc: (options: CreateFeOptions) => Promise<void>;
+export * from "./implement";
+/**
+ * 提取可导出的翻译方法，当i18nSvc实例变化后，导出的方案会跟着变化？
+ */
+declare let t: (key: string, params?: any, display?: string) => any, t_exists: (key: any) => any, t_sys: (key: string) => any, t_enum: (name: string, value: string) => any, t_field: (table: string, field: string) => any, t_field_choose_placeholder: (table: string, field: string) => any, t_field_placeholder: (table: string, field: string) => any, t_table: (table: string) => any, t_module: (type: string, key: string) => string, t_menu: (key: string) => any;
+export { initSvc, configSvc, driverSvc, envSvc, i18nSvc, logSvc, settingSvc, socketSvc, userSvc, t, t_exists, t_sys, t_enum, t_field, t_field_choose_placeholder, t_field_placeholder, t_table, t_module, t_menu, SvcFactory };

package/esm/types/CreateFeOptions.d.ts

@@ -0,0 +1,24 @@
+import { IMessenger } from "../drivers";
+import I18nSvc from "../svcs/implement/I18nSvc";
+/**
+ * 初始化选项
+ */
+declare class CreateFeOptions {
+    /**
+     * 消息发送对象
+     */
+    messenger: IMessenger;
+    /**
+     * 实际的多语言翻译服务实体
+     */
+    i18nSvc: I18nSvc;
+    /**
+     * 基准请求地址
+     */
+    baseUrl: string;
+    /**
+     * CDN类型
+     */
+    cdn: string;
+}
+export default CreateFeOptions;

package/esm/types/{CreateOptions.d.ts → CreatePcOptions.d.ts}

@@ -1,7 +1,4 @@
-/**
- * 初始化选项
- */
-declare interface CreateOptions {
+declare class CreatePcOptions {
     /**
      * 前端环境变量
      */
@@ -15,4 +12,4 @@ declare interface CreateOptions {
      */
     lang: any;
 }
-export default CreateOptions;
+export default CreatePcOptions;

package/esm/types/index.d.ts

@@ -1,2 +1,3 @@
-import CreateOptions from "./CreateOptions";
-export { type CreateOptions };
+import CreateFeOptions from "./CreateFeOptions";
+import CreatePcOptions from "./CreatePcOptions";
+export { CreateFeOptions, CreatePcOptions };

package/esm/utilities/EventUtility.d.ts

@@ -49,6 +49,17 @@ declare class EventUtility {
      * 事件防抖: time ms没重复触发才执行指定操作
      */
     debounce: (func: (args: any) => void, time: number, args?: any) => void;
+    dispatchElement: HTMLElement;
+    /**
+     * 创建分发事件元素
+     */
+    createDispatch: (id: string, name: string, handler: (e: Event) => void) => void;
+    /**
+     * 分发事件，并传递参数
+     */
+    dispatch(name: string, data: {
+        [key: string]: string;
+    }): void;
     /**
      * 事件节流: 指定时间段内只第一次操作被触发
      */

package/esm/utilities/types/DragOptions.d.ts

@@ -1,4 +1,4 @@
-import Range from "./Range";
+import Rect from "./Rect";
 import DragEvent from "./DragEvent";
 /**
  * 拖拽选项
@@ -19,7 +19,7 @@ interface DragOptions {
     /**
      * 可拖拽范围
      */
-    range?: Range;
+    range?: Rect;
     /**
      * 吸附检测的距离，设置吸附位置必须设置拖拽范围（依赖宽度等信息）
      */

package/esm/utilities/types/Rect.d.ts

@@ -1,6 +1,10 @@
 import Position from "./Position";
+/**
+ * 区域类
+ */
 declare class Rect extends Position {
     width: number;
     height: number;
+    constructor(x: number, y: number, width: number, height: number);
 }
 export default Rect;

package/esm/utilities/types/index.d.ts

@@ -1,5 +1,5 @@
 import DragOptions from "./DragOptions";
 import DragEvent from "./DragEvent";
 import Position from "./Position";
-import Range from "./Range";
-export { type DragOptions, DragEvent, Position, Range };
+import Rect from "./Rect";
+export { type DragOptions, DragEvent, Position, Rect };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "halo-fe",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "description": "Halo front end sdk",
   "scripts": {
     "halo-fe:tsc": "vue-tsc",
@@ -13,7 +13,7 @@
     "halo-fe:publish": "npm publish"
   },
   "type": "module",
-  "module": "./dist/main.js",
+  "module": "./dist/main.ts",
   "types": "./esm/main.d.ts",
   "files": [
     "dist",
@@ -28,26 +28,30 @@
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },
+  "peerDependencies": {
+    "vue": "3.4.37",
+    "vue-i18n": "9.13.1"
+  },
   "dependencies": {
     "@monaco-editor/loader": "1.4.0",
     "clone": "2.1.2",
-    "crypto-js": "4.2.0",
     "echarts": "5.5.1",
     "file-saver": "2.0.5",
+    "liquidjs": "10.16.1",
     "moment": "2.30.1",
     "monaco-editor": "0.50.0",
-    "quill": "2.0.2",
     "underscore": "1.13.7",
-    "underscore.string": "3.3.6",
-    "vue": "3.4.34",
-    "xlsx-js-style": "1.2.0"
+    "underscore.string": "3.3.6"
   },
   "devDependencies": {
-    "@types/node": "22.0.0",
-    "@vitejs/plugin-vue": "5.1.1",
-    "@vitejs/plugin-vue-jsx": "4.0.0",
+    "@types/node": "22.3.0",
+    "@vitejs/plugin-vue": "5.1.2",
+    "@vitejs/plugin-vue-jsx": "4.0.1",
+    "crypto-js": "4.2.0",
+    "quill": "2.0.2",
     "sass": "1.77.8",
-    "vite": "5.3.5",
-    "vue-tsc": "2.0.29"
+    "vite": "5.4.0",
+    "vue-tsc": "2.0.29",
+    "xlsx-js-style": "1.2.0"
   }
 }