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

package/src/field/table-layout-column/TableLayoutColumnWidget.ts

@@ -1,9 +1,9 @@
 import { DslDefinition, DslDefinitionHelper, DslSlotUtils, ViewDslDefinition } from '@oinone/kunlun-dsl';
-import { ActiveRecords, createDefaultLayout } from '@oinone/kunlun-engine';
+import { ActiveRecords, createDefaultLayout, resolveTemplate } from '@oinone/kunlun-engine';
 import { ViewMode, ViewType } from '@oinone/kunlun-meta';
-import { StringHelper } from '@oinone/kunlun-shared';
+import { Optional, StringHelper } from '@oinone/kunlun-shared';
 import { SPI } from '@oinone/kunlun-spi';
-import type { RenderCellContext, RowContext } from '@oinone/kunlun-vue-ui';
+import { GROUP_TREE_KEY, RenderCellContext, RowContext } from '@oinone/kunlun-vue-ui';
 import { DslRender, Widget } from '@oinone/kunlun-vue-widget';
 import { cloneDeep } from 'lodash-es';
 import { VNode } from 'vue';
@@ -20,6 +20,11 @@ export interface LayoutColumnLoadedData {
   })
 )
 export class TableLayoutColumnWidget extends BaseTableColumnWidget {
+  @Widget.Reactive()
+  public get minWidth() {
+    return Optional.ofNullable(this.getDsl().minWidth).orElseGet(() => this.computeDefaultMinWidth());
+  }
+
   @Widget.Method()
   public className(context: RenderCellContext): string[] {
     return StringHelper.append(['table-column-layout'], super.className(context));
@@ -30,27 +35,43 @@ export class TableLayoutColumnWidget extends BaseTableColumnWidget {
     return StringHelper.append(['table-header-column-layout'], super.headerClassName(context));
   }
 
+  @Widget.Reactive()
+  public get sortable(): boolean {
+    return false;
+  }
+
+  @Widget.Reactive()
+  public get enableGrouping(): boolean {
+    return false;
+  }
+
+  @Widget.Reactive()
+  public get editable(): boolean {
+    return false;
+  }
+
   public initialize(props) {
     super.initialize(props);
     const viewDslNode = this.template?.widgets?.find((v) => DslDefinitionHelper.isView(v)) as ViewDslDefinition;
     if (viewDslNode) {
-      this.generatorViewDslDefinition(viewDslNode);
+      this.currentViewDsl = this.generatorViewDslDefinition(viewDslNode);
+      resolveTemplate(this.rootRuntimeContext, this.currentViewDsl);
     }
     return this;
   }
 
   @Widget.Reactive()
-  private viewDslDefinition: DslDefinition | undefined;
+  protected currentViewDsl: DslDefinition | undefined;
 
-  public getViewDslDefinition(context?: RowContext): DslDefinition | undefined {
-    return this.viewDslDefinition;
-  }
-
-  public setViewDslDefinition(viewDslDefinition: DslDefinition | undefined) {
-    this.viewDslDefinition = viewDslDefinition;
+  public getViewDsl(context?: RowContext): DslDefinition | undefined {
+    const isGroupRow = !!context?.data?.[GROUP_TREE_KEY.CHILDREN_KEY];
+    if (isGroupRow) {
+      return undefined;
+    }
+    return this.currentViewDsl;
   }
 
-  protected generatorViewDslDefinition(viewDslNode: ViewDslDefinition) {
+  protected generatorViewDslDefinition(viewDslNode: ViewDslDefinition): DslDefinition {
     let { type: viewType } = viewDslNode;
     if (!viewType) {
       viewType = ViewType.Detail;
@@ -61,14 +82,13 @@ export class TableLayoutColumnWidget extends BaseTableColumnWidget {
     }
     const layout = this.generatorLayout(viewType);
     if (layout) {
-      this.setViewDslDefinition(DslSlotUtils.mergeTemplateToLayout(layout, viewDslNode));
-    } else {
-      this.setViewDslDefinition(viewDslNode);
+      return DslSlotUtils.mergeTemplateToLayout(layout, viewDslNode);
     }
+    return viewDslNode;
   }
 
   protected generatorLayout(viewType: ViewType): DslDefinition | undefined {
-    return createDefaultLayout(viewType, false);
+    return createDefaultLayout(viewType, true);
   }
 
   protected loadData(context: RowContext): LayoutColumnLoadedData {
@@ -85,7 +105,7 @@ export class TableLayoutColumnWidget extends BaseTableColumnWidget {
 
   @Widget.Method()
   public renderDefaultSlot(context: RowContext): VNode[] | string {
-    const dslDefinition = this.getViewDslDefinition(context);
+    const dslDefinition = this.getViewDsl(context);
     if (this.invisible || !dslDefinition) {
       return [];
     }

package/src/file/excel/service/ExcelExportService.ts

@@ -78,7 +78,7 @@ export class ExcelExportService {
       data
     );
     if (!result) {
-      throw new Error('创建导出任务失败');
+      throw new Error('Failed to create export task');
     }
     return result;
     // fixme @zbh 20240805 5.1 using static metadata

package/src/file/print/service/PrintService.ts

@@ -42,7 +42,7 @@ export class PrintService {
       data
     );
     if (!result) {
-      throw new Error('创建打印任务失败');
+      throw new Error('Failed to create print job');
     }
     return result;
     // fixme @zbh 20240805 5.1 using static metadata

package/src/icon-manage/view/search/IconSearch.vue

@@ -1,6 +1,5 @@
 <script lang="ts">
 import { translateValueByKey } from '@oinone/kunlun-engine';
-import { ModelFieldType } from '@oinone/kunlun-meta';
 import {
   OioSpin,
   PropRecordHelper,
@@ -105,29 +104,16 @@ export default defineComponent({
   render() {
     const { onUploadIcon, $translate } = this;
 
-    const searchContent = () => {
-      const fieldChildren = PropRecordHelper.collectionSlots(this.$slots, [{ origin: 'default', isNotNull: true }])
-        .default()
-        .map((fieldVNode) => {
-          if (fieldVNode.props && fieldVNode.props.dslDefinition) {
-            fieldVNode.props.dslDefinition.labelCol = { style: { 'flex-basis': '0px' } };
-            fieldVNode.props.dslDefinition.wrapperCol = { style: { 'max-width': '100%' } };
-            if (fieldVNode.props.ttype === ModelFieldType.DateTime) {
-              fieldVNode.props.colStyle = { flex: '0 0 40%' };
-            } else {
-              fieldVNode.props.colStyle = { flex: '0 0 20%', 'max-width': '20%' };
-            }
-          }
-          return fieldVNode;
-        });
-
-      const actions = PropRecordHelper.collectionSlots(this.$slots, [{ origin: 'actions', isNotNull: true }]).actions();
-
-      const iconButtons = createIconButton({ onUploadIcon, $translate, actions });
+    const { default: defaultSlot, actions: actionSlot } = PropRecordHelper.collectionSlots(this.$slots, [
+      { origin: 'default', isNotNull: true },
+      { origin: 'actions', isNotNull: true }
+    ]);
 
+    const searchContent = () => {
+      const iconButtons = createIconButton({ onUploadIcon, $translate, actions: actionSlot() });
       return [
         createVNode('div', { class: 'default-iconSearch-searchContent' }, [
-          createVNode('div', { class: 'default-iconSearch-searchContent-field' }, fieldChildren),
+          createVNode('div', { class: 'default-iconSearch-searchContent-field' }, defaultSlot()),
           createVNode('div', { class: 'default-iconSearch-searchContent-button' }, iconButtons)
         ])
       ];
@@ -149,20 +135,28 @@ export default defineComponent({
       ];
     };
 
-    const defaultSlot = () => {
-      return [
-        ...searchContent(),
-        createVNode(
-          OioSpin,
-          { loading: !this.groupList?.length, wrapperClassName: 'default-iconSearch-item default-iconSearch-group' },
-          () => createVNode('div', { style: { display: 'flex' } }, groupContent())
-        )
-      ];
-    };
-
-    return withDirectives(createVNode('div', { class: 'default-iconSearch' }, { default: defaultSlot }), [
-      [vShow, !this.invisible]
-    ]);
+    return withDirectives(
+      createVNode(
+        'div',
+        { class: 'default-iconSearch' },
+        {
+          default: () => {
+            return [
+              ...searchContent(),
+              createVNode(
+                OioSpin,
+                {
+                  loading: !this.groupList?.length,
+                  wrapperClassName: 'default-iconSearch-item default-iconSearch-group'
+                },
+                () => createVNode('div', { style: { display: 'flex' } }, groupContent())
+              )
+            ];
+          }
+        }
+      ),
+      [[vShow, !this.invisible]]
+    );
   }
 });
 </script>

package/src/icon-manage/view/search/style/IconSearch.scss

@@ -9,48 +9,52 @@
   flex-direction: column;
   gap: calc(var(--oio-row-gap) - 10px);
 
-  > .default-iconSearch {
-    &-searchContent {
-      width: 100%;
+  &-searchContent {
+    width: 100%;
+    display: flex;
+    column-gap: var(--oio-row-gap);
+    align-items: center;
+    justify-content: space-between;
+
+    &-field {
       display: flex;
-      align-items: center;
-      justify-content: space-between;
-      & > .default-iconSearch-searchContent {
-        &-field {
-          flex: 0 0 80%;
-          display: flex;
-          gap: var(--oio-row-gap);
-
-          & > .ant-form-item {
-            flex-flow: row nowrap;
-            align-items: center;
-            margin-bottom: 0;
-            flex: 0 0 20%;
-
-            &[data-name='createDate'] {
-              flex: 0 0 40%;
-            }
-
-            .oio-icon-oinone-sousuo {
-              --oio-icon-color: #979797 !important;
-            }
+      flex: 1;
+      gap: var(--oio-row-gap);
+
+      & > .ant-form-item {
+        margin-bottom: 0;
+
+        & > .ant-form-item-row {
+          flex-wrap: nowrap;
+          align-items: center;
+          column-gap: 8px;
+
+          & > .ant-form-item-label {
+            flex-basis: 78px;
+          }
+
+          & > .ant-form-item-control {
+            width: unset;
           }
         }
 
-        &-button {
-          flex: 0 0 18%;
-          display: flex;
-          justify-content: flex-end;
-          gap: var(--oio-row-gap);
+        & > .ant-form-item-row[data-name='displayName'] > .ant-form-item-label {
+          flex-basis: 120px;
         }
       }
     }
 
-    &-item {
-      width: 100%;
+    &-button {
+      display: flex;
+      justify-content: flex-end;
+      gap: var(--oio-row-gap);
     }
+  }
 
-    &-group {
-    }
+  &-item {
+    width: 100%;
+  }
+
+  &-group {
   }
 }

package/src/main-view/DefaultMetadataMainViewWidget.ts

@@ -269,7 +269,7 @@ export class DefaultMetadataMainViewWidget extends MetadataViewWidget {
     }
     if (!runtimeViewAction) {
       OioNotification.error(translateValueByKey('错误'), translateValueByKey('页面初始化异常'));
-      throw new Error('页面初始化异常');
+      throw new Error('Page initialization error');
     }
     setSessionPath(runtimeViewAction.sessionPath);
     return runtimeViewAction;

package/src/main.ts

@@ -1,4 +1,5 @@
 import {
+  CurrentLanguage,
   frameworkFactory,
   type FrameworkInitializeService,
   FrameworkInitializeSPI,
@@ -14,6 +15,7 @@ import { SPIFactory } from '@oinone/kunlun-spi';
 import { maskInstall } from '@oinone/kunlun-vue-admin-layout';
 import { Boot } from '@wangeditor/editor';
 import attachmentModule from '@wangeditor/plugin-upload-attachment';
+import moment from 'moment';
 import { type App, getCurrentInstance } from 'vue';
 import { createApp as CreateVueApp } from './create_app';
 import enUs from './locale/en_US';
@@ -38,6 +40,9 @@ export class VueFrameworkInitializeService implements FrameworkInitializeService
   public after(props: OioProviderProps) {
     maskInstall();
     install();
+    CurrentLanguage.getIsoCode().then((isoCode) => {
+      moment.locale(isoCode);
+    });
     const app = RuntimeContextManager.createOrReplace<App>().frameworkInstance;
     app.mount('#app');
   }

package/src/permission/permission/field/FieldPermissionWidget.ts

@@ -2,9 +2,8 @@ import { type ActiveRecord, type RuntimeO2MField, SubmitValue, ViewCache } from
 import { ViewType } from '@oinone/kunlun-meta';
 import { HttpClient } from '@oinone/kunlun-request';
 import { CallChaining } from '@oinone/kunlun-shared';
-import { SPI } from '@oinone/kunlun-spi';
 import { Widget } from '@oinone/kunlun-vue-widget';
-import { AsyncFormSubviewListFieldWidget, FormFieldWidget } from '../../../basic';
+import { AsyncFormSubviewListFieldWidget } from '../../../basic';
 import { createRuntimeContextForWidget } from '../../../tags';
 import { type IPermission, ResourcePermissionFieldGroupsModel, ResourcePermissionModel } from '../type';
 import FieldPermission from './FieldPermission.vue';
@@ -12,7 +11,6 @@ import { ModelTableWidget, PermissionTableWidget } from './internal-widget';
 
 const http = HttpClient.getInstance();
 
-@SPI.ClassFactory(FormFieldWidget.Token({ widget: 'field-permission' }))
 export class FieldPermissionWidget extends AsyncFormSubviewListFieldWidget<RuntimeO2MField> {
   @Widget.Reactive()
   public get disabled() {
@@ -100,7 +98,7 @@ export class FieldPermissionWidget extends AsyncFormSubviewListFieldWidget<Runti
       const queryStr = `{
           interactionPermissionQuery {
             colPermissions(interactionPermission: {
-              ${this.formData.id ? `roleId: ${this.formData.id}` : ''}, 
+              ${this.formData.id ? `roleId: ${this.formData.id}` : ''},
               model:"${modelName}",
             }) {
               colPermissions {

package/src/permission/permission/field/index.ts

@@ -1,3 +1 @@
-export * from './ActionPermissionWidget';
-export * from './DataPermissionWidget';
 export * from './FieldPermissionWidget';

package/src/permission/permission/index.ts

@@ -1,2 +1 @@
 export * from './field';
-export * from './action';

package/src/permission/system-permission/PermissionWidget.ts

@@ -1,7 +1,6 @@
 import { SPI } from '@oinone/kunlun-spi';
 import { Widget } from '@oinone/kunlun-vue-widget';
 import { BaseElementWidget } from '../../basic';
-
 import CustomView from './Permission.vue';
 import type { IPermissionDslActions } from './types';
 
@@ -22,17 +21,19 @@ export class PermissionWidget extends BaseElementWidget {
   @Widget.Reactive()
   protected get permissionActions(): IPermissionDslActions {
     return {
-      hasModifyRoleAction: !!this.dslActions.find((a) => a.name === 'modifyRole'),
-      hasModifyManagementRoleAction: !!this.dslActions.find((a) => a.name === 'modifyManagementRole'),
-      hasPermissionUpdateAction: !!this.dslActions.find((a) => a.name === 'update'),
-      hasPermissionCreateAction: !!this.dslActions.find((a) => a.name === 'create'),
-      hasPermissionCreateBatchAction: !!this.dslActions.find((a) => a.name === 'authorizes'),
-      hasActiveGroupAction: !!this.dslActions.find((a) => a.name === 'active'),
-      hasCancelGroupAction: !!this.dslActions.find((a) => a.name === 'disable'),
-      hasDeleteGroupAction: !!this.dslActions.find((a) => a.name === 'deleteOne'),
-      hasCollectionPermissionItemsAction: !!this.dslActions.find((a) => a.name === 'collectionPathMappings'),
+      hasModifyRoleAction: !!this.dslActions.find((a) => a.name === 'modifyRole' && !!a.actionType),
+      hasModifyManagementRoleAction: !!this.dslActions.find((a) => a.name === 'modifyManagementRole' && !!a.actionType),
+      hasPermissionUpdateAction: !!this.dslActions.find((a) => a.name === 'update' && !!a.actionType),
+      hasPermissionCreateAction: !!this.dslActions.find((a) => a.name === 'create' && !!a.actionType),
+      hasPermissionCreateBatchAction: !!this.dslActions.find((a) => a.name === 'authorizes' && !!a.actionType),
+      hasActiveGroupAction: !!this.dslActions.find((a) => a.name === 'active' && !!a.actionType),
+      hasCancelGroupAction: !!this.dslActions.find((a) => a.name === 'disable' && !!a.actionType),
+      hasDeleteGroupAction: !!this.dslActions.find((a) => a.name === 'deleteOne' && !!a.actionType),
+      hasCollectionPermissionItemsAction: !!this.dslActions.find(
+        (a) => a.name === 'collectionPathMappings' && !!a.actionType
+      ),
       hasAuthGroupSystemPermissionLookupAction: !!this.dslActions.find(
-        (a) => a.name === 'authGroupSystemPermissionLookup'
+        (a) => a.name === 'authGroupSystemPermissionLookup' && !!a.actionType
       )
     };
   }

package/src/permission/system-permission/components/Config.vue

@@ -8,7 +8,7 @@
         <!-- 非批量操作 -->
         <div v-if="!store.enableMulti">
           <!-- 管理权限 -->
-          <div>
+          <div v-if="hasModifyManagementRoleAction">
             <div class="flex-s-c">
               <span class="fs-16 bold black">2. {{ $translate('配置管理权限') }}</span>
               <span class="ml-2 fs-14 grey ml-2">{{ $translate('允许哪些角色可以管理当前应用') }}</span>
@@ -29,14 +29,16 @@
             <!-- 配置访问权限 -->
             <div class="mt-6">
               <div class="flex-s-c">
-                <span class="fs-16 bold black">3. {{ $translate('配置访问权限') }}</span>
+                <span class="fs-16 bold black"
+                  >{{ hasModifyManagementRoleAction ? '3' : '2' }}.{{ $translate('配置访问权限') }}</span
+                >
                 <span class="ml-2 fs-14 grey ml-2">{{ $translate('允许哪些角色可以访问当前应用') }}</span>
                 <oio-button
                   class="btn-collection-permission-items"
                   v-if="hasCollectionPermissionItemsAction"
                   type="link"
                   @click="onCollectionPermissionItems"
-                  >收集权限项
+                  >{{ $translate('收集权限项') }}
                 </oio-button>
               </div>
               <div class="mt-6" :class="[groupList.length === 0 && !store.nodeType && 'flex-1']">
@@ -57,7 +59,11 @@
           <Empty v-if="isEmpty" :title="emptyText"></Empty>
           <div v-else>
             <div class="flex-s-c mt-6" v-if="!notSelected">
-              <span class="fs-16 bold black">{{ store.enableMulti ? '2' : '3' }}.{{ $translate('配置权限') }}</span>
+              <span class="fs-16 bold black"
+                >{{ store.enableMulti ? '2' : hasModifyManagementRoleAction ? '3' : '2' }}.{{
+                  $translate('配置权限')
+                }}</span
+              >
               <span class="ml-2 fs-14 grey ml-2">{{ $translate('添加权限组，将权限授权给对应角色') }}</span>
               <oio-button
                 class="btn-collection-permission-items"
@@ -83,20 +89,24 @@
   </div>
 </template>
 <script lang="ts" setup>
-import { ref, watch, computed, defineProps, withDefaults } from 'vue';
 import { translateValueByKey } from '@oinone/kunlun-engine';
 import { OioButton, OioSpin } from '@oinone/kunlun-vue-ui-antd';
+import { computed, defineProps, ref, watch, withDefaults } from 'vue';
+import type { PermissionNode } from '../../types';
 import { useDslActionPermission } from '../hooks';
 import { collectionPermissionItems, queryGroups } from '../service';
 import { useStore } from '../store';
-import type { PermissionNode } from '../../types';
-import GroupListComponent from './GroupList.vue';
 import Empty from './Empty.vue';
+import GroupListComponent from './GroupList.vue';
 
 const props = withDefaults(defineProps<{ selectedLeftTree: any[] }>(), {
   selectedLeftTree: [] as any
 });
 
+const hasModifyManagementRoleAction = computed(
+  () => useDslActionPermission().state.value.hasModifyManagementRoleAction
+);
+
 // 是否有收集权限项的权限
 const hasCollectionPermissionItemsAction = computed(
   () =>

package/src/permission/system-permission/components/Empty.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="empty-permission flex-c-c flex-1">
     <div style="text-align: center">
-      <img style="width: 243px" :src="genStaticPath('无权限@2x_1675843265937.png')" alt="" />
+      <img style="width: 243px" :src="genStaticPath('no-permission.png')" alt="" />
       <div class="mt-6 grey">{{ $translate(title) }}</div>
     </div>
   </div>

package/src/permission/system-permission/components/RoleDialog.vue

@@ -17,8 +17,8 @@
       <oio-input :placeholder="$translate('角色名称')" v-model:value="searchCondition.name" />
       <oio-input :placeholder="$translate('角色编码')" v-model:value="searchCondition.code" />
       <oio-input :placeholder="$translate('角色描述')" v-model:value="searchCondition.description" />
-      <oio-button type="primary" @click="onSearch">搜索</oio-button>
-      <oio-button @click="onResetCondition">重置</oio-button>
+      <oio-button type="primary" @click="onSearch">{{ $translate('搜索') }}</oio-button>
+      <oio-button @click="onResetCondition">{{ $translate('重置') }}</oio-button>
     </div>
 
     <!-- <div style="margin: 24px 0">
@@ -81,9 +81,9 @@
   </oio-modal>
 </template>
 <script lang="ts" setup>
-import { ref, watch, defineProps, withDefaults, defineEmits, computed, onMounted, nextTick } from 'vue';
-import { OioModal, OioInput, OioButton, OioIcon } from '@oinone/kunlun-vue-ui-antd';
 import { translateValueByKey } from '@oinone/kunlun-engine';
+import { OioButton, OioIcon, OioInput, OioModal } from '@oinone/kunlun-vue-ui-antd';
+import { computed, defineEmits, defineProps, nextTick, ref, watch, withDefaults } from 'vue';
 import { queryRoleList } from '../service';
 
 const columns = [