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

package/src/permission/system-permission/service/index.ts

@@ -1,3 +1,4 @@
+import { ModelCache } from '@oinone/kunlun-engine';
 import { SYSTEM_MODULE_NAME } from '@oinone/kunlun-meta';
 import { GQL } from '@oinone/kunlun-request';
 import { http } from '@oinone/kunlun-service';
@@ -5,6 +6,23 @@ import { GraphqlHelper } from '@oinone/kunlun-shared';
 import type { IPermission } from '../../permission/type';
 import type { AnyPermissionNode, MenuPermissionNode, PermissionNode } from '../../types';
 
+const environmentConfig: {
+  AuthGroupSystemPermissionProxy?: Promise<{ hasFieldPermissions: boolean; hasRowPermission: boolean }>;
+} = {};
+
+const getAuthGroupSystemPermissionProxyConfig = async () => {
+  if (environmentConfig.AuthGroupSystemPermissionProxy) {
+    return environmentConfig.AuthGroupSystemPermissionProxy;
+  }
+  environmentConfig.AuthGroupSystemPermissionProxy = ModelCache.get('auth.AuthGroupSystemPermissionProxy').then(
+    (res) => ({
+      hasFieldPermissions: !!res?.modelFields.some((v) => v.data === 'fieldPermissions'),
+      hasRowPermission: !!res?.modelFields.some((v) => v.data === 'rowPermission')
+    })
+  );
+  return environmentConfig.AuthGroupSystemPermissionProxy;
+};
+
 interface IQueryRole {
   currentPage: number;
   name?: string;
@@ -151,6 +169,7 @@ export const createOrUpdateGroup = async (
     path?: string;
   } = {} as any
 ) => {
+  const { hasFieldPermissions, hasRowPermission } = await getAuthGroupSystemPermissionProxyConfig();
   return GQL.mutation('authGroupSystemPermissionProxy', options.id ? 'update' : 'create')
     .buildRequest((builder) => {
       builder.buildObjectParameter('data', (builder) => {
@@ -163,15 +182,6 @@ export const createOrUpdateGroup = async (
         builder.buildArrayParameter('roles', options.roles, (builder, value) => {
           builder.stringParameter('id', value.id);
         });
-        builder.buildArrayParameter('fieldPermissions', options.fieldPermissions, (builder, value) => {
-          builder.stringParameter('id', value.id);
-          builder.stringParameter('code', value.code);
-          builder.stringParameter('path', value.path);
-          builder.stringParameter('model', value.model);
-          builder.stringParameter('field', value.field);
-          builder.booleanParameter('permRead', value.permRead);
-          builder.booleanParameter('permWrite', value.permWrite);
-        });
         builder.buildArrayParameter('actionPermissions', options.actionPermissions, (builder, value) => {
           builder.stringParameter('id', value.id);
           builder.stringParameter('code', value.code);
@@ -181,22 +191,35 @@ export const createOrUpdateGroup = async (
           builder.stringParameter('name', value.name);
           builder.booleanParameter('canAccess', value.canAccess);
         });
-        const { rowPermission } = options;
-        if (rowPermission) {
-          builder.buildObjectParameter('rowPermission', (builder) => {
-            builder.stringParameter('id', rowPermission.id);
-            builder.stringParameter('code', rowPermission.code);
-            builder.stringParameter('path', rowPermission.path);
-            builder.stringParameter('model', rowPermission.model);
-            builder.stringParameter('filter', rowPermission.filter);
-            builder.stringParameter('domainExp', rowPermission.domainExp);
-            builder.stringParameter('domainExpDisplayName', rowPermission.domainExpDisplayName);
-            builder.stringParameter('domainExpJson', rowPermission.domainExpJson);
-            builder.booleanParameter('permRead', rowPermission.permRead);
-            builder.booleanParameter('permWrite', rowPermission.permWrite);
-            builder.booleanParameter('permDelete', rowPermission.permDelete);
+        if (hasFieldPermissions) {
+          builder.buildArrayParameter('fieldPermissions', options.fieldPermissions, (builder, value) => {
+            builder.stringParameter('id', value.id);
+            builder.stringParameter('code', value.code);
+            builder.stringParameter('path', value.path);
+            builder.stringParameter('model', value.model);
+            builder.stringParameter('field', value.field);
+            builder.booleanParameter('permRead', value.permRead);
+            builder.booleanParameter('permWrite', value.permWrite);
           });
         }
+        if (hasRowPermission) {
+          const { rowPermission } = options;
+          if (rowPermission) {
+            builder.buildObjectParameter('rowPermission', (builder) => {
+              builder.stringParameter('id', rowPermission.id);
+              builder.stringParameter('code', rowPermission.code);
+              builder.stringParameter('path', rowPermission.path);
+              builder.stringParameter('model', rowPermission.model);
+              builder.stringParameter('filter', rowPermission.filter);
+              builder.stringParameter('domainExp', rowPermission.domainExp);
+              builder.stringParameter('domainExpDisplayName', rowPermission.domainExpDisplayName);
+              builder.stringParameter('domainExpJson', rowPermission.domainExpJson);
+              builder.booleanParameter('permRead', rowPermission.permRead);
+              builder.booleanParameter('permWrite', rowPermission.permWrite);
+              builder.booleanParameter('permDelete', rowPermission.permDelete);
+            });
+          }
+        }
       });
     })
     .buildResponse((builder) => {
@@ -314,44 +337,38 @@ export const queryActionsByMenu = async (node: AnyPermissionNode, groupId?: stri
  * 查询权限组字段权限和行权限
  */
 export const queryGroupData = async (node: AnyPermissionNode, groupId?: string) => {
-  const body = `{
-    authGroupSystemPermissionProxyQuery {
-      fetchData(data: {
-          ${GraphqlHelper.buildStringGQLParameter('model', (node as MenuPermissionNode).model)}
-          ${GraphqlHelper.buildNotStringGQLParameter('nodeType', node.nodeType)}
-          ${GraphqlHelper.buildStringGQLParameter('resourceId', node.resourceId)}
-          ${GraphqlHelper.buildStringGQLParameter('path', node.path)}
-          ${GraphqlHelper.buildStringGQLParameter('id', groupId)}
-        }) {
-        fieldPermissions {
-          model
-          field
-          resourceId
-          displayValue
-          description
-          ttype
-          permRead
-          permWrite
-        }
-        rowPermission {
-          model
-          domainExp
-          domainExpDisplayName
-          domainExpJson
-          permRead
-          permWrite
-          permDelete
-        }
+  const { hasFieldPermissions, hasRowPermission } = await getAuthGroupSystemPermissionProxyConfig();
+  if (!hasFieldPermissions && !hasRowPermission) {
+    return {
+      fieldPermissions: null,
+      rowPermission: null
+    };
+  }
+  return GQL.query('authGroupSystemPermissionProxy', 'fetchData')
+    .buildRequest((builder) =>
+      builder.buildObjectParameter('data', (builder) => {
+        builder.stringParameter('model', (node as MenuPermissionNode).model);
+        builder.enumerationParameter('nodeType', node.nodeType);
+        builder.stringParameter('resourceId', node.resourceId);
+        builder.stringParameter('path', node.path);
+        builder.stringParameter('id', groupId);
+      })
+    )
+    .buildResponse((builder) => {
+      if (hasFieldPermissions) {
+        builder.parameter([
+          'fieldPermissions',
+          ['model', 'field', 'resourceId', 'displayValue', 'description', 'ttype', 'permRead', 'permWrite']
+        ]);
       }
-    }
-  }`;
-
-  const res = await http.query('auth', body);
-
-  return res.data.authGroupSystemPermissionProxyQuery.fetchData as unknown as {
-    fieldPermissions: any[];
-    rowPermission: any;
-  };
+      if (hasRowPermission) {
+        builder.parameter([
+          'rowPermission',
+          ['model', 'domainExp', 'domainExpDisplayName', 'domainExpJson', 'permRead', 'permWrite', 'permDelete']
+        ]);
+      }
+    })
+    .request<{ fieldPermissions: any[]; rowPermission: any }>(SYSTEM_MODULE_NAME.AUTH);
 };
 
 /**

package/src/plugins/translate.ts

@@ -1,11 +1,14 @@
 import { translateValueByKey } from '@oinone/kunlun-engine';
-import type { GenericType, StandardString } from '@oinone/kunlun-shared';
+import { GenericType, StandardString } from '@oinone/kunlun-shared';
 import type { Plugin } from 'vue';
 
 export const $translate: Plugin = {
   install: (app) => {
-    app.config.globalProperties.$translate = <T extends StandardString = StandardString>(text: T): T => {
-      return translateValueByKey(text as unknown as GenericType<T>) as unknown as T;
+    app.config.globalProperties.$translate = <T extends StandardString = StandardString>(
+      text: T,
+      context?: Record<string, unknown>
+    ): T => {
+      return translateValueByKey(text as unknown as GenericType<T>, context) as unknown as T;
     };
   }
 };

package/src/shim-translate.d.ts

@@ -2,6 +2,9 @@ export {};
 
 declare module 'vue' {
   interface ComponentCustomProperties {
-    $translate<T extends string | null | undefined = string | null | undefined>(text: T): T;
+    $translate<T extends string | null | undefined = string | null | undefined>(
+      text: T,
+      context?: Record<string, unknown>
+    ): T;
   }
 }

package/src/style/antdComponents/All.scss

@@ -267,33 +267,6 @@ a:hover {
   color: var(--oio-disabled-color);
 }
 
-.ant-select-dropdown {
-  background: var(--oio-select-dropdown-background);
-  box-shadow: var(--oio-select-dropdown-box-shadow);
-  .ant-select-item {
-    color: var(--oio-select-dropdown-color) !important;
-    &:hover {
-      background: var(--oio-select-dropdown-hover-background) !important;
-      color: var(--oio-select-dropdown-hover-color) !important;
-    }
-    &.ant-select-item-option-selected {
-      background: var(--oio-select-dropdown-selected) !important;
-
-      .ant-select-item-option-content {
-        color: var(--oio-select-dropdown-selected-color) !important;
-      }
-    }
-  }
-  .ant-select-item-option-selected:not(.ant-select-item-option-disabled) {
-    color: var(--oio-select-primary-color);
-    background-color: rgba(var(--oio-primary-color-rgb), 0.1);
-  }
-
-  .ant-select-item-option-active:not(.ant-select-item-option-disabled) {
-    background-color: rgba(var(--oio-primary-color-rgb), 0.1);
-  }
-}
-
 .ant-picker-header > button:hover {
   color: var(--oio-primary-color);
 }

package/src/style/root.scss

@@ -1,5 +1,5 @@
 :root {
-  --ss-ant-form-item-label-width: 120px;
+  --ss-ant-form-item-label-width: 128px;
 
   --ss-table-cell-padding-y: 5px;
   --ss-table-head-color: #333;

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>