@oinone/kunlun-vue-admin-base 6.3.3 → 6.3.4

package/dist/types/src/field/form/float/Plat.vue.d.ts

@@ -47,7 +47,7 @@ declare const _default: import("vue").DefineComponent<{
         default: boolean;
     };
     layout: {
-        type: PropType<import("@oinone/kunlun-vue-ui-antd").FormLayout>;
+        type: PropType<import("@oinone/kunlun-vue-ui-common").FormLayout>;
     };
     label: {
         type: (BooleanConstructor | StringConstructor)[];
@@ -141,7 +141,7 @@ declare const _default: import("vue").DefineComponent<{
         default: boolean;
     };
     layout: {
-        type: PropType<import("@oinone/kunlun-vue-ui-antd").FormLayout>;
+        type: PropType<import("@oinone/kunlun-vue-ui-common").FormLayout>;
     };
     label: {
         type: (BooleanConstructor | StringConstructor)[];

package/dist/types/src/tags/index.d.ts

@@ -2,7 +2,6 @@ import Action from './Action.vue';
 import ActionBar from './ActionBar.vue';
 import ActionColumn from './ActionColumn.vue';
 import Col from './Col.vue';
-import { Tabs } from './combination';
 import Container from './Container.vue';
 import Containers from './Containers.vue';
 import Custom from './Custom.vue';
@@ -21,7 +20,7 @@ import TextInfo from './TextInfo.vue';
 import Tree from './Tree.vue';
 import View from './View.vue';
 export declare function install(): void;
-export { View, Field, Action, Element, Pack, Custom, ActionBar, ActionColumn, Col, Container, Containers, Dropdown, Group, Icon, Paragraph, Picture, Row, Search, Table, TextInfo, Tree, Tabs };
+export { View, Field, Action, Element, Pack, Custom, ActionBar, ActionColumn, Col, Container, Containers, Dropdown, Group, Icon, Paragraph, Picture, Row, Search, Table, TextInfo, Tree };
 export * from './combination';
 export * from './context';
 export * from './mixin';

package/dist/types/src/tags/mixin/index.d.ts

@@ -1,2 +1,3 @@
 export * from './BaseWidgetTagMixin';
+export * from './typing';
 export * from './use-widget-tag';

package/dist/types/src/tags/resolve/internal/widget-resolve.d.ts

@@ -1,5 +1,5 @@
 import { RenderWidget, VueWidget } from '@oinone/kunlun-vue-widget';
-import { DefaultColWidget, DefaultRowWidget } from '../../../container';
+import { DefaultColWidget, DefaultRowWidget } from '../../../container/block';
 import { CustomWidgetProps } from '../typing';
 import { ActionWidgetProps, ElementWidgetProps, FieldWidgetProps, PackWidgetProps, ViewWidgetProps } from './typing';
 export declare function createDefaultCol(rowWidget: DefaultRowWidget, props: PackWidgetProps): DefaultColWidget;

package/dist/types/src/view/table/DefaultTable.vue.d.ts

@@ -234,6 +234,21 @@ declare const __default__: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: undefined;
     };
+    border: {
+        type: StringConstructor;
+    };
+    stripe: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    isCurrent: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    isHover: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 }, {
     defaultTableRef: import("vue").Ref<HTMLElement>;
     table: import("vue").Ref<OioTableInstance | undefined>;
@@ -477,6 +492,21 @@ declare const __default__: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: undefined;
     };
