@ibiz-template/vue3-util 0.0.3-beta.6 → 0.0.3-beta.7

package/src/use/widget/use-control-controller/use-control-controller.ts

@@ -1,6 +1,7 @@
-import { ControlController } from '@ibiz-template/runtime';
+import { ControlController, CTX } from '@ibiz-template/runtime';
 import {
   getCurrentInstance,
+  inject,
   onBeforeMount,
   onBeforeUnmount,
   onMounted,
@@ -19,10 +20,11 @@ import { useForce } from '../../vue/vue';
  * @return {*}  {T}
  */
 export function useControlController<T extends ControlController>(
-  fn: () => T,
+  fn: (ctx: CTX) => T,
 ): T {
   const vue = getCurrentInstance()!.proxy!;
-  const c = fn();
+  const ctx = inject('ctx') as CTX;
+  const c = fn(ctx);
   c.state = reactive(c.state) as T;
 
   // 挂载强制更新方法

package/src/use/widget/use-dashboard-controller/use-dashboard-controller.ts

@@ -1,15 +1,14 @@
 import { DashboardController } from '@ibiz-template/runtime';
-import { IBizContext } from '@ibiz-template/core';
 import { DashboardModel } from '@ibiz-template/model';
 import { useControlController } from '../use-control-controller/use-control-controller';
 
 export function useDashboardController(
   model: DashboardModel,
-  context: IBizContext,
+  context: IContext,
   params: IParams = {},
 ): DashboardController {
-  return useControlController<DashboardController>(() => {
-    const c = new DashboardController(model, context, params);
+  return useControlController<DashboardController>(ctx => {
+    const c = new DashboardController(model, context, params, ctx);
     return c;
   });
 }

package/src/use/widget/use-dataview-controller/use-dataview-controller.ts

@@ -1,5 +1,4 @@
 import { DataViewController } from '@ibiz-template/runtime';
-import { IBizContext } from '@ibiz-template/core';
 import { DataViewModel } from '@ibiz-template/model';
 import { useControlController } from '../use-control-controller/use-control-controller';
 import { usePropsWatch } from '../../vue/vue';
@@ -11,17 +10,17 @@ import { usePropsWatch } from '../../vue/vue';
  * @date 2022-08-15 17:08:15
  * @export
  * @param {DataViewModel} model
- * @param {IBizContext} context
+ * @param {IContext} context
  * @param {IParams} [params={}]
  * @return {*}  {DataViewController}
  */
 export function useDataViewController(
   model: DataViewModel,
-  context: IBizContext,
+  context: IContext,
   params: IParams = {},
 ): DataViewController {
-  return useControlController<DataViewController>(() => {
-    const c = new DataViewController(model, context, params);
+  return useControlController<DataViewController>(ctx => {
+    const c = new DataViewController(model, context, params, ctx);
     // 监听prop，并响应式更新到controller
     usePropsWatch('mdCtrlActiveMode', c.setMdCtrlActiveMode.bind(c));
     return c;

package/src/use/widget/use-edit-form-controller/use-edit-form-controller.ts

@@ -1,5 +1,4 @@
 import { EditFormController } from '@ibiz-template/runtime';
-import { IBizContext } from '@ibiz-template/core';
 import { EditFormModel } from '@ibiz-template/model';
 import { useControlController } from '../use-control-controller/use-control-controller';
 
@@ -10,17 +9,17 @@ import { useControlController } from '../use-control-controller/use-control-cont
  * @date 2022-08-22 20:08:08
  * @export
  * @param {EditFormModel} model
- * @param {IBizContext} context
+ * @param {IContext} context
  * @param {IParams} [params={}]
  * @returns {*}  {EditFormController}
  */
 export function useEditFormController(
   model: EditFormModel,
-  context: IBizContext,
+  context: IContext,
   params: IParams = {},
 ): EditFormController {
-  return useControlController<EditFormController>(() => {
-    const c = new EditFormController(model, context, params);
+  return useControlController<EditFormController>(ctx => {
+    const c = new EditFormController(model, context, params, ctx);
     return c;
   });
 }

package/src/use/widget/use-grid-controller/use-grid-controller.ts

@@ -1,5 +1,4 @@
 import { GridController } from '@ibiz-template/runtime';
-import { IBizContext } from '@ibiz-template/core';
 import { GridModel } from '@ibiz-template/model';
 import { usePropsWatch } from '../../vue/vue';
 import { useControlController } from '../use-control-controller/use-control-controller';
@@ -11,17 +10,17 @@ import { useControlController } from '../use-control-controller/use-control-cont
  * @date 2022-08-15 17:08:15
  * @export
  * @param {GridModel} model
- * @param {IBizContext} context
+ * @param {IContext} context
  * @param {IParams} [params={}]
  * @return {*}  {GridController}
  */
 export function useGridController(
   model: GridModel,
-  context: IBizContext,
+  context: IContext,
   params: IParams = {},
 ): GridController {
-  return useControlController<GridController>(() => {
-    const c = new GridController(model, context, params);
+  return useControlController<GridController>(ctx => {
+    const c = new GridController(model, context, params, ctx);
     // 监听prop，并响应式更新到controller
     usePropsWatch('mdCtrlActiveMode', c.setMdCtrlActiveMode.bind(c));
     usePropsWatch('isSelectFirstDefault', c.setIsSelectFirstDefault.bind(c));

package/src/use/widget/use-kanban-controller/use-kanban-controller.ts

@@ -1,5 +1,4 @@
 import { KanbanController } from '@ibiz-template/runtime';
-import { IBizContext } from '@ibiz-template/core';
 import { KanbanModel } from '@ibiz-template/model';
 import { useControlController } from '../use-control-controller/use-control-controller';
 import { usePropsWatch } from '../../vue/vue';
@@ -11,17 +10,17 @@ import { usePropsWatch } from '../../vue/vue';
  * @date 2022-08-15 17:08:15
  * @export
  * @param {KanbanModel} model
- * @param {IBizContext} context
+ * @param {IContext} context
  * @param {IParams} [params={}]
  * @return {*}  {KanbanController}
  */
 export function useKanbanController(
   model: KanbanModel,
-  context: IBizContext,
+  context: IContext,
   params: IParams = {},
 ): KanbanController {
-  return useControlController<KanbanController>(() => {
-    const c = new KanbanController(model, context, params);
+  return useControlController<KanbanController>(ctx => {
+    const c = new KanbanController(model, context, params, ctx);
     // 监听prop，并响应式更新到controller
     usePropsWatch('mdCtrlActiveMode', c.setMdCtrlActiveMode.bind(c));
     return c;

package/src/use/widget/use-list-controller/use-list-controller.ts

@@ -1,5 +1,4 @@
 import { ListController } from '@ibiz-template/runtime';
-import { IBizContext } from '@ibiz-template/core';
 import { ListModel } from '@ibiz-template/model';
 import { useControlController } from '../use-control-controller/use-control-controller';
 import { usePropsWatch } from '../../vue/vue';
@@ -11,17 +10,17 @@ import { usePropsWatch } from '../../vue/vue';
  * @date 2022-08-15 17:08:15
  * @export
  * @param {ListModel} model
- * @param {IBizContext} context
+ * @param {IContext} context
  * @param {IParams} [params={}]
  * @return {*}  {ListController}
  */
 export function useListController(
   model: ListModel,
-  context: IBizContext,
+  context: IContext,
   params: IParams = {},
 ): ListController {
-  return useControlController<ListController>(() => {
-    const c = new ListController(model, context, params);
+  return useControlController<ListController>(ctx => {
+    const c = new ListController(model, context, params, ctx);
     // 监听prop，并响应式更新到controller
     usePropsWatch('mdCtrlActiveMode', c.setMdCtrlActiveMode.bind(c));
     usePropsWatch('isSelectFirstDefault', c.setIsSelectFirstDefault.bind(c));

package/src/use/widget/use-panel-controller/use-panel-controller.ts

@@ -1,5 +1,4 @@
 import { PanelController } from '@ibiz-template/runtime';
-import { IBizContext } from '@ibiz-template/core';
 import { PanelModel } from '@ibiz-template/model';
 import { useControlController } from '../use-control-controller/use-control-controller';
 import { usePropsWatch } from '../../vue/vue';
@@ -9,17 +8,17 @@ import { usePropsWatch } from '../../vue/vue';
  *
  * @export
  * @param {PanelModel} model
- * @param {IBizContext} context
+ * @param {IContext} context
  * @param {IParams} [params={}]
  * @returns {*}  {PanelController}
  */
 export function usePanelController(
   model: PanelModel,
-  context: IBizContext,
+  context: IContext,
   params: IParams = {},
 ): PanelController {
-  return useControlController<PanelController>(() => {
-    const c = new PanelController(model, context, params);
+  return useControlController<PanelController>(ctx => {
+    const c = new PanelController(model, context, params, ctx);
     // 监听prop，并响应式更新到controller
     usePropsWatch('inputData', c.setInputData.bind(c));
     return c;

package/src/use/widget/use-search-form-controller/use-search-form-controller.ts

@@ -1,5 +1,4 @@
 import { SearchFormController } from '@ibiz-template/runtime';
-import { IBizContext } from '@ibiz-template/core';
 import { SearchFormModel } from '@ibiz-template/model';
 import { useControlController } from '../use-control-controller/use-control-controller';
 
@@ -10,17 +9,17 @@ import { useControlController } from '../use-control-controller/use-control-cont
  * @date 2022-08-22 20:08:08
  * @export
  * @param {SearchFormModel} model
- * @param {IBizContext} context
+ * @param {IContext} context
  * @param {IParams} [params={}]
  * @returns {*}  {SearchFormController}
  */
 export function useSearchFormController(
   model: SearchFormModel,
-  context: IBizContext,
+  context: IContext,
   params: IParams = {},
 ): SearchFormController {
-  return useControlController<SearchFormController>(() => {
-    const c = new SearchFormController(model, context, params);
+  return useControlController<SearchFormController>(ctx => {
+    const c = new SearchFormController(model, context, params, ctx);
     return c;
   });
 }

package/src/use/widget/use-toolbar-controller/use-toolbar-controller.ts

@@ -0,0 +1,24 @@
+import { ToolbarController } from '@ibiz-template/runtime';
+import { ToolbarModel } from '@ibiz-template/model';
+import { useControlController } from '../use-control-controller/use-control-controller';
+
+/**
+ * 获取工具栏部件控制器
+ *
+ * @author chitanda
+ * @date 2022-08-15 17:08:15
+ * @export
+ * @param {ToolbarModel} model
+ * @param {IContext} context
+ * @param {IParams} [params={}]
+ * @return {*}  {ToolbarController}
+ */
+export function useToolbarController(
+  model: ToolbarModel,
+  context: IContext,
+  params: IParams = {},
+): ToolbarController {
+  return useControlController<ToolbarController>(ctx => {
+    return new ToolbarController(model, context, params, ctx);
+  });
+}

package/src/use/widget/use-tree-controller/use-tree-controller.ts

@@ -1,5 +1,4 @@
 import { TreeController } from '@ibiz-template/runtime';
-import { IBizContext } from '@ibiz-template/core';
 import { TreeModel } from '@ibiz-template/model';
 import { useControlController } from '../use-control-controller/use-control-controller';
 import { usePropsWatch } from '../../vue/vue';
@@ -10,17 +9,17 @@ import { usePropsWatch } from '../../vue/vue';
  * @export
  * @param {Vue} vue
  * @param {TreeModel} model
- * @param {IBizContext} context
+ * @param {IContext} context
  * @param {IParams} [params={}]
  * @returns {*}  {TreeController}
  */
 export function useTreeController(
   model: TreeModel,
-  context: IBizContext,
+  context: IContext,
   params: IParams = {},
 ): TreeController {
-  return useControlController<TreeController>(() => {
-    const c = new TreeController(model, context, params);
+  return useControlController<TreeController>(ctx => {
+    const c = new TreeController(model, context, params, ctx);
     usePropsWatch('defaultSelectKeys', c.setDefaultSelectKeys.bind(c));
     usePropsWatch('isSelectFirstDefault', c.setIsSelectFirstDefault.bind(c));
     return c;

package/src/use/widget/use-view-layout-panel-controller/use-view-layout-panel-controller.ts

@@ -1,5 +1,7 @@
-import { ViewLayoutPanelController } from '@ibiz-template/runtime';
-import { IBizContext } from '@ibiz-template/core';
+import {
+  ViewController,
+  ViewLayoutPanelController,
+} from '@ibiz-template/runtime';
 import { ViewLayoutPanelModel } from '@ibiz-template/model';
 import { useControlController } from '../use-control-controller/use-control-controller';
 
@@ -8,17 +10,24 @@ import { useControlController } from '../use-control-controller/use-control-cont
  *
  * @export
  * @param {ViewLayoutPanelModel} model
- * @param {IBizContext} context
+ * @param {IContext} context
  * @param {IParams} [params={}]
  * @returns {*}  {ViewLayoutPanelController}
  */
 export function useViewLayoutPanelController(
   model: ViewLayoutPanelModel,
-  context: IBizContext,
+  viewController: ViewController,
+  context: IContext,
   params: IParams = {},
 ): ViewLayoutPanelController {
-  return useControlController<ViewLayoutPanelController>(() => {
-    const c = new ViewLayoutPanelController(model, context, params);
+  return useControlController<ViewLayoutPanelController>(ctx => {
+    const c = new ViewLayoutPanelController(
+      model,
+      context,
+      params,
+      ctx,
+      viewController,
+    );
     return c;
   });
 }

package/src/use/widget/use-wizard-panel-controller/use-wizard-panel-controller.ts

@@ -1,5 +1,4 @@
 import { WizardPanelController } from '@ibiz-template/runtime';
-import { IBizContext } from '@ibiz-template/core';
 import { WizardPanelModel } from '@ibiz-template/model';
 import { useControlController } from '../use-control-controller/use-control-controller';
 
@@ -11,16 +10,16 @@ import { useControlController } from '../use-control-controller/use-control-cont
  * @date 2023-02-15 07:37:33
  * @export
  * @param {WizardPanelModel} model
- * @param {IBizContext} context
+ * @param {IContext} context
  * @param {IParams} [params={}]
  * @returns {*}  {WizardPanelController}
  */
 export function useWizardPanelController(
   model: WizardPanelModel,
-  context: IBizContext,
+  context: IContext,
   params: IParams = {},
 ): WizardPanelController {
-  return useControlController<WizardPanelController>(() => {
-    return new WizardPanelController(model, context, params);
+  return useControlController<WizardPanelController>(ctx => {
+    return new WizardPanelController(model, context, params, ctx);
   });
 }

package/src/util/render-provider/render-ctrl-provider.ts

@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { ViewController } from '@ibiz-template/runtime';
+import { Neuron, ViewController } from '@ibiz-template/runtime';
 import { h, resolveComponent, VNode } from 'vue';
 
 /**
@@ -16,8 +16,8 @@ export function renderCtrlProvider(
   controller: ViewController,
   providerName: string,
   props: IParams,
-): (...args: any[]) => VNode | null {
-  return (..._args: any[]) => {
+): (args: IParams) => VNode | null {
+  return (args: IParams) => {
     if (!controller.state.complete) {
       return null;
     }
@@ -25,6 +25,14 @@ export function renderCtrlProvider(
     if (!provider) {
       return null;
     }
+    const { onNeuronInit } = args;
+    if (onNeuronInit) {
+      const oldOnNeuronInit = props.onNeuronInit;
+      props.onNeuronInit = (neuron: Neuron) => {
+        oldOnNeuronInit(neuron);
+        onNeuronInit(neuron);
+      };
+    }
     const component = resolveComponent(provider.component);
     return h(component, { ...props });
   };

package/src/util/route/route.ts

@@ -1,5 +1,5 @@
 import { isNilOrEmpty, notNilEmpty } from 'qx-util';
-import { IBizContext, RuntimeError } from '@ibiz-template/core';
+import { RuntimeError } from '@ibiz-template/core';
 import { IPSApplication, IPSAppView, IPSSubAppRef } from '@ibiz-template/model';
 import qs from 'qs';
 import { RouteLocationNormalizedLoaded as Route } from 'vue-router';
@@ -34,14 +34,14 @@ export function getOwnRouteContext(context: IContext): IParams {
  * @export
  * @param {IPSAppView} appView 视图模型
  * @param {Route} route 路由对象
- * @param {(IBizContext | undefined)} [context] 上下文对象
+ * @param {(IContext | undefined)} [context] 上下文对象
  * @param {(IParams | undefined)} [_params] 视图参数
  * @returns {*}  {string}
  */
 export function generateRoutePath(
   appView: IPSAppView,
   route: Route,
-  context: IBizContext,
+  context: IContext,
   params?: IParams | undefined,
 ): { path: string } {
   const routePath = route2routePath(route);
@@ -66,7 +66,7 @@ export function generateRoutePath(
   }
 
   // 重定向视图跳转的一级首页路由
-  if (routePath.pathNodes[0]?.viewName === 'appredirectview') {
+  if (route.fullPath.startsWith('/appredirectview')) {
     if (params?.srfindexname) {
       routePath.pathNodes[0].viewName = params.srfindexname;
       delete params.srfindexname;

package/out/use/widget/use-pickup-view-panel-controller/use-pickup-view-panel-controller.d.ts

@@ -1,5 +0,0 @@
-import { PickupViewPanelController } from '@ibiz-template/runtime';
-import { IBizContext } from '@ibiz-template/core';
-import { PickupViewPanelModel } from '@ibiz-template/model';
-export declare function usePickupViewPanelController(model: PickupViewPanelModel, context: IBizContext, params?: IParams): PickupViewPanelController;
-//# sourceMappingURL=use-pickup-view-panel-controller.d.ts.map

package/out/use/widget/use-pickup-view-panel-controller/use-pickup-view-panel-controller.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"use-pickup-view-panel-controller.d.ts","sourceRoot":"","sources":["../../../../src/use/widget/use-pickup-view-panel-controller/use-pickup-view-panel-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,wBAAwB,CAAC;AACnE,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAG5D,wBAAgB,4BAA4B,CAC1C,KAAK,EAAE,oBAAoB,EAC3B,OAAO,EAAE,WAAW,EACpB,MAAM,GAAE,OAAY,GACnB,yBAAyB,CAK3B"}

package/out/use/widget/use-pickup-view-panel-controller/use-pickup-view-panel-controller.js

@@ -1,8 +0,0 @@
-import { PickupViewPanelController } from '@ibiz-template/runtime';
-import { useControlController } from '../use-control-controller/use-control-controller';
-export function usePickupViewPanelController(model, context, params = {}) {
-    return useControlController(() => {
-        const c = new PickupViewPanelController(model, context, params);
-        return c;
-    });
-}

package/out/use/widget/use-view-panel-controller/use-view-panel-controller.d.ts

@@ -1,5 +0,0 @@
-import { ViewPanelController } from '@ibiz-template/runtime';
-import { IBizContext } from '@ibiz-template/core';
-import { ViewPanelModel } from '@ibiz-template/model';
-export declare function useViewPanelController(model: ViewPanelModel, context: IBizContext, params?: IParams): ViewPanelController;
-//# sourceMappingURL=use-view-panel-controller.d.ts.map

package/out/use/widget/use-view-panel-controller/use-view-panel-controller.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"use-view-panel-controller.d.ts","sourceRoot":"","sources":["../../../../src/use/widget/use-view-panel-controller/use-view-panel-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAGtD,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,cAAc,EACrB,OAAO,EAAE,WAAW,EACpB,MAAM,GAAE,OAAY,GACnB,mBAAmB,CAKrB"}

package/out/use/widget/use-view-panel-controller/use-view-panel-controller.js

@@ -1,8 +0,0 @@
-import { ViewPanelController } from '@ibiz-template/runtime';
-import { useControlController } from '../use-control-controller/use-control-controller';
-export function useViewPanelController(model, context, params = {}) {
-    return useControlController(() => {
-        const c = new ViewPanelController(model, context, params);
-        return c;
-    });
-}

package/src/use/widget/use-pickup-view-panel-controller/use-pickup-view-panel-controller.ts

@@ -1,15 +0,0 @@
-import { PickupViewPanelController } from '@ibiz-template/runtime';
-import { IBizContext } from '@ibiz-template/core';
-import { PickupViewPanelModel } from '@ibiz-template/model';
-import { useControlController } from '../use-control-controller/use-control-controller';
-
-export function usePickupViewPanelController(
-  model: PickupViewPanelModel,
-  context: IBizContext,
-  params: IParams = {},
-): PickupViewPanelController {
-  return useControlController<PickupViewPanelController>(() => {
-    const c = new PickupViewPanelController(model, context, params);
-    return c;
-  });
-}

package/src/use/widget/use-view-panel-controller/use-view-panel-controller.ts

@@ -1,15 +0,0 @@
-import { ViewPanelController } from '@ibiz-template/runtime';
-import { IBizContext } from '@ibiz-template/core';
-import { ViewPanelModel } from '@ibiz-template/model';
-import { useControlController } from '../use-control-controller/use-control-controller';
-
-export function useViewPanelController(
-  model: ViewPanelModel,
-  context: IBizContext,
-  params: IParams = {},
-): ViewPanelController {
-  return useControlController<ViewPanelController>(() => {
-    const c = new ViewPanelController(model, context, params);
-    return c;
-  });
-}