@oinone/kunlun-vue-admin-base 6.2.5 → 6.2.7

package/dist/types/src/field/tree-select/AbstractTreeFieldWidget.d.ts

@@ -2,7 +2,7 @@ import { ActiveRecord, ActiveRecords, Pagination, RuntimeModel, RuntimeRelationF
 import { ExpressionRunParam } from '@oinone/kunlun-expression';
 import { CallChaining, ReturnPromise } from '@oinone/kunlun-shared';
 import { SelectMode, WidgetTrigger } from '@oinone/kunlun-vue-ui-antd';
-import { OioTreeNode } from '@oinone/kunlun-vue-ui-common';
+import { OioTreeNode, TreeSelectProperties } from '@oinone/kunlun-vue-ui-common';
 import { DebouncedFunc } from 'lodash-es';
 import { BaseFieldProps, FormFieldWidget } from '../../basic';
 import { TreeNodeResponseBody } from '../../service';
@@ -31,6 +31,7 @@ export declare abstract class AbstractTreeFieldWidget<V extends TreeData = TreeD
     protected checkedKeys: string[] | undefined;
     protected halfCheckedKeys: string[] | undefined;
     protected expandedKeys: string[] | undefined;
+    protected get mappingProperties(): TreeSelectProperties;
     protected get referencesModel(): RuntimeModel | undefined;
     protected get selectMode(): SelectMode;
     protected get selectable(): boolean;

package/dist/types/src/field/tree-select/DefaultTreeSelect.vue.d.ts

@@ -1,7 +1,10 @@
-import { OioTreeNode, SimpleTreeSelected, TreeSelectNode, TreeSelectNodeChangeEvent } from '@oinone/kunlun-vue-ui-antd';
+import { OioTreeNode, SimpleTreeSelected, TreeSelectNode, TreeSelectNodeChangeEvent, TreeSelectProperties } from '@oinone/kunlun-vue-ui-antd';
 import { PropType } from 'vue';
 import { TreeData } from '../../typing';
 declare const _default: import("vue").DefineComponent<{
+    mappingProperties: {
+        type: PropType<TreeSelectProperties>;
+    };
     maxTagCount: {
         type: NumberConstructor;
     };
@@ -101,6 +104,9 @@ declare const _default: import("vue").DefineComponent<{
     onClickLoadMore: (node: OioTreeNode<TreeData>) => Promise<void>;
     getTriggerContainer: (triggerNode: Node | HTMLElement) => Node | HTMLElement;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    mappingProperties: {
+        type: PropType<TreeSelectProperties>;
+    };
     maxTagCount: {
         type: NumberConstructor;
     };

package/dist/types/src/util/tree-utils.d.ts

@@ -21,6 +21,7 @@ export declare class TreeUtils {
     static consumerReferenceModelField(originModel: string, modelField: RuntimeRelationField, consumer: (originFields: string[], targetFields: string[], index: number, reverse: boolean) => void, consumerBefore?: () => void): Promise<boolean>;
     static seekContentLayout(view: RuntimeView | undefined, viewType: ViewType, inline: boolean): DslDefinition | undefined;
     static mergeLayoutBySlotName(dslSlots: DslSlots, slotName: string, inline: boolean, view: RuntimeView | undefined): {
+        viewType: ViewType;
         targetSlot: TemplateDslDefinition;
         viewDsl: ViewDslDefinition;
         viewTemplate: DslDefinition;

package/dist/types/src/view/tree/AbstractTreeElementWidget.d.ts

@@ -1,4 +1,5 @@
 import { ExpressionRunParam } from '@oinone/kunlun-expression';
+import { ViewType } from '@oinone/kunlun-meta';
 import { ReturnPromise } from '@oinone/kunlun-shared';
 import { OioTreeNode } from '@oinone/kunlun-vue-ui-common';
 import { TreeNodeResponseBody } from '../../service';
@@ -17,6 +18,7 @@ export declare abstract class AbstractTreeElementWidget<V extends TreeData = Tre
     protected get expandLevel(): string | undefined;
     protected checkedKeys: string[] | undefined;
     protected showContent: boolean;
+    protected contentViewType: ViewType | undefined;
     protected get searchPlaceHolder(): any;
     get checkable(): boolean | undefined;
     get autoExpandParent(): boolean | undefined;

package/dist/types/src/view/tree/TreeWidget.d.ts

@@ -1,3 +1,4 @@
+import { ActiveRecord } from '@oinone/kunlun-engine';
 import { OioTreeNode } from '@oinone/kunlun-vue-ui-common';
 import { TreeData } from '../../typing';
 import { AbstractTreeElementWidget } from './AbstractTreeElementWidget';
@@ -8,4 +9,5 @@ export declare class TreeWidget extends AbstractTreeElementWidget {
     protected onClearSearch(): Promise<void>;
     protected onUnselected(): Promise<void>;
     protected $$mounted(): void;
+    protected generatorEmptyValue(): ActiveRecord[];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oinone/kunlun-vue-admin-base",
-  "version": "6.2.5",
+  "version": "6.2.7",
   "main": "index.ts",
   "scripts": {
     "prebuild": "rimraf dist",
@@ -14,13 +14,13 @@
     "doc": "typedoc --out docs src/index.ts"
   },
   "dependencies": {
-    "@oinone/kunlun-vue-admin-layout": "6.2.5",
-    "@oinone/kunlun-vue-router": "6.2.5",
-    "@oinone/kunlun-vue-ui": "6.2.5",
-    "@oinone/kunlun-vue-ui-antd": "6.2.5",
-    "@oinone/kunlun-vue-ui-common": "6.2.5",
-    "@oinone/kunlun-vue-ui-el": "6.2.5",
-    "@oinone/kunlun-vue-widget": "6.2.5",
+    "@oinone/kunlun-vue-admin-layout": "6.2.7",
+    "@oinone/kunlun-vue-router": "6.2.7",
+    "@oinone/kunlun-vue-ui": "6.2.7",
+    "@oinone/kunlun-vue-ui-antd": "6.2.7",
+    "@oinone/kunlun-vue-ui-common": "6.2.7",
+    "@oinone/kunlun-vue-ui-el": "6.2.7",
+    "@oinone/kunlun-vue-widget": "6.2.7",
     "@wangeditor/editor": "5.1.23",
     "@wangeditor/editor-for-vue": "5.1.11",
     "@wangeditor/plugin-upload-attachment": "1.1.0",

package/src/field/form/string/expression/ExpressionAbstractWidget.ts

@@ -313,19 +313,23 @@ export class ExpressionAbstractWidget extends FormFieldWidget {
   public async initData(): Promise<IExpressionItem[]> {
     if (this.value) {
       const expression = (await this.queryExpression()) as IExpressionDefinition;
+
+      const defaultExpressionItem = createDefaultExpressionItem(this.type);
       if (expression) {
         createExpressionItemByExpressionDefinition(expression, this.createExpressionOption());
         const valueList = expression.itemList;
-        this.setExpressionItemList(!valueList?.length ? [createDefaultExpressionItem(this.type)] : valueList);
+        this.setExpressionItemList(!valueList?.length ? [defaultExpressionItem] : valueList);
         this.sourceCode = this.value as string;
 
         const list = valueList || [];
 
-        if (list.length && this.sourceCode && !list.some((v) => !!v.valueList?.find((val) => val.value))) {
+        const isDefaultCondition = list.length === 1 && list[0].valueList?.length === 1 && !list[0].valueList[0].value;
+
+        if (this.sourceCode && isDefaultCondition) {
           this.hasChangeSourceCode = true;
         }
       } else {
-        this.setExpressionItemList([createDefaultExpressionItem(this.type)]);
+        this.setExpressionItemList([defaultExpressionItem]);
         this.sourceCode = this.value as string;
         this.hasChangeSourceCode = true;
       }

package/src/field/tree-select/AbstractTreeFieldWidget.ts

@@ -20,7 +20,7 @@ import {
   uniqueKeyGenerator
 } from '@oinone/kunlun-shared';
 import { EmptyStyle, SelectMode, WidgetTrigger } from '@oinone/kunlun-vue-ui-antd';
-import { OioTreeNode } from '@oinone/kunlun-vue-ui-common';
+import { defaultTreeSelectProperties, OioTreeNode, TreeSelectProperties } from '@oinone/kunlun-vue-ui-common';
 import { Widget } from '@oinone/kunlun-vue-widget';
 import { debounce, DebouncedFunc, isNil, toInteger } from 'lodash-es';
 import { BaseFieldProps, FormFieldWidget } from '../../basic';
@@ -88,6 +88,15 @@ export abstract class AbstractTreeFieldWidget<
   @Widget.Reactive()
   protected expandedKeys: string[] | undefined;
 
+  @Widget.Reactive()
+  protected get mappingProperties(): TreeSelectProperties {
+    return {
+      ...defaultTreeSelectProperties,
+      labelProp: 'title',
+      valueProp: 'key'
+    };
+  }
+
   @Widget.Reactive()
   protected get referencesModel(): RuntimeModel | undefined {
     return this.field.referencesModel;

package/src/field/tree-select/DefaultTreeSelect.vue

@@ -16,12 +16,6 @@ import { OioCommonProps, OioMetadataProps, useInjectOioDefaultFormContext } from
 import { TreeData } from '../../typing';
 import { TreeUtils } from '../../util';
 
-const mappingProperties: TreeSelectProperties = {
-  ...defaultTreeSelectProperties,
-  labelProp: 'title',
-  valueProp: 'key'
-};
-
 export default defineComponent({
   name: 'DefaultTreeSelect',
   components: {
@@ -31,6 +25,9 @@ export default defineComponent({
   props: {
     ...OioCommonProps,
     ...OioMetadataProps,
+    mappingProperties: {
+      type: Object as PropType<TreeSelectProperties>
+    },
     maxTagCount: {
       type: Number
     },
@@ -189,6 +186,7 @@ export default defineComponent({
       enableLoadData,
       onlySelectedLeaf,
       maxTagCount,
+      mappingProperties,
 
       loadData,
       onDropdownVisibleChange,

package/src/util/tree-utils.ts

@@ -277,7 +277,14 @@ export class TreeUtils {
     slotName: string,
     inline: boolean,
     view: RuntimeView | undefined
-  ): { targetSlot: TemplateDslDefinition; viewDsl: ViewDslDefinition; viewTemplate: DslDefinition } | undefined {
+  ):
+    | {
+        viewType: ViewType;
+        targetSlot: TemplateDslDefinition;
+        viewDsl: ViewDslDefinition;
+        viewTemplate: DslDefinition;
+      }
+    | undefined {
     let targetSlot = dslSlots[slotName];
     if (targetSlot) {
       const viewDsl = targetSlot?.widgets?.find((v) => v.dslNodeType === DslDefinitionType.VIEW);
@@ -300,7 +307,7 @@ export class TreeUtils {
         }
       }
       dslSlots[slotName] = targetSlot;
-      return { targetSlot, viewDsl, viewTemplate };
+      return { viewType: viewDsl.type, targetSlot, viewDsl, viewTemplate };
     }
     return undefined;
   }

package/src/view/tree/AbstractTreeElementWidget.ts

@@ -1,5 +1,6 @@
 import { DEFAULT_SLOT_NAME } from '@oinone/kunlun-dsl';
 import { ExpressionRunParam } from '@oinone/kunlun-expression';
+import { ViewType } from '@oinone/kunlun-meta';
 import { BooleanHelper, ReturnPromise, uniqueKeyGenerator } from '@oinone/kunlun-shared';
 import { OioTreeNode } from '@oinone/kunlun-vue-ui-common';
 import { Widget } from '@oinone/kunlun-vue-widget';
@@ -44,6 +45,9 @@ export abstract class AbstractTreeElementWidget<V extends TreeData = TreeData> e
   @Widget.Reactive()
   protected showContent = false;
 
+  @Widget.Reactive()
+  protected contentViewType: ViewType | undefined;
+
   @Widget.Reactive()
   protected get searchPlaceHolder() {
     return this.getDsl().searchPlaceholder;
@@ -99,7 +103,12 @@ export abstract class AbstractTreeElementWidget<V extends TreeData = TreeData> e
     }
     const { dslSlots, inline, view } = this;
     if (dslSlots) {
-      TreeUtils.mergeLayoutBySlotName(dslSlots, CONTENT_SLOT_NAME, inline || false, view);
+      this.contentViewType = TreeUtils.mergeLayoutBySlotName(
+        dslSlots,
+        CONTENT_SLOT_NAME,
+        inline || false,
+        view
+      )?.viewType;
     }
 
     this.runtimeInitialed();

package/src/view/tree/TreeWidget.ts

@@ -1,3 +1,4 @@
+import { ActiveRecord } from '@oinone/kunlun-engine';
 import { ViewType } from '@oinone/kunlun-meta';
 import { SPI } from '@oinone/kunlun-spi';
 import { OioTreeNode } from '@oinone/kunlun-vue-ui-common';
@@ -29,14 +30,21 @@ export class TreeWidget extends AbstractTreeElementWidget {
   }
 
   protected async onUnselected() {
-    const currentValue = [];
+    const currentValue = this.generatorEmptyValue();
     this.reloadDataSource(currentValue);
     this.reloadActiveRecords(currentValue);
   }
 
   protected $$mounted() {
     super.$$mounted();
-    const currentValue = [];
+    const currentValue = this.generatorEmptyValue();
     this.reloadDataSource(currentValue);
   }
+
+  protected generatorEmptyValue(): ActiveRecord[] {
+    if (this.contentViewType === ViewType.Form) {
+      return [{}];
+    }
+    return [];
+  }
 }

package/src/view/workbench/services.ts

@@ -1,13 +1,13 @@
-import { http } from '@oinone/kunlun-service';
 import { ModelCache } from '@oinone/kunlun-engine';
+import { http } from '@oinone/kunlun-service';
 
 const getApps = async () => {
-  const model = await ModelCache.get('apps.AppsManagementModule');
+  const model = await ModelCache.get('base.AppSwitcherModuleProxy');
   const bindUrlFieldExist = (model?.modelFields ?? []).filter((it) => it.data === 'urlHomePage').length > 0;
 
   const body = `{
       appSwitcherModuleProxyQuery {
-        queryPage(page: {}, queryWrapper: {}) {
+        queryPage(page: { currentPage: 1, size: -1 }, queryWrapper: {}) {
           content {
             module
             like