+    border: {
+        type: StringConstructor;
+    };
+    stripe: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    isCurrent: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    isHover: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 }>>, {
     checkbox: boolean;
     loading: boolean;
@@ -494,5 +524,8 @@ declare const __default__: import("vue").DefineComponent<{
     emptyImage: string;
     autoLineHeight: boolean;
     enableSequence: boolean;
+    stripe: boolean;
+    isCurrent: boolean;
+    isHover: boolean;
 }>;
 export default __default__;

package/dist/types/src/view/table/TableWidget.d.ts

@@ -14,10 +14,14 @@ export declare class TableWidget<Props extends TableWidgetProps = TableWidgetPro
     initialize(props: Props): this;
     protected get cellWidth(): "auto" | undefined;
     protected get cellMinWidth(): string | undefined;
-    protected get tableConfig(): import("./config").TableConfig;
+    protected get tableConfig(): Record<string, any>;
     protected get checkbox(): boolean;
     protected get lineHeight(): number | undefined;
     protected get minLineHeight(): number | undefined;
+    protected get border(): any;
+    protected get stripe(): any;
+    protected get isCurrent(): any;
+    protected get isHover(): any;
     /**
      * 表格行高是否自适应，默认开启
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oinone/kunlun-vue-admin-base",
-  "version": "6.3.3",
+  "version": "6.3.4",
   "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.3.3",
-    "@oinone/kunlun-vue-router": "6.3.3",
-    "@oinone/kunlun-vue-ui": "6.3.3",
-    "@oinone/kunlun-vue-ui-antd": "6.3.3",
-    "@oinone/kunlun-vue-ui-common": "6.3.3",
-    "@oinone/kunlun-vue-ui-el": "6.3.3",
-    "@oinone/kunlun-vue-widget": "6.3.3",
+    "@oinone/kunlun-vue-admin-layout": "6.3.4",
+    "@oinone/kunlun-vue-router": "6.3.4",
+    "@oinone/kunlun-vue-ui": "6.3.4",
+    "@oinone/kunlun-vue-ui-antd": "6.3.4",
+    "@oinone/kunlun-vue-ui-common": "6.3.4",
+    "@oinone/kunlun-vue-ui-el": "6.3.4",
+    "@oinone/kunlun-vue-widget": "6.3.4",
     "@wangeditor/editor": "5.1.23",
     "@wangeditor/editor-for-vue": "5.1.11",
     "@wangeditor/plugin-upload-attachment": "1.1.0",

package/src/container/media/text-info/DefaultTextInfoValue.vue

@@ -1,7 +1,6 @@
 <script lang="ts">
-import { computed, createVNode, defineComponent, PropType } from 'vue';
-import Field from '../../../tags/Field.vue';
-import { TextInfoJustifyContent } from './typing';
+import { createVNode, defineComponent, PropType } from 'vue';
+import { Field } from '../../../tags';
 
 export default defineComponent({
   name: 'DefaultTextInfoValue',

package/src/field/tree/DefaultFieldTree.vue

@@ -339,6 +339,9 @@ export default defineComponent({
               ])
             ];
           }
+          if (typeof nodeChildren === 'string') {
+            nodeChildren = translateValueByKey(nodeChildren);
+          }
           return nodeChildren;
         },
         icon: ({ value }) => {

package/src/tags/Field.vue

@@ -1,7 +1,7 @@
 <script lang="ts">
 import { defineComponent, Slots } from 'vue';
-import { InternalWidget } from './resolve';
 import { BaseWidgetTagMixin } from './mixin';
+import { InternalWidget } from './resolve';
 
 export default defineComponent({
   name: 'Field',

package/src/tags/index.ts

@@ -5,7 +5,7 @@ import Action from './Action.vue';
 import ActionBar from './ActionBar.vue';
 import ActionColumn from './ActionColumn.vue';
 import Col from './Col.vue';
-import { PackCombination, Tabs } from './combination';
+import { PackCombination } from './combination';
 import Container from './Container.vue';
 import Containers from './Containers.vue';
 import Custom from './Custom.vue';
@@ -93,8 +93,7 @@ export {
   Search,
   Table,
   TextInfo,
-  Tree,
-  Tabs
+  Tree
 };
 
 export * from './combination';

package/src/tags/mixin/index.ts

@@ -1,2 +1,3 @@
 export * from './BaseWidgetTagMixin';
+export * from './typing';
 export * from './use-widget-tag';

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

@@ -23,7 +23,7 @@ import {
   BaseViewOptions,
   CustomWidget as CommonCustomWidget
 } from '../../../basic';
-import { DefaultColWidget, DefaultContainerColWidget, DefaultRowWidget } from '../../../container';
+import { DefaultColWidget, DefaultContainerColWidget, DefaultRowWidget } from '../../../container/block';
 import { FieldMixinComponentOptions, selectorFieldMixinComponent } from '../../../spi';
 import { ActiveLayoutEffectOpt } from '../../context/active';
 import { isCreateFlexElement } from '../helper';

package/src/view/table/DefaultTable.vue

@@ -38,7 +38,7 @@ import {
   watch
 } from 'vue';
 import { VxeTableDefines, VxeTablePropTypes } from 'vxe-table';
-import { getTableThemeConfig, ManualWidget } from '../../basic';
+import { ManualWidget } from '../../basic';
 import { UserTablePrefer } from '../../typing';
 import { TableRowClickMode } from './typing';
 
@@ -336,6 +336,21 @@ export default defineComponent({
     enableSequence: {
       type: Boolean,
       default: undefined
+    },
+    border: {
+      type: String
+    },
+    stripe: {
+      type: Boolean,
+      default: false
+    },
+    isCurrent: {
+      type: Boolean,
+      default: true
+    },
+    isHover: {
+      type: Boolean,
+      default: false
     }
   },
   setup(props) {
@@ -729,9 +744,12 @@ export default defineComponent({
 
       emptyText,
       emptyImage,
-      pageSizeOptions
+      pageSizeOptions,
+      stripe,
+      isCurrent,
+      isHover
     } = this;
-    let { border = false, stripe = false, isCurrent = true, isHover = false } = getTableThemeConfig() || {};
+    let { border = false } = this;
     const VEX_TABLE_BORDER_MODE = [true, false, 'default', 'outer', 'full', 'inner'];
     let tableCustomClass = '';
     if (!VEX_TABLE_BORDER_MODE.includes(border)) {

package/src/view/table/TableWidget.ts

@@ -32,7 +32,6 @@ import { BaseElementListViewWidgetProps, BaseElementWidget, BaseTableColumnWidge
 import { ExpandColumnWidgetNames } from '../../field';
 import { ActiveCountEnum, fetchPageSize, fetchPageSizeNullable, TABLE_WIDGET, UserTablePrefer } from '../../typing';
 import { TreeUtils } from '../../util';
-import { TableConfigManager } from './config';
 import DefaultTable from './DefaultTable.vue';
 import { TableRowClickMode } from './typing';
 
@@ -78,7 +77,7 @@ export class TableWidget<Props extends TableWidgetProps = TableWidgetProps> exte
   }
 
   protected get tableConfig() {
-    return TableConfigManager.getConfig();
+    return this.getMergeConfig('table');
   }
 
   @Widget.Reactive()
@@ -88,32 +87,32 @@ export class TableWidget<Props extends TableWidgetProps = TableWidgetProps> exte
 
   @Widget.Reactive()
   protected get lineHeight(): number | undefined {
-    const lineHeight = Optional.ofNullable(this.getDsl().lineHeight).map(NumberHelper.toNumber).orElse(undefined);
-
-    if (lineHeight) {
-      return lineHeight;
-    }
-
-    if (typeof this.tableConfig.lineHeight === 'number') {
-      return this.tableConfig.lineHeight;
-    }
-
-    return undefined;
+    return NumberHelper.toNumber(this.tableConfig.lineHeight) as number | undefined;
   }
 
   @Widget.Reactive()
   protected get minLineHeight(): number | undefined {
-    const minLineHeight = Optional.ofNullable(this.getDsl().minLineHeight).map(NumberHelper.toNumber).orElse(undefined);
+    return NumberHelper.toNumber(this.tableConfig.minLineHeight) as number | undefined;
+  }
 
-    if (minLineHeight) {
-      return minLineHeight;
-    }
+  @Widget.Reactive()
+  protected get border() {
+    return this.tableConfig.border || false;
+  }
 
-    if (typeof this.tableConfig.minLineHeight === 'number') {
-      return this.tableConfig.minLineHeight;
-    }
+  @Widget.Reactive()
+  protected get stripe() {
+    return this.tableConfig.stripe || false;
+  }
 
-    return undefined;
+  @Widget.Reactive()
+  protected get isCurrent() {
+    return this.tableConfig.isCurrent || true;
+  }
+
+  @Widget.Reactive()
+  protected get isHover() {
+    return this.tableConfig.isHover || false;
   }
 
   /**
@@ -121,19 +120,8 @@ export class TableWidget<Props extends TableWidgetProps = TableWidgetProps> exte
    */
   @Widget.Reactive()
   protected get autoLineHeight(): boolean {
-    const autoLineHeight = Optional.ofNullable(this.getDsl().autoLineHeight)
-      .map(BooleanHelper.toBoolean)
-      .orElse(undefined);
-
-    if (typeof autoLineHeight === 'boolean') {
-      return autoLineHeight;
-    }
-
-    if (typeof this.tableConfig.autoLineHeight === 'boolean') {
-      return this.tableConfig.autoLineHeight;
-    }
-
-    return true;
+    const { autoLineHeight } = this.tableConfig;
+    return Optional.ofNullable(autoLineHeight).map(BooleanHelper.toBoolean).orElse(true)!;
   }
 
   @Widget.Reactive()
@@ -153,11 +141,11 @@ export class TableWidget<Props extends TableWidgetProps = TableWidgetProps> exte
   @Widget.Reactive()
   @Widget.Provide()
   protected get activeCount(): number | undefined {
-    const { activeCount } = this.getDsl();
+    const { activeCount } = this.tableConfig;
     if (isNil(activeCount)) {
       return undefined;
     }
-    const activeCountNumber = NumberHelper.toNumber(activeCount);
+    const activeCountNumber = NumberHelper.toNumber(activeCount as number | undefined | string);
     if (isNil(activeCountNumber)) {
       return ActiveCountEnum[activeCount as string];
     }
@@ -170,14 +158,14 @@ export class TableWidget<Props extends TableWidgetProps = TableWidgetProps> exte
   @Widget.Reactive()
   @Widget.Provide()
   protected get inlineActiveCount(): number | undefined {
-    let { inlineActiveCount } = this.getDsl();
+    let { inlineActiveCount } = this.tableConfig;
     if (isNil(inlineActiveCount)) {
       inlineActiveCount = this.metadataRuntimeContext.viewTemplate?.inlineActiveCount;
       if (isNil(inlineActiveCount)) {
         return undefined;
       }
     }
-    const inlineActiveCountNumber = NumberHelper.toNumber(inlineActiveCount);
+    const inlineActiveCountNumber = NumberHelper.toNumber(inlineActiveCount as number | string);
     if (isNil(inlineActiveCountNumber)) {
       return ActiveCountEnum[inlineActiveCount as string];
     }