@oinone/kunlun-vue-admin-base 6.2.8 → 6.2.10

package/dist/types/src/field/table/date/TableYearFieldWidget.d.ts

@@ -1,5 +1,6 @@
 import { TableDateTimeFieldWidget } from './TableDateTimeFieldWidget';
 export declare class TableYearFieldWidget extends TableDateTimeFieldWidget {
+    renderDefaultSlot(context: any): any;
     protected get defaultFormat(): string;
     protected get valueFormat(): string;
     protected hasDateFormat: boolean;

package/package.json

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

package/src/field/table/boolean/TableBooleanSelectFieldWidget.ts

@@ -3,6 +3,7 @@ import { ModelFieldType, ViewType } from '@oinone/kunlun-meta';
 import { SPI } from '@oinone/kunlun-spi';
 import { RowContext } from '@oinone/kunlun-vue-ui';
 import { Widget } from '@oinone/kunlun-vue-widget';
+import { toString } from 'lodash-es';
 import { createVNode, VNode } from 'vue';
 import { BaseFieldWidget, BaseTableFieldWidget } from '../../../basic';
 import { OptionColorStyle } from '../../FieldCommonEnum';
@@ -13,7 +14,7 @@ import TableEnum from '../enum/TableEnum.vue';
   BaseFieldWidget.Token({
     viewType: ViewType.Table,
     ttype: ModelFieldType.Boolean,
-    widget: ['Select', 'radio']
+    widget: ['Select', 'Radio']
   })
 )
 export class TableBooleanSelectFieldWidget extends BaseTableFieldWidget<string | string[], RuntimeEnumerationField> {
@@ -35,9 +36,13 @@ export class TableBooleanSelectFieldWidget extends BaseTableFieldWidget<string |
   @Widget.Method()
   public renderDefaultSlot(context: RowContext): VNode[] | string {
     const value = this.compute(context);
+    let stringValue: string | undefined;
+    if (value != null) {
+      stringValue = toString(value);
+    }
     return [
       createVNode(TableEnum, {
-        value,
+        value: stringValue,
         currentValue: this.handleValue(value),
         options: this.options,
         optionColor: this.optionColor,

package/src/field/table/date/TableYearFieldWidget.ts

@@ -1,6 +1,8 @@
 import { ModelFieldType, ViewType } from '@oinone/kunlun-meta';
-import { defaultYearFormat, defaultYearValueFormat } from '@oinone/kunlun-shared';
+import { DateUtil, defaultYearFormat, defaultYearValueFormat } from '@oinone/kunlun-shared';
 import { SPI } from '@oinone/kunlun-spi';
+import { Widget } from '@oinone/kunlun-vue-widget';
+import { isNil } from 'lodash-es';
 import { BaseFieldWidget } from '../../../basic';
 import { TableDateTimeFieldWidget } from './TableDateTimeFieldWidget';
 
@@ -11,6 +13,33 @@ import { TableDateTimeFieldWidget } from './TableDateTimeFieldWidget';
   })
 )
 export class TableYearFieldWidget extends TableDateTimeFieldWidget {
+  @Widget.Method()
+  public renderDefaultSlot(context) {
+    const value = this.compute(context);
+    let cv;
+    if (isNil(value)) {
+      cv = '';
+    } else {
+      let format = DateUtil.fetchDatetimeFormat(
+        { hasDateFormat: this.hasDateFormat, hasTimeFormat: this.hasTimeFormat },
+        this.format,
+        this.getDateFormat(context),
+        this.getTimeFormat(context),
+        this.convertFormat,
+        this.convertDateFormat,
+        this.convertTimeFormat
+      );
+      if (!format) {
+        format = this.defaultFormat;
+      }
+      const datetimeFormatValue = DateUtil.dateFormat(DateUtil.toDate(value, this.valueFormat), format);
+      if (datetimeFormatValue) {
+        cv = datetimeFormatValue;
+      }
+    }
+    return cv;
+  }
+
   protected get defaultFormat() {
     return defaultYearFormat;
   }

package/src/field/table/string/upload/TableStringUploadImageFieldWidget.ts

@@ -9,8 +9,8 @@ import DefaultTableImage from './DefaultTableImage.vue';
 @SPI.ClassFactory(
   BaseFieldWidget.Token({
     viewType: ViewType.Table,
-    widget: 'UploadImg',
-    ttype: [ModelFieldType.String, ModelFieldType.Text]
+    ttype: [ModelFieldType.String, ModelFieldType.Text],
+    widget: 'UploadImg'
   })
 )
 export class TableStringUploadImageFieldWidget extends BaseTableFieldWidget {

package/src/field/table/string/upload/TableStringUploadWidget.ts

@@ -11,7 +11,6 @@ import DefaultTableUpload from './DefaultTableUpload.vue';
   BaseFieldWidget.Token({
     viewType: ViewType.Table,
     ttype: [ModelFieldType.String, ModelFieldType.Text],
-    multi: false,
     widget: 'Upload'
   })
 )

package/src/view/table/TableWidget.ts

@@ -61,6 +61,7 @@ export class TableWidget<Props extends TableWidgetProps = TableWidgetProps> exte
 
   @Widget.Provide()
   protected get cellWidth() {
+    // fixme @zbh 20250723 请使用语义明确的dsl属性名称
     const { autoColumnWidth } = this.getDsl();
     if (autoColumnWidth) {
       return 'auto';
@@ -69,6 +70,7 @@ export class TableWidget<Props extends TableWidgetProps = TableWidgetProps> exte
 
   @Widget.Provide()
   protected get cellMinWidth() {
+    // fixme @zbh 20250723 请使用语义明确的dsl属性名称
     const { minFieldWidth } = this.getDsl();
     if (minFieldWidth) {
       return StyleHelper.px(minFieldWidth) as string;
@@ -119,7 +121,9 @@ 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(true);
+    const autoLineHeight = Optional.ofNullable(this.getDsl().autoLineHeight)
+      .map(BooleanHelper.toBoolean)
+      .orElse(undefined);
 
     if (typeof autoLineHeight === 'boolean') {
       return autoLineHeight;