@ccpc/core 0.1.23 → 0.1.25

package/index.js

@@ -99,13 +99,13 @@ class H {
 }
 class F {
   constructor() {
-    this._elements = /* @__PURE__ */ new Map(), this._eleClsMgr = new H();
+    this._allElements = /* @__PURE__ */ new Map(), this._ctorToElements = /* @__PURE__ */ new Map(), this._eleClsMgr = new H();
   }
   static instance() {
     return this._instance || (this._instance = new F()), this._instance;
   }
   /**
-   * 注册Element
+   * 注册对象
    */
   registerElement(t, e) {
     this._eleClsMgr.registerCls(t, e);
@@ -116,23 +116,45 @@ class F {
   getElementClsByCtor(t) {
     return this._eleClsMgr.getCls(t);
   }
+  /**
+   * 根据id获取element
+   */
   getElementById(t) {
-    return this._elements.get(t);
+    return this._allElements.get(t);
   }
+  /**
+   * 获取所有element
+   */
   getAllElements() {
-    return [...this._elements.values()];
+    return [...this._allElements.values()];
   }
   getAllElementIds() {
-    return [...this._elements.keys()];
+    return [...this._allElements.keys()];
+  }
+  /**
+   * 根据序列化id获取element数组
+   */
+  getElementsByCtor(t) {
+    const e = this._ctorToElements.get(t);
+    return e ? [...e] : [];
   }
   add(t, e = !0) {
-    return !e && this._elements.has(t.id.asInt()) ? !1 : (this._elements.set(t.id.asInt(), t), !0);
+    if (!e && this._allElements.has(t.id.asInt()))
+      return !1;
+    this._allElements.set(t.id.asInt(), t);
+    const s = this._ctorToElements.get(t.getSerialId());
+    return s ? s.add(t) : this._ctorToElements.set(t.getSerialId(), /* @__PURE__ */ new Set([t])), !0;
   }
   delete(t) {
-    return this._elements.delete(t);
+    const e = this._allElements.get(t);
+    if (e) {
+      this._allElements.delete(t);
+      const s = this._ctorToElements.get(e.getSerialId());
+      s && s.delete(e);
+    }
   }
   clear() {
-    this._elements.clear();
+    this._allElements.clear(), this._ctorToElements.clear();
   }
 }
 const Z = F.instance(), u = class u {
@@ -685,7 +707,7 @@ class L {
     return this._instance || (this._instance = new L()), this._instance;
   }
 }
-class x {
+class C {
   constructor() {
     this.style = {}, this.type = I.UNKOWN;
   }
@@ -702,7 +724,7 @@ class x {
     return e.parent = this.parent, e.gnode = this.gnode, e.globalMatrix = this.globalMatrix?.clone(), e;
   }
 }
-class z extends x {
+class z extends C {
   constructor() {
     super(...arguments), this.children = [], this.type = I.GROUP;
   }
@@ -716,19 +738,19 @@ class z extends x {
     }), t;
   }
 }
-class gt extends x {
+class gt extends C {
   constructor() {
     super(...arguments), this.type = I.POINT;
   }
   // TODO clone方法
 }
-class tt extends x {
+class tt extends C {
   constructor() {
     super(...arguments), this.type = I.EDGE;
   }
   // TODO clone方法
 }
-class mt extends x {
+class mt extends C {
   constructor() {
     super(...arguments), this.text = "", this.opacity = 1, this.position = P.O();
   }
@@ -737,7 +759,7 @@ class mt extends x {
     return t.text = this.text, t.opacity = this.opacity, t.position = new P(this.position), t;
   }
 }
-class yt extends x {
+class yt extends C {
   /**
    * 点集,一个点由一个索引组成
    * 离散后的所有顶点, 此数据不渲染,只做存储使用
@@ -1472,12 +1494,15 @@ const A = class A {
       i && e.push(i);
     }), e;
   }
-  // public getElementClsByCtor(ctor:string) {
-  //     return this
-  // }
   filterElements(t) {
     return t ? this.elementMgr.getAllElements().filter(t) : this.elementMgr.getAllElements();
   }
+  getAllElementsByCtor(t) {
+    if (!t)
+      return this.filterElements();
+    const e = t.serializedId.ctor;
+    return this.elementMgr.getElementsByCtor(e);
+  }
   checkIfCanModifyDoc() {
     c.assert(this.transactionMgr.getCurrentTransaction(), "事务外不可修改文档", "wg", "2025-11-18");
   }
@@ -1499,7 +1524,7 @@ const A = class A {
 };
 A.canCreate = !1;
 let E = A;
-class xt {
+class Ct {
   constructor() {
     this._db = {}, this._cache = {};
   }
@@ -1685,7 +1710,7 @@ class xt {
     return e === "string" || e === "number" || e === "boolean";
   }
 }
-class Ct extends xt {
+class xt extends Ct {
   constructor() {
     super(), this.id = m.INVALID, this.name = "", this.visible = !0, this.C_GRep = g.empty, c.assert(E.canCreate, "创建Element必须通过Document.create方法", "wg", "2025-11-18");
   }
@@ -1796,7 +1821,7 @@ var Nt = Object.getOwnPropertyDescriptor, Dt = (n, t, e, s) => {
     (o = n[r]) && (i = o(i) || i);
   return i;
 };
-let U = class extends Ct {
+let U = class extends xt {
   init() {
     return this;
   }
@@ -1837,7 +1862,7 @@ class Bt {
     this.clearTmp(), this._doc.deleteElementsById(this._tmpElementId);
   }
 }
-class C extends N {
+class x extends N {
   constructor(t, e) {
     super(), this.plane = t.clone(), this.geo = e;
   }
@@ -1845,7 +1870,7 @@ class C extends N {
     return super._copyFrom(t), this;
   }
 }
-class nt extends C {
+class nt extends x {
   constructor(t, e) {
     super(t, e);
   }
@@ -1871,7 +1896,7 @@ class nt extends C {
     return new nt(this.plane, t ? this.geo.clone() : this.geo)._copyFrom(this);
   }
 }
-class ot extends C {
+class ot extends x {
   constructor(t, e) {
     super(t, e);
   }
@@ -1889,7 +1914,7 @@ class ot extends C {
     return new ot(this.plane, t ? this.geo.clone() : this.geo)._copyFrom(this);
   }
 }
-class at extends C {
+class at extends x {
   constructor(t, e) {
     super(t, e);
   }
@@ -1911,7 +1936,7 @@ class at extends C {
     return new at(this.plane, t ? this.geo.clone() : this.geo)._copyFrom(this);
   }
 }
-class ct extends C {
+class ct extends x {
   constructor(t, e) {
     super(t, e);
   }
@@ -1944,7 +1969,7 @@ class ct extends C {
     return new ct(this.plane.clone(), t ? this.geo.clone() : this.geo)._copyFrom(this);
   }
 }
-class dt extends C {
+class dt extends x {
   constructor(t, e, s) {
     super(e, $.rO()), this.text = t, this.position = $.O(), s && (this.position = s);
   }
@@ -2102,7 +2127,7 @@ class $t {
   }
 }
 export {
-  Ct as CElement,
+  xt as CElement,
   H as ClassManager,
   Ft as DBGenerator,
   c as DebugUtil,
@@ -2114,14 +2139,14 @@ export {
   B as EN_CoreRequestIds,
   h as EN_ModelViewChanged,
   I as EN_RNODE_TYPE,
-  Ct as Element,
+  xt as Element,
   m as ElementId,
   F as ElementMgr,
   nt as GCurve2d,
   D as GGroup,
   w as GNODE_TYPE,
   N as GNode,
-  C as GNode2d,
+  x as GNode2d,
   at as GPoint2d,
   ot as GPolycurve,
   ct as GPolygon,
@@ -2136,7 +2161,7 @@ export {
   tt as RenderEdge,
   z as RenderGroup,
   yt as RenderMesh,
-  x as RenderNode,
+  C as RenderNode,
   zt as RenderNodeUtil,
   gt as RenderPoint,
   mt as RenderText,

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@ccpc/core",
-  "version": "0.1.23",
+  "version": "0.1.25",
   "description": "Core data model layer for editor",
   "license": "MIT",
   "type": "module",
   "main": "./index.js",
   "types": "./types/index.d.ts",
   "peerDependencies": {
-    "@ccpc/math": "^0.1.23"
+    "@ccpc/math": "^0.1.25"
   }
 }

package/types/document/document.d.ts

@@ -1,4 +1,4 @@
-import type { IElement } from '../element/i_element';
+import type { IElement, IElementCtor } from '../element/i_element';
 import type { IDocFile, IDocument } from './i_document';
 import { IDPool } from './id_pool';
 import { ElementId } from '../element/element_id';
@@ -28,6 +28,7 @@ export declare class Document implements IDocument {
     getElementByIdEnsure<T extends IElement>(eleId: ElementId | number): T;
     getElementsByIds(eleIds: Array<ElementId | number>): IElement[];
     filterElements(filter?: (ele: IElement) => boolean): IElement[];
+    getAllElementsByCtor<T extends IElement>(eleCtor?: IElementCtor<T>): T[];
     checkIfCanModifyDoc(): void;
     cacheForViewElementChanged(evtType: EN_ModelViewChanged, elements: Array<IElement>): void;
     updateView(rebuild?: boolean): boolean;

package/types/document/element_mgr.d.ts

@@ -4,25 +4,39 @@ export declare class ElementMgr {
     /**
      * 当前文档中的所有对象
      */
-    private readonly _elements;
+    private readonly _allElements;
     /**
-     * 对象类管理器
+     * 序列化id到实例对象的映射
+     */
+    private readonly _ctorToElements;
+    /**
+     * 类管理器
      */
     private readonly _eleClsMgr;
     static instance(): ElementMgr;
     /**
-     * 注册Element
+     * 注册对象
      */
     registerElement(ctor: string, eleCtor: IElementCtor): void;
     /**
      * 根据序列化id获取Element构造函数
      */
     getElementClsByCtor(ctor: string): IElementCtor | undefined;
+    /**
+     * 根据id获取element
+     */
     getElementById<T extends IElement>(id: number): T;
+    /**
+     * 获取所有element
+     */
     getAllElements(): IElement[];
     getAllElementIds(): number[];
+    /**
+     * 根据序列化id获取element数组
+     */
+    getElementsByCtor(ctor: string): IElement[];
     add(element: IElement, force?: boolean): boolean;
-    delete(id: number): boolean;
+    delete(id: number): void;
     clear(): void;
 }
 export declare const elementMgr: ElementMgr;

package/types/document/i_document.d.ts

@@ -1,5 +1,5 @@
 import { ElementId } from '../element/element_id';
-import type { IElement } from '../element/i_element';
+import type { IElement, IElementCtor } from '../element/i_element';
 import { ModelView } from '../model_view/model_view';
 import { RequestMgr } from '../request/request_mgr';
 import { TransactionMgr } from '../transaction/transaction_mgr';
@@ -36,14 +36,16 @@ export interface IDocument {
     /**根据id获取对象*/
     getElementByIdEnsure<T extends IElement>(eleId: ElementId | number): T;
     getElementsByIds(eleIds: Array<ElementId | number>): IElement[];
-    /**
-     * 根据序列化id获取Element的类
-     */
     /**
      * 返回文档中满足filter条件的Element
      * filter为空返回所有Element
      */
     filterElements(filter?: (ele: IElement) => boolean): IElement[];
+    /**
+     * 获取Class下的所有实例Element
+     * 不能获取基类的所有子类
+     */
+    getAllElementsByCtor<T extends IElement>(eleCtor?: IElementCtor<T>): T[];
     /**
      * 检测是否允许修改文档
      * 包括增加、删除和修改

package/types/grep/i_style.d.ts

@@ -23,6 +23,9 @@ export type ILineStyle = Partial<{
     opacity: number;
     color: number | string;
     width: number;
+    dashed: boolean;
+    dashSize: number;
+    gapSize: number;
 }>;
 export type IFaceStyle = Partial<{
     opacity: number;