@oinone/kunlun-vue-admin-base 6.3.8 → 6.4.0

package/src/action/view-actions/biz-audit/BizAuditRecordDetailList.vue

@@ -1,57 +1,84 @@
 <template>
   <div class="biz-audit-record-detail-list">
-    <div class="oio-scrollbar content" v-if="dataSource && dataSource.length">
-      <div v-for="(item, index) in dataSource" :key="item.id" class="single-record">
-        <div class="left-area">
-          <div class="avatar">
-            <a-image :src="item.operator.avatarUrl || defaultAvatar" />
-          </div>
-          <div v-if="index < dataSource.length - 1" class="link-line"></div>
-        </div>
-        <div class="right-area">
-          <div class="action-area">
-            <div class="action-name">{{ item.operationName }}</div>
-            <div class="action-time">{{ item.createDate }}</div>
-          </div>
-          <div class="user-area">
-            <div class="user-name">{{ item.operatorName }}</div>
-            <div class="user-location">{{ item.requestPosition }}</div>
+    <div class="biz-audit-record-refresh" @click="handleReFetch">
+      <oio-icon icon="oinone-shuaxin" size="16px" />
+    </div>
+    <oio-spin :loading="loading">
+      <div class="oio-scrollbar content" v-if="dataSource && dataSource.length">
+        <div v-for="(item, index) in dataSource" :key="item.id" class="single-record">
+          <div class="left-area">
+            <div class="avatar">
+              <a-image :src="item.operator.avatarUrl || defaultAvatar" />
+            </div>
+            <div v-if="index < dataSource.length - 1" class="link-line"></div>
           </div>
-          <div class="single-record-detail">
-            <!--  通过xml创建DetailWidget -->
-            <!--            <slot :name="item.id" />-->
-            <biz-audit-record-detail :data="item" />
+          <div class="right-area">
+            <div class="action-area">
+              <div class="action-name">{{ item.operationName }}</div>
+              <div class="action-time">{{ item.createDate }}</div>
+            </div>
+            <div class="user-area">
+              <div class="user-name">{{ item.operatorName }}</div>
+              <div class="user-location">{{ item.requestPosition }}</div>
+            </div>
+            <div class="single-record-detail">
+              <!--  通过xml创建DetailWidget -->
+              <!--            <slot :name="item.id" />-->
+              <biz-audit-record-detail :data="item" />
+            </div>
           </div>
         </div>
       </div>
-    </div>
-    <div v-else>
-      <a-empty>
-        <template #description> {{ translateValueByKey('暂无数据') }}</template>
-      </a-empty>
-    </div>
+      <div v-else>
+        <oio-empty-data />
+      </div>
+    </oio-spin>
   </div>
 </template>
 
 <script lang="ts">
-import { defineComponent, PropType } from 'vue';
+import { genStaticPath } from '@oinone/kunlun-engine';
+import { OioEmptyData, OioSpin } from '@oinone/kunlun-vue-ui-antd';
 import { OioIcon } from '@oinone/kunlun-vue-ui-common';
-import { genStaticPath, translateValueByKey } from '@oinone/kunlun-engine';
+import { defineComponent, PropType, ref } from 'vue';
 import BizAuditRecordDetail from './BizAuditRecordDetail.vue';
 
 export default defineComponent({
   name: 'BizAuditRecordDetailList',
-  components: { OioIcon, BizAuditRecordDetail },
+  components: {
+    OioIcon,
+    OioSpin,
+    OioEmptyData,
+    BizAuditRecordDetail
+  },
   props: {
     dataSource: {
       type: Array as PropType<Record<string, any>>,
       default: () => []
+    },
+    reFetchData: {
+      type: Function
     }
   },
 
   setup(props) {
+    const loading = ref(false);
     const defaultAvatar = genStaticPath('default_avatar.png');
-    return { defaultAvatar, translateValueByKey };
+
+    const handleReFetch = async () => {
+      loading.value = true;
+      try {
+        await props.reFetchData?.();
+      } finally {
+        loading.value = false;
+      }
+    };
+
+    return {
+      loading,
+      defaultAvatar,
+      handleReFetch
+    };
   }
 });
 </script>
