@ibiz-template/runtime 0.4.4 → 0.4.6-dev.0

package/src/logic-scheduler/executor/app-ui-logic-executor.ts

@@ -118,6 +118,7 @@ export class AppUILogicExecutor extends LogicExecutor {
   ): Promise<IAppUILogicRefViewBase> {
     const appDataEntity = await ibiz.hub.getAppDataEntity(
       parameters.view.model.appDataEntityId!,
+      parameters.view.model.appId,
     )!;
     // [多表单实体] or [索引实体]类型属性
     const typeFileName =
@@ -221,6 +222,7 @@ export class AppUILogicExecutor extends LogicExecutor {
     if (params.srfcopymode) {
       const entity = await ibiz.hub.getAppDataEntity(
         view.model.appDataEntityId!,
+        view.model.appId,
       );
       const key = entity.keyAppDEFieldId;
       if (key && _data) {

package/src/logic-scheduler/scheduler/view-logic-scheduler.ts

@@ -16,7 +16,7 @@ export class ViewLogicScheduler extends LogicScheduler {
       // 视图逻辑的触发类型logicTrigger统一成triggerType
       (logic as IData).triggerType = logic.logicTrigger!;
     });
-    super(logics as ISchedulerLogic[]);
+    super(logics as IData[] as ISchedulerLogic[]);
   }
 
   /**

package/src/model/data-entity/data-entity.ts

@@ -43,7 +43,7 @@ export function hasDeCodeName(params: IParams, entityId: string): boolean {
 export async function getDeACMode(
   appDEACModeId: string,
   entityId: string,
-  srfappid?: string,
+  srfappid: string,
 ): Promise<IAppDEACMode | undefined> {
   const appDataEntity = await ibiz.hub.getAppDataEntity(entityId, srfappid)!;
   const deACMode = appDataEntity.appDEACModes?.find((mode: IAppDEACMode) => {

package/src/model/main-state/main-state.ts

@@ -48,7 +48,7 @@ export function calcMainStateOPPrivsStrs(
   mainState: IDEMainState,
   appDataEntity: IAppDataEntity,
 ): string[] {
-  const app = ibiz.hub.getApp().model;
+  const app = ibiz.hub.getApp(appDataEntity.appId).model;
   const { demainStateOPPrivs, opprivAllowMode } = mainState;
   const mainStateOPPrivIds = demainStateOPPrivs?.map(item => item.name!) || [];
   let opprivs: string[] = [];

package/src/model/utils/util.ts

@@ -3,6 +3,7 @@ import {
   IAppView,
   IAppViewRef,
   IControl,
+  IControlRender,
   IModelObject,
   IPanel,
   ISysPFPlugin,
@@ -125,7 +126,7 @@ export function parseUserParams(userParams: Record<string, string>): {
  * @param {string} [appId] 当前所在应用标识
  * @return {*}  {ISysPFPlugin}
  */
-export function getPFPlugin(id: string, appId?: string): ISysPFPlugin {
+export function getPFPlugin(id: string, appId: string): ISysPFPlugin {
   const app = ibiz.hub.getApp(appId);
   if (!app) {
     throw new RuntimeModelError(app, '未找到应用');
@@ -151,7 +152,9 @@ export function getPFPlugin(id: string, appId?: string): ISysPFPlugin {
  * @param {IControl} control
  * @return {*}  {(IPanel | undefined)}
  */
-export function getControlPanel(control: IControl): IPanel | undefined {
+export function getControlPanel(control: {
+  controlRenders?: IControlRender[];
+}): IPanel | undefined {
   let layoutPanel: IPanel | undefined;
   if (control.controlRenders) {
     const panelRender = control.controlRenders.find(

package/src/plugin/plugin-static-resource/plugin-static-resource.ts

@@ -48,8 +48,7 @@ export class PluginStaticResource {
    */
   constructor(mateUrl: string) {
     this.url = new URL(mateUrl);
-    const dir = path.dirname(this.url.pathname);
-    this.baseDir = dir;
+    this.baseDir = path.dirname(this.url.pathname);
   }
 
   /**
@@ -61,7 +60,7 @@ export class PluginStaticResource {
    * @return {*}  {string}
    */
   dir(pathStr: string): string {
-    return path.resolve(this.baseDir, pathStr);
+    return this.url.origin + path.resolve(this.baseDir, pathStr);
   }
 
   /**

package/src/register/helper/common-register.ts

@@ -9,7 +9,7 @@
  */
 export async function getPluginRegisterKey(
   pluginId: string,
-  appId?: string,
+  appId: string,
 ): Promise<string | undefined> {
   const app = ibiz.hub.getApp(appId);
 

package/src/service/service/control/control.service.ts

@@ -43,8 +43,8 @@ export class ControlService<T extends IControl = IControl> {
    * @date 2022-08-18 22:08:30
    * @returns {*}  {Promise<void>}
    */
-  async init(context?: IContext): Promise<void> {
-    this.app = ibiz.hub.getApp(context?.srfappid);
+  async init(_context?: IContext): Promise<void> {
+    this.app = ibiz.hub.getApp(this.model.appId);
     this.initUIDataMap();
   }
 

package/src/service/utils/dynamic-code-list/dynamic-code-list.ts

@@ -154,7 +154,7 @@ export class DynamicCodeListCache {
       iconPathAppDEFieldId ||
       iconPathXAppDEFieldId
     ) {
-      result.sysImage = {};
+      result.sysImage = { appId: this.codeList.appId };
       // 图标样式属性
       if (iconClsAppDEFieldId) {
         result.sysImage.cssClass = data[iconClsAppDEFieldId];
@@ -178,9 +178,15 @@ export class DynamicCodeListCache {
     }
     // 数据属性
     if (dataAppDEFieldId && data[dataAppDEFieldId]) {
-      result.data = ScriptFactory.execSingleLine(
-        data[dataAppDEFieldId],
-      ) as IData;
+      try {
+        result.data = ScriptFactory.execSingleLine(
+          data[dataAppDEFieldId],
+        ) as IData;
+      } catch (error) {
+        ibiz.log.error(
+          '动态代码表数据属性返回值不为对象格式的字符串，无法转换！',
+        );
+      }
     }
     return result;
   }

package/src/ui-action/provider/front-ui-action-provider.ts

@@ -132,6 +132,7 @@ export class FrontUIActionProvider extends UIActionProviderBase {
     );
     const appDataEntity = await ibiz.hub.getAppDataEntity(
       action.appDataEntityId!,
+      action.appId,
     );
     const appDEPrint = appDataEntity.appDEPrints?.find(print => {
       return print.id === action.appDEPrintId;
@@ -199,6 +200,7 @@ export class FrontUIActionProvider extends UIActionProviderBase {
   ): Promise<IUIActionResult> {
     const appDataEntity = await ibiz.hub.getAppDataEntity(
       action.appDataEntityId!,
+      action.appId,
     );
     const appDEDataImport = appDataEntity.appDEDataImports?.find(
       dataImport => dataImport.id === action.appDEDataImportId,
@@ -251,6 +253,7 @@ export class FrontUIActionProvider extends UIActionProviderBase {
 
     const appDataEntity = await ibiz.hub.getAppDataEntity(
       action.appDataEntityId!,
+      action.appId,
     );
     const appDEDataExport = appDataEntity.appDEDataExports?.find(dataExport => {
       return dataExport.id === action.appDEDataExportId;

package/src/ui-action/provider/index.ts

@@ -3,6 +3,7 @@ import { BackendUIActionProvider } from './backend-ui-action-provider';
 import { SysUIActionProvider } from './sys-ui-action-provider';
 import { FrontUIActionProvider } from './front-ui-action-provider';
 import { WFWithdrawUIActionProvider } from './wf-withdraw-ui-action-provider';
+import { UIActionProviderBase } from './ui-action-provider-base';
 
 /**
  * 预置默认的界面行为适配器
@@ -36,4 +37,5 @@ export {
   SysUIActionProvider,
   BackendUIActionProvider,
   WFWithdrawUIActionProvider,
+  UIActionProviderBase,
 };

package/src/utils/theme-util/theme-util.ts

@@ -1,4 +1,5 @@
 import { IAppUITheme, ISysPFPlugin } from '@ibiz/model-core';
+import { clone } from 'ramda';
 
 /**
  * 主题工具类
@@ -28,15 +29,52 @@ export class ThemeUtil {
    * @return {*}  {Promise<void>}
    */
   async loadTheme(theme: IAppUITheme): Promise<void> {
-    const data = theme.themeParams || {};
+    const data = clone(theme.themeParams || {});
+    const path = data['theme-package-path'];
+    delete data.appId;
+    delete data['theme-package-path'];
     await ibiz.plugin.loadPlugin({
       runtimeObject: true,
       rtobjectName: theme.name,
-      rtobjectRepo: data['theme-package-path'],
+      rtobjectRepo: path,
     } as unknown as ISysPFPlugin);
+    this.setThemeParams(theme, data);
     this.setTheme(theme.themeTag!);
   }
 
+  /**
+   * 设置额外修改的主题参数
+   *
+   * @author chitanda
+   * @date 2023-12-05 11:12:00
+   * @protected
+   * @param {IAppUITheme} theme
+   * @param {Record<string, string>} params
+   * @return {*}  {void}
+   */
+  protected setThemeParams(
+    theme: IAppUITheme,
+    params: Record<string, string>,
+  ): void {
+    const themeStyle = document.getElementById(theme.themeTag!);
+    if (themeStyle) {
+      return;
+    }
+    let content = `:root.${theme.themeTag!}{`;
+    for (const key in params) {
+      if (Object.prototype.hasOwnProperty.call(params, key)) {
+        const val = params[key];
+        content += `${key}: ${val}${val.endsWith(';') ? '' : ';'}`;
+      }
+    }
+    content += '}';
+    const script = document.createElement('style');
+    script.id = theme.themeTag!;
+    script.type = 'text/css';
+    script.innerHTML = content;
+    document.head.appendChild(script);
+  }
+
   /**
    * 设置主题
    *