@ibiz-template/runtime 0.0.3-beta.6 → 0.0.3-beta.7

package/src/controller/neuron/nerve/nerve.ts

@@ -1,12 +1,7 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import { NerveCounter, Neuron } from '..';
-import { ControlController } from '../../control/control';
-import { IComponentEvent } from '../../interface';
-import { ViewController } from '../../view/view';
+import { INeuronController } from '../../interface';
 
-export type TypeAbility<T> = T extends Neuron<infer E, infer A> ? A : never;
-export type TypeEvent<T> = T extends Neuron<infer E, infer A> ? E : never;
-export type Controller = ControlController | ViewController;
 /**
  * 神经，
  * - 管理自身神经元的创建，销毁，能力绑定
@@ -17,10 +12,7 @@ export type Controller = ControlController | ViewController;
  * @export
  * @class Nerve
  */
-export abstract class Nerve<
-  T extends Neuron<IComponentEvent> = Neuron<IComponentEvent>,
-  C extends Controller = Controller,
-> {
+export abstract class Nerve<C extends INeuronController = INeuronController> {
   /**
    * 自己本身的神经元
    *
@@ -28,26 +20,31 @@ export abstract class Nerve<
    * @date 2022-09-13 16:09:44
    * @type {T}
    */
-  self: T;
+  self: Neuron = new Neuron(this.c);
 
   /**
-   * 神经元状态计数器
-   *
+   * 子组件的神经元集合
    * @author lxm
-   * @date 2022-09-13 14:09:20
-   * @type {number}
+   * @date 2023-03-31 05:54:51
    */
-  counter = new NerveCounter(this.counterCallBack.bind(this));
+  children = new Map<string, Neuron>();
+
+  /**
+   * 默认通过的名称集合
+   * @author lxm
+   * @date 2023-03-31 05:57:24
+   * @type {string[]}
+   */
+  passNames: string[] = [];
 
   /**
-   * 部件或者视图控制器
+   * 神经元状态计数器
    *
    * @author lxm
-   * @date 2022-09-13 16:09:33
-   * @protected
-   * @type {C}
+   * @date 2022-09-13 14:09:20
+   * @type {number}
    */
-  protected controller: C;
+  counter = new NerveCounter(this.counterCallBack.bind(this));
 
   /**
    * 在控制器拥有emit能力后就可以创建神经系统
@@ -55,9 +52,7 @@ export abstract class Nerve<
    * @date 2022-09-13 18:09:42
    * @param {C} controller
    */
-  constructor(controller: C) {
-    this.controller = controller;
-    this.self = this.createNeuron();
+  constructor(protected c: C) {
     this.counter.enroll('self');
   }
 
@@ -69,31 +64,7 @@ export abstract class Nerve<
    * @protected
    */
   protected counterCallBack(): void {
-    this.self.evt.emit('mounted');
-  }
-
-  /**
-   * !子类必须覆盖，返回自身的神经元实例
-   * 用bindAbility绑定自身的能力
-   *
-   * @author lxm
-   * @date 2022-09-13 16:09:02
-   * @protected
-   * @returns {*}  {T}
-   */
-  protected abstract createNeuron(): T;
-
-  /**
-   * 子类实现，绑定自身的神经元能力
-   * 可沿用基类的绑定
-   *
-   * @author lxm
-   * @date 2022-09-13 16:09:04
-   * @protected
-   * @returns {*}
-   */
-  protected bindAbility(): IObject {
-    return {};
+    this.self.emit('onMounted', undefined);
   }
 
   /**
@@ -105,8 +76,8 @@ export abstract class Nerve<
    * @param {string} _name 神经元的名称
    * @returns {*}  {boolean}
    */
-  inclusive(_name: string): boolean {
-    return false;
+  inclusive(name: string): boolean {
+    return this.passNames.includes(name);
   }
 
   /**
@@ -119,8 +90,15 @@ export abstract class Nerve<
    * @param {string} _name
    * @param {Neuron} _neuron
    */
-  protected connect(_name: string, _neuron: Neuron): void {
-    // 有下级神经元的添加处理
+  protected connect(name: string, neuron: Neuron): void {
+    // 通用的下级神经元的添加处理，加载完成处理和删除处理
+    this.children.set(name, neuron);
+    neuron.on('onMounted', () => {
+      this.counter.attend(name);
+    });
+    neuron.on('onDestroyed', () => {
+      this.children?.delete(name);
+    });
   }
 
   /**
@@ -153,7 +131,7 @@ export abstract class Nerve<
    * @date 2022-09-21 17:09:19
    */
   created(): void {
-    this.self.evt.emit('created');
+    this.self.emit('onCreated', undefined);
   }
 
   /**
@@ -175,9 +153,11 @@ export abstract class Nerve<
    * @date 2022-09-13 16:09:19
    */
   destroy(): void {
-    this.self.evt.emit('destroyed');
+    this.self.emit('onDestroyed', undefined);
     this.self.destroy();
-    this.controller = undefined as never;
+    this.passNames = undefined as never;
+    this.c = undefined as never;
     this.self = undefined as never;
+    this.children.clear();
   }
 }

package/src/controller/neuron/nerve/view/app-portal-view-nerve.ts

@@ -1,38 +1,23 @@
-import { ViewNerve, AppPortalViewNeuron, DashboardNeuron, Neuron } from '../..';
+import { ViewNerve, AppPortalViewNeuron, DashboardNeuron } from '../..';
 import { AppPortalViewController } from '../../..';
 
 /**
  * 应用看板视图神经系统
- *
  * @author lxm
- * @date 2022-10-14 14:10:48
+ * @date 2023-03-31 05:50:25
  * @export
  * @class AppPortalViewNerve
- * @extends {ViewNerve<AppPortalViewNeuron, AppPortalViewController>}
+ * @extends {ViewNerve<AppPortalViewController>}
  */
-export class AppPortalViewNerve extends ViewNerve<
-  AppPortalViewNeuron,
-  AppPortalViewController
-> {
-  dashboard!: DashboardNeuron;
+export class AppPortalViewNerve extends ViewNerve<AppPortalViewController> {
+  self: AppPortalViewNeuron = new AppPortalViewNeuron(this.c);
 
-  protected createNeuron(): AppPortalViewNeuron {
-    return new AppPortalViewNeuron(this.bindAbility());
+  get dashboard(): DashboardNeuron {
+    return this.children.get('dashboard') as DashboardNeuron;
   }
 
-  inclusive(name: string): boolean {
-    return name === 'dashboard' || super.inclusive(name);
-  }
-
-  connect(name: string, neuron: Neuron): void {
-    super.connect(name, neuron);
-    if (name === 'dashboard') {
-      this.dashboard = neuron as DashboardNeuron;
-    }
-  }
-
-  destroy(): void {
-    super.destroy();
-    this.dashboard = undefined as never;
+  created(): void {
+    this.passNames.push('dashboard');
+    super.created();
   }
 }

package/src/controller/neuron/nerve/view/dashboard-view-nerve.ts

@@ -1,4 +1,4 @@
-import { ViewNerve, DashboardViewNeuron, DashboardNeuron, Neuron } from '../..';
+import { ViewNerve, DashboardViewNeuron, DashboardNeuron } from '../..';
 import { DashboardViewController } from '../../..';
 
 /**
@@ -10,29 +10,15 @@ import { DashboardViewController } from '../../..';
  * @class DashboardViewNerve
  * @extends {ViewNerve<DashboardViewNeuron, DashboardViewController>}
  */
-export class DashboardViewNerve extends ViewNerve<
-  DashboardViewNeuron,
-  DashboardViewController
-> {
-  dashboard!: DashboardNeuron;
+export class DashboardViewNerve extends ViewNerve<DashboardViewController> {
+  self: DashboardViewNeuron = new DashboardViewNeuron(this.c);
 
-  protected createNeuron(): DashboardViewNeuron {
-    return new DashboardViewNeuron(this.bindAbility());
+  get dashboard(): DashboardNeuron {
+    return this.children.get('dashboard') as DashboardNeuron;
   }
 
-  inclusive(name: string): boolean {
-    return name === 'dashboard' || super.inclusive(name);
-  }
-
-  connect(name: string, neuron: Neuron): void {
-    super.connect(name, neuron);
-    if (name === 'dashboard') {
-      this.dashboard = neuron as DashboardNeuron;
-    }
-  }
-
-  destroy(): void {
-    super.destroy();
-    this.dashboard = undefined as never;
+  created(): void {
+    this.passNames.push('dashboard');
+    super.created();
   }
 }

package/src/controller/neuron/nerve/view/dataview-view-nerve.ts

@@ -1,4 +1,4 @@
-import { DataViewNeuron, DataViewViewNeuron, Neuron } from '../..';
+import { CardNeuron, CardViewNeuron } from '../..';
 import { DataViewViewController } from '../../..';
 import { MDViewNerve } from './md-view-nerve';
 
@@ -14,57 +14,16 @@ import { MDViewNerve } from './md-view-nerve';
  * @template C
  */
 export class DataViewViewNerve<
-  T extends DataViewViewNeuron = DataViewViewNeuron,
   C extends DataViewViewController = DataViewViewController,
-> extends MDViewNerve<T, C> {
-  dataView!: DataViewNeuron;
+> extends MDViewNerve<C> {
+  self: CardViewNeuron = new CardViewNeuron(this.c);
 
-  protected createNeuron(): T {
-    return new DataViewViewNeuron(this.bindAbility()) as T;
+  get card(): CardNeuron {
+    return this.children.get('dataView') as CardNeuron;
   }
 
-  protected bindAbility() {
-    return {
-      ...super.bindAbility(),
-      remove: this.controller.remove.bind(this.controller),
-    };
-  }
-
-  inclusive(name: string): boolean {
-    return name === 'dataview' || super.inclusive(name);
-  }
-
-  connect(name: string, neuron: Neuron): void {
-    super.connect(name, neuron);
-    // 连接表格神经元,并监听其事件
-    if (name === 'dataview') {
-      this.dataView = neuron as DataViewNeuron;
-      this.dataView.evt.on('destroyed', () => {
-        this.dataView = undefined as never;
-      });
-      this.dataView.evt.on(
-        'beforeLoad',
-        this.controller.onBeforeLoad.bind(this.controller),
-      );
-      this.dataView.evt.on(
-        'dataActive',
-        this.controller.onDataActive.bind(this.controller),
-      );
-      this.dataView.evt.on(
-        'selectionChange',
-        this.controller.onSelectionChange.bind(this.controller),
-      );
-      this.dataView.evt.on('afterSave', (...args) =>
-        this.controller.onAfterSave(...args, name),
-      );
-      this.dataView.evt.on('afterRemove', (...args) =>
-        this.controller.onAfterRemove(...args, name),
-      );
-    }
-  }
-
-  destroy(): void {
-    super.destroy();
-    this.dataView = undefined as never;
+  created(): void {
+    this.passNames.push('dataView');
+    super.created();
   }
 }

package/src/controller/neuron/nerve/view/edit-view-nerve.ts

@@ -14,56 +14,25 @@ import { ViewNerve } from './view-nerve';
  * @template C
  */
 export class EditViewNerve<
-  T extends EditViewNeuron = EditViewNeuron,
   C extends EditViewController = EditViewController,
-> extends ViewNerve<T, C> {
-  form!: EditFormNeuron;
+> extends ViewNerve<C> {
+  self: EditViewNeuron = new EditViewNeuron(this.c);
 
-  protected createNeuron(): T {
-    return new EditViewNeuron(this.bindAbility()) as T;
+  get form(): EditFormNeuron {
+    return this.children.get('form') as EditFormNeuron;
   }
 
-  protected bindAbility() {
-    return {
-      ...super.bindAbility(),
-      save: this.controller.save.bind(this.controller),
-      remove: this.controller.remove.bind(this.controller),
-      saveAndNew: this.controller.saveAndNew.bind(this.controller),
-      wfStart: this.controller.wfStart.bind(this.controller),
-      wfSubmit: this.controller.wfSubmit.bind(this.controller),
-      wfWithdraw: this.controller.wfWithdraw.bind(this.controller),
-    };
-  }
-
-  inclusive(name: string): boolean {
-    return name === 'form' || super.inclusive(name);
+  created(): void {
+    this.passNames.push('form');
+    super.created();
   }
 
   connect(name: string, neuron: Neuron): void {
     super.connect(name, neuron);
     // 连接表单神经元,并监听其事件
     if (name === 'form') {
-      this.form = neuron as EditFormNeuron;
-      this.form.evt.on(
-        'actionClick',
-        this.controller.executeViewLogic.bind(this.controller),
-      );
-      this.form.evt.on(
-        'afterSave',
-        this.controller.onAfterFormSave.bind(this.controller),
-      );
-      this.form.evt.on(
-        'afterRemove',
-        this.controller.onAfterFormRemove.bind(this.controller),
-      );
-      this.form.evt.on('destroyed', () => {
-        this.form = undefined as never;
-      });
+      this.form.on('onSaveSuccess', this.c.onAfterFormSave.bind(this.c));
+      this.form.on('onRemoveSuccess', this.c.onAfterFormRemove.bind(this.c));
     }
   }
-
-  destroy(): void {
-    super.destroy();
-    this.form = undefined as never;
-  }
 }

package/src/controller/neuron/nerve/view/edit-view3-nerve.ts

@@ -1,52 +1,23 @@
-import { EditViewNerve, EditView3Neuron, ViewNeuron, Neuron } from '../..';
+import { EditViewNerve, EditView3Neuron } from '../..';
 import { EditView3Controller } from '../../..';
 
 /**
  * 编辑视图（分页关系）神经系统
  *
  * @author lxm
- * @date 2022-09-16 10:09:49
+ * @date 2023-03-31 06:19:07
  * @export
- * @class MPickupViewNerve
- * @extends {EditViewNerve<EditView3Neuron, EditView3Controller>}
+ * @class EditView3Nerve
+ * @extends {EditViewNerve<EditView3Controller>}
  */
-export class EditView3Nerve extends EditViewNerve<
-  EditView3Neuron,
-  EditView3Controller
-> {
-  /**
-   * 关系界面视图的神经元map
-   *
-   * @author lxm
-   * @date 2022-09-13 17:09:49
-   * @type {ViewNeuron}
-   */
-  drViews: Map<string, ViewNeuron> = new Map();
+export class EditView3Nerve extends EditViewNerve<EditView3Controller> {
+  self: EditView3Neuron = new EditView3Neuron(this.c);
 
-  protected createNeuron(): EditView3Neuron {
-    return new EditView3Neuron(this.bindAbility());
-  }
-
-  inclusive(name: string): boolean {
-    return name.indexOf('dritem') === 0 || super.inclusive(name);
-  }
-
-  connect(name: string, neuron: Neuron): void {
-    super.connect(name, neuron);
-    // 连接关系界面视图神经元,并监听其事件，名称是外面给死的
-    if (name.indexOf('dritem') === 0) {
-      this.drViews.set(name, neuron as ViewNeuron);
-      neuron.evt.on('destroyed', () => {
-        if (this.drViews) {
-          this.drViews.delete(name);
-        }
-      });
-    }
-  }
-
-  destroy(): void {
-    super.destroy();
-    this.drViews.clear();
-    this.drViews = undefined as never;
+  created(): void {
+    const viewNames = this.c.model.drTab.pages.map(
+      page => page.embedView.source.name,
+    );
+    this.passNames.push(...viewNames);
+    super.created();
   }
 }

package/src/controller/neuron/nerve/view/grid-exp-view-nerve.ts

@@ -1,10 +1,4 @@
-import {
-  GridNeuron,
-  Neuron,
-  ToolbarNeuron,
-  MDViewNerve,
-  GridExpViewNeuron,
-} from '../..';
+import { GridNeuron, Neuron, GridExpViewNeuron, GridViewNerve } from '../..';
 import { GridExpViewController } from '../../..';
 
 /**
@@ -14,78 +8,54 @@ import { GridExpViewController } from '../../..';
  * @class GridExpViewNerve
  * @extends {MDViewNerve<GridExpViewNeuron, GridExpViewController>}
  */
-export class GridExpViewNerve extends MDViewNerve<
-  GridExpViewNeuron,
-  GridExpViewController
-> {
-  grid!: GridNeuron;
+export class GridExpViewNerve extends GridViewNerve<GridExpViewController> {
+  self: GridExpViewNeuron = new GridExpViewNeuron(this.c);
 
-  protected createNeuron(): GridExpViewNeuron {
-    return new GridExpViewNeuron(this.bindAbility());
+  get grid(): GridNeuron {
+    return this.children.get('gridexpbar_grid') as GridNeuron;
   }
 
-  protected bindAbility() {
-    return {
-      ...super.bindAbility(),
-      remove: this.controller.remove.bind(this.controller),
-      newRow: this.controller.newRow.bind(this.controller),
-    };
-  }
-
-  inclusive(name: string): boolean {
-    return (
-      name === 'gridexpbar_grid' ||
-      name === 'gridexpbar_toolbar' ||
-      super.inclusive(name)
-    );
+  created(): void {
+    this.passNames.push('gridexpbar_grid', 'gridexpbar_toolbar');
+    super.created();
   }
 
   connect(name: string, neuron: Neuron): void {
     super.connect(name, neuron);
     // 连接工具栏神经元,并监听其事件
     if (name === 'gridexpbar_toolbar') {
-      this.toolbar = neuron as ToolbarNeuron;
-      this.toolbar.evt.on('destroyed', () => {
-        this.toolbar = undefined as never;
-      });
-      this.toolbar.evt.on(
-        'itemClick',
-        this.controller.onToolbarClick.bind(this.controller),
-      );
-    }
-    // 连接表格神经元,并监听其事件
-    if (name === 'gridexpbar_grid') {
-      this.grid = neuron as GridNeuron;
-      this.grid.evt.on('destroyed', () => {
-        this.grid = undefined as never;
-      });
-      this.grid.evt.on(
-        'beforeLoad',
-        this.controller.onBeforeLoad.bind(this.controller),
-      );
-      this.grid.evt.on(
-        'dataActive',
-        this.controller.onDataActive.bind(this.controller),
-      );
-      this.grid.evt.on(
-        'selectionChange',
-        this.controller.onSelectionChange.bind(this.controller),
-      );
-      this.grid.evt.on(
-        'actionClick',
-        this.controller.executeViewLogic.bind(this.controller),
-      );
-      this.grid.evt.on('afterSave', (...args) =>
-        this.controller.onAfterSave(...args, name),
-      );
-      this.grid.evt.on('afterRemove', (...args) =>
-        this.controller.onAfterRemove(...args, name),
-      );
+      // this.toolbar.evt.on(
+      //   'itemClick',
+      //   this.controller.onToolbarClick.bind(this.controller),
+      // );
     }
-  }
-
-  destroy(): void {
-    super.destroy();
-    this.grid = undefined as never;
+    // todo 验证表格能否监听
+    // // 连接表格神经元,并监听其事件
+    // if (name === 'gridexpbar_grid') {
+    //   this.grid = neuron as GridNeuron;
+    //   this.grid.evt.on(GridEvtName.onDestroyed, () => {
+    //     this.grid = undefined as never;
+    //   });
+    //   this.grid.evt.on(
+    //     GridEvtName.onBeforeLoad,
+    //     this.controller.onBeforeLoad.bind(this.controller),
+    //   );
+    //   this.grid.evt.on(
+    //     GridEvtName.onActive,
+    //     this.controller.onDataActive.bind(this.controller),
+    //   );
+    //   this.grid.evt.on(
+    //     GridEvtName.onSelectionChange,
+    //     this.controller.onSelectionChange.bind(this.controller),
+    //   );
+    //   this.grid.evt.on(
+    //     GridEvtName.onSaveSuccess,
+    //     this.controller.onAfterSave.bind(this.controller),
+    //   );
+    //   this.grid.evt.on(
+    //     GridEvtName.onRemoveSuccess,
+    //     this.controller.onAfterSave.bind(this.controller),
+    //   );
+    // }
   }
 }

package/src/controller/neuron/nerve/view/grid-view-nerve.ts

@@ -1,4 +1,4 @@
-import { GridNeuron, GridViewNeuron, Neuron } from '../..';
+import { GridNeuron, GridViewNeuron } from '../..';
 import { GridViewController } from '../../..';
 import { MDViewNerve } from './md-view-nerve';
 
@@ -14,62 +14,16 @@ import { MDViewNerve } from './md-view-nerve';
  * @template C
  */
 export class GridViewNerve<
-  T extends GridViewNeuron = GridViewNeuron,
   C extends GridViewController = GridViewController,
-> extends MDViewNerve<T, C> {
-  grid!: GridNeuron;
+> extends MDViewNerve<C> {
+  self: GridViewNeuron = new GridViewNeuron(this.c);
 
-  protected createNeuron(): T {
-    return new GridViewNeuron(this.bindAbility()) as T;
+  get grid(): GridNeuron {
+    return this.children.get('grid') as GridNeuron;
   }
 
-  protected bindAbility() {
-    return {
-      ...super.bindAbility(),
-      remove: this.controller.remove.bind(this.controller),
-      newRow: this.controller.newRow.bind(this.controller),
-    };
-  }
-
-  inclusive(name: string): boolean {
-    return name === 'grid' || super.inclusive(name);
-  }
-
-  connect(name: string, neuron: Neuron): void {
-    super.connect(name, neuron);
-    // 连接表格神经元,并监听其事件
-    if (name === 'grid') {
-      this.grid = neuron as GridNeuron;
-      this.grid.evt.on('destroyed', () => {
-        this.grid = undefined as never;
-      });
-      this.grid.evt.on(
-        'beforeLoad',
-        this.controller.onBeforeLoad.bind(this.controller),
-      );
-      this.grid.evt.on(
-        'dataActive',
-        this.controller.onDataActive.bind(this.controller),
-      );
-      this.grid.evt.on(
-        'selectionChange',
-        this.controller.onSelectionChange.bind(this.controller),
-      );
-      this.grid.evt.on(
-        'actionClick',
-        this.controller.executeViewLogic.bind(this.controller),
-      );
-      this.grid.evt.on('afterSave', (...args) =>
-        this.controller.onAfterSave(...args, name),
-      );
-      this.grid.evt.on('afterRemove', (...args) =>
-        this.controller.onAfterRemove(...args, name),
-      );
-    }
-  }
-
-  destroy(): void {
-    super.destroy();
-    this.grid = undefined as never;
+  created(): void {
+    this.passNames.push('grid');
+    super.created();
   }
 }