@@ -128,4 +155,16 @@ export default defineComponent({
 .biz-data-record-detail-inner-popup {
   min-width: 400px;
 }
+
+.biz-audit-record-refresh {
+  width: 20px;
+  height: 20px;
+  position: absolute;
+  top: 17px;
+  right: 48px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  cursor: pointer;
+}
 </style>

package/src/action/view-actions/biz-audit/BizAuditRecordDetailListWidget.ts

@@ -1,6 +1,7 @@
 import { RuntimeContextManager, ViewCache } from '@oinone/kunlun-engine';
 import { ViewType } from '@oinone/kunlun-meta';
 import { SPI } from '@oinone/kunlun-spi';
+import { Widget } from '@oinone/kunlun-vue-widget';
 import { BaseElementWidget } from '../../../basic';
 import { createRuntimeContextForWidget } from '../../../tags';
 import { DetailWidget } from '../../../view';
@@ -51,4 +52,8 @@ export class BizAuditRecordDetailListWidget extends DetailWidget {
       RuntimeContextManager.delete(nodeWidget.metadataRuntimeContext?.handle);
     });
   }
+
+  @Widget.Inject()
+  @Widget.Reactive()
+  protected reFetchData;
 }

package/src/action/view-actions/biz-audit/BizAuditRecordViewAction.ts

@@ -2,6 +2,7 @@ import { ActiveRecord, translateValueByKey } from '@oinone/kunlun-engine';
 import { ActionType, ViewActionTarget } from '@oinone/kunlun-meta';
 import { SPI } from '@oinone/kunlun-spi';
 import { OioMessage } from '@oinone/kunlun-vue-ui-antd';
+import { Widget } from '@oinone/kunlun-vue-widget';
 import { ActionWidget } from '../../component';
 import { InnerViewActionWidget } from '../popup';
 import { loadBizRecord } from './service';
@@ -30,4 +31,10 @@ export class BizAuditRecordViewAction extends InnerViewActionWidget {
       isFetchData: false
     };
   }
+
+  @Widget.Provide()
+  protected async reFetchData() {
+    const { data } = await this.loadData();
+    this.innerPopup?.setCurrentDataSource(data);
+  }
 }

package/src/basic/BaseSearchWidget.ts

@@ -2,12 +2,14 @@ import { ActiveRecord, RefreshCallChainingParameters, RefreshCallChainingScope }
 import { getRouterInstance } from '@oinone/kunlun-router';
 import { CallChaining, CastHelper, NumberHelper } from '@oinone/kunlun-shared';
 import { parseActionDomain4search } from '@oinone/kunlun-vue-admin-layout';
-import { Widget } from '@oinone/kunlun-vue-widget';
+import { isSearchViewState, OioAnyViewState, OioSearchViewState, Widget } from '@oinone/kunlun-vue-widget';
 import { cloneDeep, isNil } from 'lodash-es';
 import { BaseElementWidget } from './token';
 import { QueryExpression } from './types';
 
 export class BaseSearchWidget extends BaseElementWidget {
+  protected viewState: OioSearchViewState | undefined;
+
   protected defaultAllInvisible = true;
 
   @Widget.Reactive()
@@ -164,4 +166,10 @@ export class BaseSearchWidget extends BaseElementWidget {
     super.$$unmounted();
     this.mountedCallChaining?.unhook(this.path);
   }
+
+  protected $$initViewState(state: OioAnyViewState): void {
+    if (isSearchViewState(state) && !state.search) {
+      state.search = this.currentHandle;
+    }
+  }
 }

package/src/basic/common/BaseDataWidget.ts

