@ibiz-template/vue3-util 0.5.3-beta.1 → 0.5.3-beta.11

package/es/util/store/async-action/async-action.mjs

@@ -1,5 +1,5 @@
 import dayjs from 'dayjs';
-import { isNumber } from 'lodash-es';
+import { isNumber, isNil } from 'lodash-es';
 import { ref, computed, onUnmounted } from 'vue';
 
 "use strict";
@@ -15,6 +15,13 @@ function formatAsyncAction(data) {
       data[key] = dayjs(data[key]).format("YYYY-MM-DD HH:mm:ss");
     }
   });
+  if (!isNil(data.actionresult)) {
+    try {
+      const json = JSON.parse(data.actionresult);
+      data.actionresult = json;
+    } catch (error) {
+    }
+  }
   return data;
 }
 function useAsyncAction() {
@@ -27,6 +34,7 @@ function useAsyncAction() {
   });
   const load = async () => {
     const res = await ibiz.asyncAction.fetch();
+    res.data.forEach(formatAsyncAction);
     allAsyncActions.value = res.data;
   };
   const asyncActionCallBack = (msg) => {
@@ -37,7 +45,7 @@ function useAsyncAction() {
     const findIndex = allAsyncActions.value.findIndex(
       (item) => item.asyncacitonid === asyncAction.asyncacitonid
     );
-    if (findIndex !== -1) {
+    if (findIndex === -1) {
       allAsyncActions.value.unshift(asyncAction);
       showLength.value += 1;
     } else {

package/lib/index.cjs

@@ -16,6 +16,7 @@ var controlShell = require('./common/control-shell/control-shell.cjs');
 var viewShell = require('./common/view-shell/view-shell.cjs');
 var codeList = require('./common/code-list/code-list.cjs');
 var controlLoadingPlaceholder = require('./common/control-loading-placeholder/control-loading-placeholder.cjs');
+var badge = require('./common/badge/badge.cjs');
 var panelContainer_state = require('./panel-component/panel-container/panel-container.state.cjs');
 var panelContainer_controller = require('./panel-component/panel-container/panel-container.controller.cjs');
 var index = require('./panel-component/panel-container/index.cjs');
@@ -49,13 +50,14 @@ var panelContainerGroup_state = require('./panel-component/panel-container-group
 var panelContainerGroup_controller = require('./panel-component/panel-container-group/panel-container-group.controller.cjs');
 var index$a = require('./panel-component/panel-container-group/index.cjs');
 var index$b = require('./panel-component/panel-tab-page/index.cjs');
+var index$c = require('./panel-component/panel-item-render/index.cjs');
 var appRedirectView = require('./view/app-redirect-view/app-redirect-view.cjs');
-var index$c = require('./view/common/index.cjs');
+var index$d = require('./view/common/index.cjs');
 var todoRedirect = require('./view/todo-redirect/todo-redirect.cjs');
-var index$d = require('./view/portal-view/index.cjs');
-var index$e = require('./view/de-redirect-view/index.cjs');
-var index$f = require('./control/panel/view-layout-panel/index.cjs');
-var index$g = require('./control/panel/panel/index.cjs');
+var index$e = require('./view/portal-view/index.cjs');
+var index$f = require('./view/de-redirect-view/index.cjs');
+var index$g = require('./control/panel/view-layout-panel/index.cjs');
+var index$h = require('./control/panel/panel/index.cjs');
 var pluginFactory = require('./plugin/plugin-factory/plugin-factory.cjs');
 var clickOutside = require('./use/click-outside/click-outside.cjs');
 var useControlController = require('./use/control/use-control-controller/use-control-controller.cjs');
@@ -63,7 +65,7 @@ var event = require('./use/event/event.cjs');
 var focusBlur = require('./use/focus-blur/focus-blur.cjs');
 var namespace = require('./use/namespace/namespace.cjs');
 var route = require('./use/route/route.cjs');
-var index$h = require('./use/util/index.cjs');
+var index$i = require('./use/util/index.cjs');
 var useViewController = require('./use/view/use-view-controller/use-view-controller.cjs');
 var vue = require('./use/vue/vue.cjs');
 var overlayContainer = require('./util/overlay-container/overlay-container.cjs');
@@ -77,7 +79,7 @@ var render = require('./util/render/render.cjs');
 var overlayViewUtil = require('./util/overlay-view-util/overlay-view-util.cjs');
 var appStore = require('./util/store/app-store/app-store.cjs');
 var uiStore = require('./util/store/ui-store/ui-store.cjs');
-var index$i = require('./util/store/index.cjs');
+var index$j = require('./util/store/index.cjs');
 var common = require('./props/common.cjs');
 var textBox = require('./props/editor/text-box.cjs');
 var span = require('./props/editor/span.cjs');
@@ -114,6 +116,7 @@ exports.IBizControlShell = controlShell.IBizControlShell;
 exports.IBizViewShell = viewShell.IBizViewShell;
 exports.IBizCodeList = codeList.IBizCodeList;
 exports.ControlLoadingPlaceholder = controlLoadingPlaceholder.ControlLoadingPlaceholder;
+exports.IBizBadge = badge.IBizBadge;
 exports.PanelContainerState = panelContainer_state.PanelContainerState;
 exports.PanelContainerController = panelContainer_controller.PanelContainerController;
 exports.IBizPanelContainer = index.IBizPanelContainer;
@@ -147,13 +150,14 @@ exports.PanelContainerGroupState = panelContainerGroup_state.PanelContainerGroup
 exports.PanelContainerGroupController = panelContainerGroup_controller.PanelContainerGroupController;
 exports.IBizPanelContainerGroup = index$a.IBizPanelContainerGroup;
 exports.IBizPanelTabPage = index$b.IBizPanelTabPage;
+exports.IBizPanelItemRender = index$c.IBizPanelItemRender;
 exports.AppRedirectView = appRedirectView.AppRedirectView;
-exports.IBizView = index$c.IBizView;
+exports.IBizView = index$d.IBizView;
 exports.TodoRedirect = todoRedirect.TodoRedirect;
-exports.IBizPortalView = index$d.IBizPortalView;
-exports.IBizDeRedirectView = index$e.IBizDeRedirectView;
-exports.IBizViewLayoutPanelControl = index$f.IBizViewLayoutPanelControl;
-exports.IBizPanelControl = index$g.IBizPanelControl;
+exports.IBizPortalView = index$e.IBizPortalView;
+exports.IBizDeRedirectView = index$f.IBizDeRedirectView;
+exports.IBizViewLayoutPanelControl = index$g.IBizViewLayoutPanelControl;
+exports.IBizPanelControl = index$h.IBizPanelControl;
 exports.PluginFactory = pluginFactory.PluginFactory;
 exports.useClickOutside = clickOutside.useClickOutside;
 exports.useControlController = useControlController.useControlController;
@@ -162,8 +166,8 @@ exports.useFocusAndBlur = focusBlur.useFocusAndBlur;
 exports.useNamespace = namespace.useNamespace;
 exports.useRouteKey = route.useRouteKey;
 exports.useRouterQuery = route.useRouterQuery;
-exports.useCtx = index$h.useCtx;
-exports.useMobCtx = index$h.useMobCtx;
+exports.useCtx = index$i.useCtx;
+exports.useMobCtx = index$i.useMobCtx;
 exports.useViewController = useViewController.useViewController;
 exports.EmptyVNode = vue.EmptyVNode;
 exports.getOrigin = vue.getOrigin;
@@ -197,7 +201,7 @@ exports.openViewModal = overlayViewUtil.openViewModal;
 exports.openViewPopover = overlayViewUtil.openViewPopover;
 exports.useAppStore = appStore.useAppStore;
 exports.useUIStore = uiStore.useUIStore;
-exports.piniaInstance = index$i.piniaInstance;
+exports.piniaInstance = index$j.piniaInstance;
 exports.RequiredProp = common.RequiredProp;
 exports.getGridInputIpProps = textBox.getGridInputIpProps;
 exports.getGridInputNumberProps = textBox.getGridInputNumberProps;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/vue3-util",
-  "version": "0.5.3-beta.1",
+  "version": "0.5.3-beta.11",
   "description": "vue3 工具包",
   "type": "module",
   "module": "es/index.mjs",
@@ -31,10 +31,10 @@
   "license": "MIT",
   "devDependencies": {
     "@ibiz-template/cli": "^0.3.10",
-    "@ibiz-template/core": "^0.5.2",
-    "@ibiz-template/runtime": "^0.5.3-beta.1",
+    "@ibiz-template/core": "^0.5.3-beta.11",
+    "@ibiz-template/runtime": "^0.5.3-beta.11",
     "@ibiz-template/theme": "^0.5.0",
-    "@ibiz/model-core": "^0.1.2",
+    "@ibiz/model-core": "^0.1.5",
     "@types/path-browserify": "^1.0.2",
     "@types/qs": "^6.9.11",
     "@types/systemjs": "^6.13.5",
@@ -51,7 +51,7 @@
   "peerDependencies": {
     "@ibiz-template/core": "^0.5.0-beta.0",
     "@ibiz-template/runtime": "^0.5.0-beta.0",
-    "@ibiz/model-core": "^0.1.2",
+    "@ibiz/model-core": "^0.1.5",
     "dayjs": "^1.11.10",
     "path-browserify": "^1.0.1",
     "pinia": "^2.1.7",
@@ -61,5 +61,5 @@
     "vue": "^3.3.4",
     "vue-router": "^4.2.4"
   },
-  "gitHead": "abce1a3f4ba865163181e1e3f33e688726fcddc9"
+  "gitHead": "776931de0bca05f5e83edb1d584e155374776374"
 }

package/src/common/badge/badge.scss

@@ -0,0 +1,29 @@
+$badge: (
+  bg-color: getCssVar(color, danger),
+);
+
+
+@include b(badge) {
+  display: inline-block;
+  padding: 3px 6px;
+  line-height: 1rem;
+  color: #fff;
+  background-color: getCssVar(badge, bg-color);
+  border-radius: 10px;
+
+  @include m(danger){
+    #{getCssVarName(badge, bg-color)}: getCssVar(color,danger);
+  }
+  @include m(success){
+    #{getCssVarName(badge, bg-color)}: getCssVar(color,success);
+  }
+  @include m(warning){
+    #{getCssVarName(badge, bg-color)}: getCssVar(color,warning);
+  }
+  @include m(info){
+    #{getCssVarName(badge, bg-color)}: getCssVar(color,info);
+  }
+  @include m(primary){
+    #{getCssVarName(badge, bg-color)}: getCssVar(color,primary);
+  }
+}

package/src/common/badge/badge.tsx

@@ -0,0 +1,26 @@
+import { defineComponent, PropType } from 'vue';
+import { useNamespace } from '../../use';
+import './badge.scss';
+
+export const IBizBadge = defineComponent({
+  name: 'IBizBadge',
+  props: {
+    value: {
+      type: Number,
+      required: true,
+    },
+    type: {
+      type: String as PropType<
+        'primary' | 'success' | 'warning' | 'danger' | 'info'
+      >,
+      default: 'danger',
+    },
+  },
+  setup() {
+    const ns = useNamespace('badge');
+    return { ns };
+  },
+  render() {
+    return <div class={[this.ns.b(), this.ns.m(this.type)]}>{this.value}</div>;
+  },
+});

package/src/common/index.ts

@@ -6,3 +6,4 @@ export * from './view-shell/view-shell';
 export * from './code-list/code-list';
 export * from './code-list/code-list';
 export * from './control-loading-placeholder/control-loading-placeholder';
+export * from './badge/badge';

package/src/common/view-shell/view-shell.tsx

@@ -1,16 +1,14 @@
 /* eslint-disable no-param-reassign */
 /* eslint-disable vue/no-mutating-props */
 import {
-  convertNavData,
-  getControl,
   getViewProvider,
   IViewProvider,
-  calcDeCodeNameById,
+  getMatchResPath,
 } from '@ibiz-template/runtime';
 import { defineComponent, h, PropType, ref, resolveComponent } from 'vue';
-import { IAppDEXDataView, IAppView } from '@ibiz/model-core';
+import { IAppDataEntity, IAppView } from '@ibiz/model-core';
 import { RuntimeError } from '@ibiz-template/core';
-import { createUUID, notNilEmpty } from 'qx-util';
+import { createUUID } from 'qx-util';
 import { isEmpty, isNil } from 'ramda';
 import { useNamespace } from '../../use';
 import './view-shell.scss';
@@ -42,73 +40,94 @@ export const IBizViewShell = defineComponent({
       }
 
       if (viewModel.dynaSysMode === 1) {
-        // 处理自定义导航上下文
-        const navContexts = viewModel.appViewNavContexts;
-        let context: IParams = {};
-        if (notNilEmpty(navContexts)) {
-          context = convertNavData(
-            navContexts!,
-            props.params || {},
-            props.context,
+        //* 计算实体资源路径上下文参数
+        const appDataEntityId = viewModel.appDataEntityId;
+        let appDe: IAppDataEntity | undefined;
+        if (appDataEntityId) {
+          appDe = await ibiz.hub.getAppDataEntity(
+            appDataEntityId,
+            viewModel.appId,
+          );
+        } else {
+          throw new RuntimeError(
+            `${viewModel.codeName}无实体,暂不支持加载动态模型`,
           );
         }
 
-        // 处理自定义视图参数
-        const navParams = viewModel.appViewNavParams;
-        let params: IParams = {};
-        if (notNilEmpty(navParams)) {
-          params = convertNavData(
-            navParams!,
-            props.params || {},
-            props.context,
-          );
+        /** 加载动态模型的请求参数 */
+        const loadModelParams: IParams = {};
+        // * 计算资源路径上下文参数
+        // 主键
+        const srfkey = props.context[appDe.codeName!.toLowerCase()];
+        if (srfkey) {
+          loadModelParams.srfkey = srfkey;
+        }
+        // 上层资源路径主实体名称和主键
+        const match = getMatchResPath(props.context, appDe);
+        if (match && match.keys.length > 1) {
+          const parentDeKey = match.keys[match.keys.length - 2];
+          loadModelParams.srfparentkey = props.context[parentDeKey];
+          loadModelParams.srfparentdeanme = parentDeKey;
         }
 
-        // 根据当前视图指定的数据部件，查找数据并取 srfwftag 使用
-        const { xdataControlName } = viewModel as IAppDEXDataView;
-        if (xdataControlName) {
-          const ctrl = getControl(viewModel, xdataControlName);
-          if (ctrl) {
-            const deCodeName = calcDeCodeNameById(ctrl.appDataEntityId!);
-            if (context[deCodeName]) {
-              const id = createUUID();
-              // 只要上下文中无 srfsessionid 则生成一个
-              if (
-                isNil(props.context.srfsessionid) ||
-                isEmpty(props.context.srfsessionid)
-              ) {
-                // 生成一个界面域，界面域标识为当前控制器实例的标识
-                const domain = ibiz.uiDomainManager.create(id);
-                context.srfsessionid = domain.id;
+        // 工作流视图加载数据补充srfwftag
+        if (appDe && viewModel.enableWF) {
+          // 处理数据请求的上下文
+          const context: IContext = { ...props.context };
+          // 存在主键则加载数据计算对应的参数
+          if (loadModelParams.srfkey) {
+            const noSrfSessionId =
+              isNil(props.context.srfsessionid) ||
+              isEmpty(props.context.srfsessionid);
+            const id = createUUID();
+            // 只要上下文中无 srfsessionid 则生成一个
+            if (noSrfSessionId) {
+              // 生成一个界面域，界面域标识为当前控制器实例的标识
+              const domain = ibiz.uiDomainManager.create(id);
+              context.srfsessionid = domain.id;
+            }
+
+            const app = ibiz.hub.getApp(viewModel.appId);
+            const service = await app.deService.getService(
+              props.context,
+              appDataEntityId!,
+            );
+            const res = await service.get(context, props.params || {});
+            if (res.ok && res.data) {
+              const { srfwftag, processdefinitionkey, taskdefinitionkey } =
+                res.data;
+              if (srfwftag) {
+                loadModelParams.srfwftag = srfwftag;
               }
 
-              const app = ibiz.hub.getApp(ctrl.appId);
-              const service = await app.deService.getService(
-                props.context,
-                ctrl.appDataEntityId!,
-              );
-              const res = await service.get(
-                { ...props.context, srfsessionid: id },
-                props.params || {},
-              );
-              if (res.ok && res.data) {
-                const { data } = res;
-                const { srfwftag } = data;
-                if (srfwftag) {
-                  params.srfwftag = srfwftag;
+              // *动态工作流编辑视图从数据里额外获取参数
+              if (
+                ['DEWFDYNAEDITVIEW3', 'DEWFDYNAEDITVIEW'].includes(
+                  viewModel.viewType!,
+                )
+              ) {
+                const viewParams = props.params!;
+                // 如果视图参数中没有获取到对应流程实例标识与步骤标识，则从请求回来的数据中获取对应信息
+                if (isNil(viewParams.processDefinitionKey)) {
+                  viewParams.processDefinitionKey = processdefinitionkey;
+                }
+                if (isNil(viewParams.taskDefinitionKey)) {
+                  viewParams.taskDefinitionKey = taskdefinitionkey;
                 }
               }
+            }
+
+            if (noSrfSessionId) {
               ibiz.uiDomainManager.destroy(id);
             }
-          } else {
-            throw new RuntimeError('未找到数据控件');
           }
         }
 
+        // *加载动态模型
         viewModelData.value = await ibiz.hub.loadAppView(
           viewModel.appId,
           viewModel.id!,
-          { ...props.context, ...context, ...params },
+          loadModelParams,
         );
       } else {
         viewModelData.value = viewModel;

package/src/panel-component/index.ts

@@ -10,3 +10,4 @@ export * from './grid-container';
 export * from './panel-container-image';
 export * from './panel-container-group';
 export * from './panel-tab-page';
+export * from './panel-item-render';

package/src/panel-component/nav-pos/nav-pos.tsx

@@ -92,7 +92,7 @@ export const NavPos = defineComponent({
         ? h(resolveComponent('IBizViewShell'), {
             context: navViewMsgs[currentKey].context,
             params: navViewMsgs[currentKey].params,
-            key: navViewMsgs[currentKey].key,
+            key: currentKey,
             viewId: navViewMsgs[currentKey].viewId,
             onCreated: this.onViewCreated,
           })

package/src/panel-component/panel-item-render/index.ts

@@ -0,0 +1,18 @@
+import { registerPanelItemProvider } from '@ibiz-template/runtime';
+import { App } from 'vue';
+import { withInstall } from '../../util';
+import { PanelItemRender } from './panel-item-render';
+import { PanelItemRenderProvider } from './panel-item-render.provider';
+
+export const IBizPanelItemRender = withInstall(
+  PanelItemRender,
+  function (v: App) {
+    v.component(PanelItemRender.name, PanelItemRender);
+    registerPanelItemProvider(
+      'PREDEFINE_RENDER',
+      () => new PanelItemRenderProvider(),
+    );
+  },
+);
+
+export default IBizPanelItemRender;

package/src/panel-component/panel-item-render/panel-item-render.controller.ts

@@ -0,0 +1,52 @@
+import { IControlRender, IPanelContainer } from '@ibiz/model-core';
+import {
+  PanelItemController,
+  ScriptFactory,
+  ViewLayoutPanelController,
+} from '@ibiz-template/runtime';
+
+/**
+ * 面板绘制器控制器
+ *
+ * @author zk
+ * @date 2024-01-15 06:01:08
+ * @export
+ * @class PanelItemRenderController
+ * @extends {PanelItemController<IPanelContainer>}
+ */
+export class PanelItemRenderController extends PanelItemController<IPanelContainer> {
+  /**
+   * 面板控制器
+   *
+   * @author lxm
+   * @date 2022-08-24 22:08:59
+   * @type {PanelController}
+   */
+  declare panel: ViewLayoutPanelController;
+
+  /**
+   * 获取面板绘制器自定义html
+   *
+   * @author zk
+   * @date 2024-01-15 01:01:11
+   * @export
+   * @param {IControlRender[]} controlRenders
+   * @return {*}  {(string | undefined)}
+   */
+  getPanelItemCustomHtml(
+    controlRenders: IControlRender[],
+    data: IData | undefined,
+  ): string | undefined {
+    if (controlRenders.length === 0) {
+      return undefined;
+    }
+    const controlRender = controlRenders[0];
+    if (controlRender.layoutPanelModel) {
+      return ScriptFactory.execScriptFn(
+        { data: data || {} },
+        controlRender.layoutPanelModel,
+        { singleRowReturn: true, isAsync: false },
+      ) as string;
+    }
+  }
+}

package/src/panel-component/panel-item-render/panel-item-render.provider.ts

@@ -0,0 +1,30 @@
+import {
+  IPanelItemProvider,
+  PanelController,
+  PanelItemController,
+} from '@ibiz-template/runtime';
+import { IPanelContainer } from '@ibiz/model-core';
+import { PanelItemRenderController } from './panel-item-render.controller';
+
+/**
+ * 面板绘制器适配器
+ *
+ * @author zk
+ * @date 2024-01-15 06:01:32
+ * @export
+ * @class PanelItemRenderProvider
+ * @implements {IPanelItemProvider}
+ */
+export class PanelItemRenderProvider implements IPanelItemProvider {
+  component: string = 'IBizPanelItemRender';
+
+  async createController(
+    panelItem: IPanelContainer,
+    panel: PanelController,
+    parent: PanelItemController | undefined,
+  ): Promise<PanelItemRenderController> {
+    const c = new PanelItemRenderController(panelItem, panel, parent);
+    await c.init();
+    return c;
+  }
+}

package/src/panel-component/panel-item-render/panel-item-render.tsx

@@ -0,0 +1,50 @@
+import { IPanelContainer } from '@ibiz/model-core';
+import { computed, defineComponent, PropType } from 'vue';
+import { useNamespace } from '../../use';
+import { PanelItemRenderController } from './panel-item-render.controller';
+
+export const PanelItemRender = defineComponent({
+  name: 'IBizPanelItemRender',
+  props: {
+    modelData: {
+      type: Object as PropType<IPanelContainer>,
+      required: true,
+    },
+    controller: {
+      type: PanelItemRenderController,
+      required: true,
+    },
+  },
+  setup(props) {
+    const ns = useNamespace('panel-item-render');
+
+    const nsType = useNamespace(
+      `panel-${props.modelData.itemType?.toLowerCase()}`,
+    );
+
+    const { id } = props.modelData;
+
+    // 类名控制
+    const classArr = computed(() => {
+      const result: Array<string | false> = [
+        ns.b(),
+        ns.m(id),
+        nsType.b(),
+        ns.is('hidden', !props.controller.state.visible),
+      ];
+      return result;
+    });
+
+    const htmlCode = computed(() => {
+      return props.controller.getPanelItemCustomHtml(
+        props.modelData.controlRenders!,
+        props.controller.data,
+      );
+    });
+
+    return { ns, classArr, htmlCode };
+  },
+  render() {
+    return <div class={this.classArr} v-html={this.htmlCode}></div>;
+  },
+});