@oinone/kunlun-vue-admin-base 7.1.0 → 7.2.0

package/src/tags/context/runtime-context-helper.ts

@@ -35,7 +35,7 @@ export function seekViewMask(viewAction: RuntimeViewAction, moduleName?: string)
   if (!maskTemplate) {
     maskTemplate = viewAction.resMaskDefinition?.template as string;
     if (maskTemplate) {
-      debugConsole.log('使用后端mask', maskTemplate);
+      debugConsole.log('Use backend mask', maskTemplate);
     }
   }
   let finalMaskTemplate: DslDefinition;
@@ -74,7 +74,7 @@ function seekViewLayout(
             debugConsole.warn('JSON parse debug layout error', debugLayout);
           }
         }
-        debugConsole.log('使用后端layout', debugLayout);
+        debugConsole.log('Use backend layout', debugLayout);
       });
     }
   }
@@ -115,7 +115,7 @@ export function createRuntimeContextByViewAction(
   const { id: resViewId, name: resViewName, dsl, template } = resView;
   const runtimeContext = RuntimeContextManager.createOrReplace(
     nodeHandle,
-    RuntimeContextManager.get(rootHandle || useInjectMetaContext()?.rootHandle?.value)
+    RuntimeContextManager.get(rootHandle || useInjectMetaContext().rootHandle?.value)
   );
   runtimeContext.viewAction = viewAction;
   const finalModel = resModel || model;
@@ -153,7 +153,7 @@ export function createRuntimeContextByView(
   const { type, name, model, modelName, module, moduleName, dsl, template } = view;
   const runtimeContext = RuntimeContextManager.createOrReplace(
     nodeHandle,
-    RuntimeContextManager.get(rootHandle || useInjectMetaContext()?.rootHandle?.value)
+    RuntimeContextManager.get(rootHandle || useInjectMetaContext().rootHandle?.value)
   );
   runtimeContext.view = view;
   const viewLayout = seekViewLayout(view, inline, undefined, type, {
@@ -187,7 +187,7 @@ export function createRuntimeContextByFieldSubview(
   const { type, name, model, modelName, module, moduleName, dsl, template } = view;
   const runtimeContext = RuntimeContextManager.createOrReplace(
     nodeHandle,
-    RuntimeContextManager.get(rootHandle || useInjectMetaContext()?.rootHandle?.value)
+    RuntimeContextManager.get(rootHandle || useInjectMetaContext().rootHandle?.value)
   );
   runtimeContext.view = view;
   runtimeContext.field = field;
@@ -224,7 +224,7 @@ export function createOrUpdateRuntimeContextByDslDefinition(dslDefinition: DslDe
   } = useInjectMetaContext();
   const runtimeContext = RuntimeContextManager.createOrReplace(
     nodeHandle,
-    RuntimeContextManager.get(useInjectMetaContext()?.rootHandle.value)
+    RuntimeContextManager.get(useInjectMetaContext().rootHandle.value)
   );
   let { type, model, modelName, module, moduleName } = dslDefinition;
   const { name, filter, domain, initialValue, context } = dslDefinition;

package/src/tags/resolve/internal/widget-resolve.ts

@@ -7,7 +7,7 @@ import {
   type RuntimeModelField,
   type RuntimeViewAction
 } from '@oinone/kunlun-engine';
-import { type IDslNode, ViewType } from '@oinone/kunlun-meta';
+import { ActionType, type IDslNode, ViewType } from '@oinone/kunlun-meta';
 import { CastHelper, debugConsole, instantiate } from '@oinone/kunlun-shared';
 import { getWidget, getWidgetNotNull, newVueWidget, type RenderWidget, VueWidget } from '@oinone/kunlun-vue-widget';
 import {
@@ -221,6 +221,10 @@ export function createActionWidget(props: ActionWidgetProps): RenderWidget | und
       action = metadataAction;
     }
   }
+  action = {
+    ...action,
+    actionType: action.actionType || ActionType.Client
+  };
   const { type: viewType, name: viewName } = view;
   const options: BaseActionOptions = {
     viewType,

package/src/util/collection-actions.ts

@@ -62,7 +62,7 @@ export class CollectionActions {
       } else {
         this.otherVNodes.push(vnode);
         if (isDev()) {
-          console.warn('无法识别的标签类型', vnode);
+          console.warn('Unrecognized tag type', vnode);
           this.hasMore = false;
           return false;
         }

package/src/util/jumpDesignerPage.ts

@@ -3,9 +3,6 @@ import { type IModel, type IModule, type IViewAction, ViewActionTarget, ViewType
 import { getModel, queryOne } from '@oinone/kunlun-service';
 import { CastHelper } from '@oinone/kunlun-shared';
 
-/**
- * 跳转到模型设计器
- */
 export const onJumpModelDesigner = async (module: IModel, modelDesignerDisplayType: 'list' | 'graph' = 'list') => {
   localStorage.setItem('modelDisplayType', modelDesignerDisplayType);
   localStorage.setItem('isLowCode', 'true');
@@ -15,47 +12,43 @@ export const onJumpModelDesigner = async (module: IModel, modelDesignerDisplayTy
 
   const model = await getModel('designer.DesignerModelDefinition');
   const action = model.viewActionList?.find((a) => a.name === 'homepage');
-
   if (action) {
     executeViewAction(
-      CastHelper.cast(action),
+      {
+        ...CastHelper.cast(action),
+        resModule: 'model_designer',
+        resModuleName: 'modelDesigner'
+      },
       undefined,
       undefined,
-      { appSwitcherName: '模型设计器', hideMenu: true, module: action.moduleName, sessionPath: null },
+      { sessionPath: null },
       RedirectTargetEnum.BLANK
     );
   }
 };
 
-/**
- * 跳转到逻辑设计器
- */
 export const onJumpWorkflowDesigner = async (moduleModule) => {
   const model = await getModel('workflow.WorkflowDesigner');
   const action = model.viewActionList?.find((a) => a.name === 'homepage');
-
   if (action) {
     executeViewAction(
       {
         ...CastHelper.cast(action),
-        resModule: 'workflowDesigner',
+        resModule: 'workflow_designer',
         resModuleName: 'workflowDesigner'
       },
       undefined,
       undefined,
-      { appSwitcherName: '流程设计器', hideMenu: true, sessionPath: null },
+      { sessionPath: null },
       RedirectTargetEnum.BLANK
     );
   }
 };
 
-/**
- * 跳转到界面设计器设计页
- */
 export const onJumpUiDesigner = async (viewId?: string) => {
   if (viewId) {
     const action = (await queryOne('base.ViewAction', {
-      name: 'ui_designer_界面设计器页面编辑',
+      name: 'UiDesignerViewActionPageEdit',
       model: 'ui.designer.UiDesignerView'
     })) as IViewAction;
     if (action) {
@@ -70,7 +63,7 @@ export const onJumpUiDesigner = async (viewId?: string) => {
         RedirectTargetEnum.BLANK
       );
     }
-    console.error('跳转至页面设计页面异常');
+    console.error('Jump to page design page exception');
   }
 };
 
@@ -98,18 +91,12 @@ export const onJumpUiDesignerHomePage = async (module: IModule, isJumpHomepage?:
     resModuleName: 'uiDesigner',
     target: ViewActionTarget.Router
   } as RuntimeViewAction;
-  const param = { appSwitcherName: '界面设计器', hideMenu: true };
-  if (isJumpHomepage) {
-    param['createViewSource'] = 'HOME_PAGE';
-  }
   if (action) {
     executeViewAction(
-      CastHelper.cast(action),
+      action,
       undefined,
       undefined,
       {
-        appSwitcherName: '界面设计器',
-        hideMenu: true,
         createViewSource: 'HOME_PAGE',
         module: 'uiDesigner',
         sessionPath: null

package/src/view/application-screen/apps-business-screen/components/Card.vue

@@ -47,8 +47,8 @@ export default defineComponent({
     return {
       genStaticPath,
       translateValueByKey,
-      appTag: `${genStaticPath('标签1_1651399484151.png')}`,
-      moduleTag: `${genStaticPath('标签2_1651399538680.png')}`
+      appTag: `${genStaticPath('tag1.png')}`,
+      moduleTag: `${genStaticPath('tag2.png')}`
     };
   },
   methods: {

package/src/view/application-screen/apps-business-screen/components/RelationGraph.vue

@@ -170,8 +170,8 @@ export default defineComponent({
                                 <div class="application-text">
                                   <img style="width: 26px" src="${
                                     _config.application
-                                      ? `${genStaticPath('标签1_1651399484151.png')}`
-                                      : `${genStaticPath('标签2_1651399538680.png')}`
+                                      ? `${genStaticPath('tag1.png')}`
+                                      : `${genStaticPath('tag2.png')}`
                                   }" alt="" />
                                 </div>
                               </div>