@@ -55,7 +55,7 @@ export class BaseDataWidget<
    */
   @Widget.Reactive()
   @Widget.Provide()
-  protected get dataPath(): string {
+  public get dataPath(): string {
     const { parentDataPath, subDataPath, subDataIndex, currentDataPath } = this;
     if (isNil(currentDataPath)) {
       let dataPath = parentDataPath || '';

package/src/basic/common/BaseRuntimePropertiesWidget.ts

@@ -1,4 +1,11 @@
-import { ActiveRecord, RuntimeModel, RuntimeView, RuntimeViewAction } from '@oinone/kunlun-engine';
+import {
+  ActiveRecord,
+  RuntimeContext,
+  RuntimeContextManager,
+  RuntimeModel,
+  RuntimeView,
+  RuntimeViewAction
+} from '@oinone/kunlun-engine';
 import { ViewClientType } from '@oinone/kunlun-meta';
 import { useMatched } from '@oinone/kunlun-router';
 import { BooleanHelper, Optional, StringHelper } from '@oinone/kunlun-shared';
@@ -172,6 +179,13 @@ export class BaseRuntimePropertiesWidget<
       .orElse(true);
   }
 
+  @Widget.Reactive()
+  protected get usingParentLoading(): boolean {
+    return Optional.ofNullable(this.getDsl().usingParentLoading)
+      .map((v) => BooleanHelper.toBoolean(v))
+      .orElse(true);
+  }
+
   /**
    * 加载状态调用函数
    * @param fn
@@ -182,7 +196,7 @@ export class BaseRuntimePropertiesWidget<
     if (!this.usingLoading) {
       return await fn(...args);
     }
-    if (this.parentLoad) {
+    if (this.parentLoad && this.usingParentLoading) {
       return await this.parentLoad(fn, ...args);
     }
     this.loading = true;
@@ -192,4 +206,19 @@ export class BaseRuntimePropertiesWidget<
       this.loading = false;
     }
   }
+
+  protected seekPopupMainRuntimeContext(): RuntimeContext {
+    if (this.metadataHandle === this.rootHandle) {
+      const modelModel = this.model.model;
+      if (modelModel) {
+        const popupMainRuntimeContext = RuntimeContextManager.getOthers(this.rootHandle)?.find(
+          (v) => v.model.model === modelModel
+        );
+        if (popupMainRuntimeContext) {
+          return popupMainRuntimeContext;
+        }
+      }
+    }
+    return this.rootRuntimeContext;
+  }
 }

package/src/basic/constant/call-chaining.ts

@@ -6,12 +6,22 @@ import { CallAfterFunction } from '@oinone/kunlun-shared';
 export const VIEW_WIDGET_PRIORITY = 0;
 
 /**
- * 数据组件挂载 - 2
+ * 加载视图草稿数据 - 2
+ */
+export const FETCH_DRAFT_DATA_WIDGET_PRIORITY = 50;
+
+/**
+ * 弹出层加载视图草稿数据 - 0
+ */
+export const POPUP_FETCH_DRAFT_DATA_WIDGET_PRIORITY = -10;
+
+/**
+ * 数据组件挂载 - 3
  */
 export const FETCH_DATA_WIDGET_PRIORITY = 100;
 
 /**
- * 子视图组件挂载 - 3
+ * 子视图组件挂载 - 4
  */
 export const SUBVIEW_WIDGET_PRIORITY = 200;
 

package/src/basic/element/BaseElementListViewWidget.ts

@@ -41,9 +41,9 @@ import {
 import { CheckedChangeEvent, RadioChangeEvent } from '@oinone/kunlun-vue-ui';
 import { ListPaginationStyle, ListSelectMode, PageSizeEnum } from '@oinone/kunlun-vue-ui-antd';
 import { Widget } from '@oinone/kunlun-vue-widget';
-import { ceil, isEmpty, isNil, isString, toInteger, toString } from 'lodash-es';
-import { VxeTablePropTypes } from 'vxe-table';
-import { fetchPageSize } from '../../typing';
+import { ceil, isNil, isString, toInteger, toString } from 'lodash-es';
+import { UserPreferEventManager, UserPreferService } from '../../service';
+import { fetchPageSize, UserTablePrefer } from '../../typing';
 import { FetchUtil } from '../../util';
 import { BaseRuntimePropertiesWidget } from '../common';
 import { QueryExpression, RefreshProcessFunction, UrlQueryParameters } from '../types';
@@ -51,9 +51,6 @@ import { BaseElementViewWidget, BaseElementViewWidgetProps } from './BaseElement
 import { generatorCondition, getSortFieldDirection } from './utils';
 
 const URL_SPLIT_SEPARATOR = ',';
-const ORDERING_SEPARATOR = ',';
-const ORDERING_FIELD_ORDER_SEPARATOR = ' ';
-const DEFAULT_ORDERING_ORDER = EDirection.ASC;
 
 export type BaseElementListViewWidgetProps = BaseElementViewWidgetProps;
 
@@ -79,10 +76,16 @@ export abstract class BaseElementListViewWidget<
     }
   }
 
+  /**
+   * @deprecated widget finder please this.viewState.fields
+   */
   @Widget.Method()
   @Widget.Provide()
   protected fieldWidgetMounted(widget) {}
 
+  /**
+   * @deprecated widget finder please this.viewState.fields
+   */
   @Widget.Method()
   @Widget.Provide()
   protected fieldWidgetUnmounted(widget) {}
@@ -178,7 +181,7 @@ export abstract class BaseElementListViewWidget<
    */
   @Widget.Reactive()
   protected get sortable() {
-    return Optional.ofNullable(BooleanHelper.toBoolean(this.getDsl().sortable)).orElse(false);
+    return Optional.ofNullable(BooleanHelper.toBoolean(this.getDsl().sortable)).orElse(true);
   }
 
   /**
@@ -189,37 +192,17 @@ export abstract class BaseElementListViewWidget<
    */
   @Widget.Reactive()
   protected get ordering(): ISort[] | undefined {
-    const dsf: string = this.getDsl().ordering;
-    if (dsf) {
-      const dsfArr = dsf.split(ORDERING_SEPARATOR).filter((v) => !isEmpty(v));
-      return dsfArr.map((v: string) => {
-        const [sortField, direction] = getSortFieldDirection(v, ORDERING_FIELD_ORDER_SEPARATOR, DEFAULT_ORDERING_ORDER);
-        return { sortField, direction };
-      });
-    }
-    return undefined;
-  }
-
-  @Widget.Reactive()
-  protected get sortConfig(): VxeTablePropTypes.SortConfig {
-    let config: VxeTablePropTypes.SortConfig = this.getDsl().sortConfig || {};
-    if (!config.remote) {
-      config.remote = true;
-    }
-    return config;
-  }
-
-  @Widget.Reactive()
-  protected get defaultPageSizeOptions() {
-    return Object.keys(PageSizeEnum)
-      .filter((key) => typeof PageSizeEnum[key] === 'number')
-      .map((key) => PageSizeEnum[key]);
+    return StringHelper.convertArray(this.getDsl().ordering)?.map((v) => {
+      const [sortField, direction] = getSortFieldDirection(v);
+      return { sortField, direction };
+    });
   }
 
   /**
    * 排序参数
    * @protected
    */
+  @Widget.Provide()
   @Widget.Reactive()
   protected sortList: ISort[] | undefined = undefined;
 
@@ -257,6 +240,23 @@ export abstract class BaseElementListViewWidget<
     return this.getDsl().emptyImage || undefined;
   }
 
+  /**
+   * 分页参数
+   * @protected
+   */
+  @Widget.Reactive()
+  protected pagination: Pagination | undefined;
+
+  public getPagination(): Pagination {
+    return (
+      this.pagination ||
+      ({
+        total: 0,
+        current: 1
+      } as Pagination)
+    );
+  }
+
   /**
    * 分页选项
    */
@@ -274,22 +274,12 @@ export abstract class BaseElementListViewWidget<
     return options.length ? options.map((v) => NumberHelper.toNumber(v)) : this.defaultPageSizeOptions;
   }
 
-  public getPagination(): Pagination {
-    return (
-      this.pagination ||
-      ({
-        total: 0,
-        current: 1
-      } as Pagination)
-    );
-  }
-
-  /**
-   * 分页参数
-   * @protected
-   */
   @Widget.Reactive()
-  protected pagination: Pagination | undefined;
+  protected get defaultPageSizeOptions() {
+    return Object.keys(PageSizeEnum)
+      .filter((key) => typeof PageSizeEnum[key] === 'number')
+      .map((key) => PageSizeEnum[key]);
+  }
 
   /**
    * 默认分页数
@@ -300,6 +290,17 @@ export abstract class BaseElementListViewWidget<
     return fetchPageSize(this.getDsl().defaultPageSize);
   }
 
+  @Widget.Reactive()
+  protected get enabledFullScreen(): boolean {
+    return Optional.ofNullable(BooleanHelper.toBoolean(this.getDsl().enabledFullScreen)).orElse(
+      this.defaultEnabledFullScreen
+    );
+  }
+
+  protected get defaultEnabledFullScreen() {
+    return true;
+  }
+
   /**
    * 加载函数命名空间
    * @protected
@@ -445,6 +446,7 @@ export abstract class BaseElementListViewWidget<
     this.refreshProcess();
   }
 
+  @Widget.Provide()
   @Widget.Method()
   public onSortChange(sortList: ISort[]): void {
     const sortFields: string[] = [];
@@ -474,9 +476,6 @@ export abstract class BaseElementListViewWidget<
         direction: directions[i]
       });
     }
-    if (!finalSortList.length) {
-      finalSortList.push(...(this.ordering || []));
-    }
     this.sortList = finalSortList;
     if (this.inline) {
       this.refreshProcess();
@@ -610,6 +609,8 @@ export abstract class BaseElementListViewWidget<
     return finalCondition;
   }
 
+  @Widget.Provide()
+  @Widget.Method()
   protected generatorSearchBody(): ActiveRecord | undefined {
     const { searchBody } = this;
     if (!searchBody) {
@@ -860,6 +861,63 @@ export abstract class BaseElementListViewWidget<
   @Widget.Inject('refreshProcess')
   protected parentRefreshProcess: RefreshProcessFunction | undefined;
 
+  // region user prefer
+
+  @Widget.Reactive()
+  protected get usingSimpleUserPrefer(): boolean | undefined {
+    return BooleanHelper.toBoolean(this.getDsl().usingSimpleUserPrefer);
+  }
+
+  protected userPreferEventManager: UserPreferEventManager | undefined;
+
+  @Widget.Reactive()
+  @Widget.Provide()
+  protected userPrefer?: UserTablePrefer;
+
+  protected initUserPrefer() {
+    this.userPreferEventManager = UserPreferEventManager.get(this.rootHandle || this.currentHandle);
+    if (this.inline) {
+      this.userPrefer = {} as UserTablePrefer;
+    } else {
+      this.userPrefer = (UserPreferService.parsePreferForTable(
+        this.metadataRuntimeContext.view?.extension?.userPreference as Record<string, unknown>
+      ) || {}) as UserTablePrefer;
+      this.userPreferEventManager.onSave(this.$saveUserPrefer.bind(this));
+    }
+    this.userPreferEventManager.setData(this.userPrefer);
+    this.userPreferEventManager.onReload(this.$reloadUserPrefer.bind(this), CallChaining.MAX_PRIORITY);
+  }
+
+  /**
+   *
+   * @param userPrefer
+   * @deprecated 兼容原有逻辑 使用UserPreferEventManager.INSTANCE.reload方法替换
+   */
+  @Widget.Provide()
+  @Widget.Method()
+  public reloadUserPrefer(userPrefer: UserTablePrefer) {
+    this.userPreferEventManager?.reload(userPrefer);
+  }
+
+  protected $reloadUserPrefer(userPrefer: Partial<UserTablePrefer>) {
+    this.userPrefer = { ...(this.userPrefer || {}), ...userPrefer } as UserTablePrefer;
+    this.userPreferEventManager?.setData(this.userPrefer);
+  }
+
+  protected async $saveUserPrefer(userPrefer: Partial<UserTablePrefer>) {
+    const viewName = userPrefer.viewName || this.metadataRuntimeContext.view.name;
+    if (viewName) {
+      const saveUserPrefer = {
+        ...userPrefer,
+        model: userPrefer.model || this.metadataRuntimeContext.model.model,
+        viewName
+      } as UserTablePrefer;
+      await UserPreferService.savePreferForTable(saveUserPrefer);
+    }
+  }
+
+  // endregion user prefer
+
   @Widget.Method()
   protected async refreshProcess(condition?: Condition) {
     const rootConditionBodyData = this.rootRuntimeContext.view.context?.rootConditionBodyData as Record<
@@ -905,38 +963,47 @@ export abstract class BaseElementListViewWidget<
     this.reloadActiveRecords([]);
   }
 
-  protected $$beforeMount() {
-    super.$$beforeMount();
-    const { currentPage, pageSize, sortField, direction } = this.urlParameters;
-    let { pagination, sortList } = this;
-    if (!pagination && (currentPage || pageSize)) {
-      pagination = {
-        current: toInteger(currentPage),
-        pageSize: toInteger(pageSize)
-      } as Pagination;
-      this.pagination = pagination;
-    }
+  /**
+   * 初始化排序字段列表页, 优选取url上面的配置，如果没有就取设计器配置
+   */
+  protected initSortList() {
+    const { sortField, direction } = this.urlParameters;
+    let { sortList } = this;
     if (!sortList && sortField && direction) {
       sortList = [];
       const sortFields = sortField.split(URL_SPLIT_SEPARATOR);
       const directions = direction.split(URL_SPLIT_SEPARATOR);
       if (sortFields.length && directions.length && sortFields.length === directions.length) {
-        this.sortConfig.defaultSort = [];
         for (let i = 0; i < sortFields.length; i++) {
           sortList.push({ sortField: sortFields[i], direction: directions[i] as EDirection });
-          this.sortConfig.defaultSort.push({
-            field: sortFields[i],
-            order: directions[i].toLowerCase() as VxeTablePropTypes.SortOrder
-          });
         }
       }
       this.sortList = sortList;
     }
     if (!sortList && this.ordering?.length) {
-      this.sortList = this.ordering;
+      this.sortList = [...this.ordering];
     }
   }
 
+  protected initPagination() {
+    const { currentPage, pageSize } = this.urlParameters;
+    let { pagination } = this;
+    if (!pagination && (currentPage || pageSize)) {
+      pagination = {
+        current: toInteger(currentPage),
+        pageSize: toInteger(pageSize)
+      } as Pagination;
+      this.pagination = pagination;
+    }
+  }
+
+  protected $$beforeMount() {
+    super.$$beforeMount();
+    this.initSortList();
+    this.initPagination();
+    this.initUserPrefer();
+  }
+
   protected $$mounted() {
     super.$$mounted();
     this.submitCallChaining?.callBefore(
@@ -953,6 +1020,7 @@ export abstract class BaseElementListViewWidget<
 
   protected $$unmounted() {
     super.$$unmounted();
+    this.userPreferEventManager?.dispose();
     this.checkboxAllCallChaining?.unhook(this.path);
   }