yc-pro-components 0.0.17 → 0.0.19

package/lib/components/display-item/src/index.vue.d.ts

@@ -77,9 +77,9 @@ declare const _default: __VLS_WithTemplateSlots< DefineComponent<__VLS_WithDefau
     row: RecordType;
     editable: boolean | "click" | "dblclick";
 }, {}>, Partial<Record<string, (_: {
-    column: Readonly<Omit< LooseRequired<PlusFormItemProps>, "index" | "label" | "tooltip" | "formItemProps" | "fieldProps" | "options" | "modelValue" | "fieldSlots" | "fieldChildrenSlot" | "hasLabel" | "clearable" | "valueType" | "renderField" | "renderLabel" | "renderErrorMessage" | "optionsMap" | "autoDict">> & {
+    column: Readonly<Omit< LooseRequired<PlusFormItemProps>, "index" | "modelValue" | "label" | "tooltip" | "formItemProps" | "fieldProps" | "options" | "fieldSlots" | "fieldChildrenSlot" | "hasLabel" | "clearable" | "valueType" | "renderField" | "renderLabel" | "renderErrorMessage" | "optionsMap" | "autoDict">> & {
         readonly label: string | ComputedRef<string>;
-        readonly modelValue: string | number | boolean | string[] | [string, string] | RecordType | Date | boolean[] | number[] | Date[] | [Date, Date] | [number, number] | string[][] | number[][] | null;
+        readonly modelValue: string | number | boolean | string[] | [string, string] | boolean[] | RecordType | Date | number[] | Date[] | [Date, Date] | [number, number] | string[][] | number[][] | null;
         readonly hasLabel: boolean | Ref<boolean> | ComputedRef<boolean>;
         readonly tooltip: string | ComputedRef<string> | Partial< Mutable<ElTooltipProps> & {
             style?: CSSProperties | undefined;
@@ -106,7 +106,7 @@ declare const _default: __VLS_WithTemplateSlots< DefineComponent<__VLS_WithDefau
             };
             rows: number;
             autocomplete: string;
-            type: "" | "number" | "default" | "color" | "search" | "button" | "textarea" | "time" | "circle" | "image" | "line" | "text" | "datetimerange" | "daterange" | "monthrange" | "checkbox" | "radio" | "success" | "warning" | "info" | "primary" | "danger" | "reset" | "submit" | "hidden" | "range" | "date" | "year" | "years" | "month" | "dates" | "week" | "datetime" | "dashboard" | "datetime-local" | "email" | "file" | "password" | "tel" | "url";
+            type: "" | "number" | "default" | "search" | "button" | "textarea" | "time" | "circle" | "image" | "line" | "text" | "datetimerange" | "daterange" | "monthrange" | "checkbox" | "radio" | "color" | "success" | "warning" | "info" | "primary" | "danger" | "reset" | "submit" | "hidden" | "range" | "date" | "year" | "years" | "month" | "dates" | "week" | "datetime" | "dashboard" | "datetime-local" | "email" | "file" | "password" | "tel" | "url";
             loading: EpPropMergeType<BooleanConstructor, unknown, unknown> | EpPropMergeType<StringConstructor, "lazy" | "eager", unknown> | undefined;
             step: string | number;
             format: string | ProgressFn | undefined;
@@ -151,7 +151,7 @@ declare const _default: __VLS_WithTemplateSlots< DefineComponent<__VLS_WithDefau
     fieldInstance?: any;
     valueIsReady?: Ref<boolean> | undefined;
     prop: string;
-    modelValue: string | number | boolean | string[] | [string, string] | RecordType | Date | boolean[] | number[] | Date[] | [Date, Date] | [number, number] | string[][] | number[][] | null;
+    modelValue: string | number | boolean | string[] | [string, string] | boolean[] | RecordType | Date | number[] | Date[] | [Date, Date] | [number, number] | string[][] | number[][] | null;
     hasLabel: boolean | Ref<boolean> | ComputedRef<boolean>;
     tooltip: string | ComputedRef<string> | Partial< Mutable<ElTooltipProps> & {
         style?: CSSProperties | undefined;
@@ -185,9 +185,9 @@ declare const _default: __VLS_WithTemplateSlots< DefineComponent<__VLS_WithDefau
     clearable: boolean;
     index: number;
 }) => any>> & Partial<Record<string, (_: {
-    column: Readonly<Omit< LooseRequired<PlusFormItemProps>, "index" | "label" | "tooltip" | "formItemProps" | "fieldProps" | "options" | "modelValue" | "fieldSlots" | "fieldChildrenSlot" | "hasLabel" | "clearable" | "valueType" | "renderField" | "renderLabel" | "renderErrorMessage" | "optionsMap" | "autoDict">> & {
+    column: Readonly<Omit< LooseRequired<PlusFormItemProps>, "index" | "modelValue" | "label" | "tooltip" | "formItemProps" | "fieldProps" | "options" | "fieldSlots" | "fieldChildrenSlot" | "hasLabel" | "clearable" | "valueType" | "renderField" | "renderLabel" | "renderErrorMessage" | "optionsMap" | "autoDict">> & {
         readonly label: string | ComputedRef<string>;
-        readonly modelValue: string | number | boolean | string[] | [string, string] | RecordType | Date | boolean[] | number[] | Date[] | [Date, Date] | [number, number] | string[][] | number[][] | null;
+        readonly modelValue: string | number | boolean | string[] | [string, string] | boolean[] | RecordType | Date | number[] | Date[] | [Date, Date] | [number, number] | string[][] | number[][] | null;
         readonly hasLabel: boolean | Ref<boolean> | ComputedRef<boolean>;
         readonly tooltip: string | ComputedRef<string> | Partial< Mutable<ElTooltipProps> & {
             style?: CSSProperties | undefined;
@@ -214,7 +214,7 @@ declare const _default: __VLS_WithTemplateSlots< DefineComponent<__VLS_WithDefau
             };
             rows: number;
             autocomplete: string;
-            type: "" | "number" | "default" | "color" | "search" | "button" | "textarea" | "time" | "circle" | "image" | "line" | "text" | "datetimerange" | "daterange" | "monthrange" | "checkbox" | "radio" | "success" | "warning" | "info" | "primary" | "danger" | "reset" | "submit" | "hidden" | "range" | "date" | "year" | "years" | "month" | "dates" | "week" | "datetime" | "dashboard" | "datetime-local" | "email" | "file" | "password" | "tel" | "url";
+            type: "" | "number" | "default" | "search" | "button" | "textarea" | "time" | "circle" | "image" | "line" | "text" | "datetimerange" | "daterange" | "monthrange" | "checkbox" | "radio" | "color" | "success" | "warning" | "info" | "primary" | "danger" | "reset" | "submit" | "hidden" | "range" | "date" | "year" | "years" | "month" | "dates" | "week" | "datetime" | "dashboard" | "datetime-local" | "email" | "file" | "password" | "tel" | "url";
             loading: EpPropMergeType<BooleanConstructor, unknown, unknown> | EpPropMergeType<StringConstructor, "lazy" | "eager", unknown> | undefined;
             step: string | number;
             format: string | ProgressFn | undefined;
@@ -259,7 +259,7 @@ declare const _default: __VLS_WithTemplateSlots< DefineComponent<__VLS_WithDefau
     fieldInstance?: any;
     valueIsReady?: Ref<boolean> | undefined;
     prop: string;
-    modelValue: string | number | boolean | string[] | [string, string] | RecordType | Date | boolean[] | number[] | Date[] | [Date, Date] | [number, number] | string[][] | number[][] | null;
+    modelValue: string | number | boolean | string[] | [string, string] | boolean[] | RecordType | Date | number[] | Date[] | [Date, Date] | [number, number] | string[][] | number[][] | null;
     hasLabel: boolean | Ref<boolean> | ComputedRef<boolean>;
     tooltip: string | ComputedRef<string> | Partial< Mutable<ElTooltipProps> & {
         style?: CSSProperties | undefined;
@@ -293,9 +293,9 @@ declare const _default: __VLS_WithTemplateSlots< DefineComponent<__VLS_WithDefau
     clearable: boolean;
     index: number;
 }) => any>> & Partial<Record<string, (_: {
-    column: Readonly<Omit< LooseRequired<PlusFormItemProps>, "index" | "label" | "tooltip" | "formItemProps" | "fieldProps" | "options" | "modelValue" | "fieldSlots" | "fieldChildrenSlot" | "hasLabel" | "clearable" | "valueType" | "renderField" | "renderLabel" | "renderErrorMessage" | "optionsMap" | "autoDict">> & {
+    column: Readonly<Omit< LooseRequired<PlusFormItemProps>, "index" | "modelValue" | "label" | "tooltip" | "formItemProps" | "fieldProps" | "options" | "fieldSlots" | "fieldChildrenSlot" | "hasLabel" | "clearable" | "valueType" | "renderField" | "renderLabel" | "renderErrorMessage" | "optionsMap" | "autoDict">> & {
         readonly label: string | ComputedRef<string>;
-        readonly modelValue: string | number | boolean | string[] | [string, string] | RecordType | Date | boolean[] | number[] | Date[] | [Date, Date] | [number, number] | string[][] | number[][] | null;
+        readonly modelValue: string | number | boolean | string[] | [string, string] | boolean[] | RecordType | Date | number[] | Date[] | [Date, Date] | [number, number] | string[][] | number[][] | null;
         readonly hasLabel: boolean | Ref<boolean> | ComputedRef<boolean>;
         readonly tooltip: string | ComputedRef<string> | Partial< Mutable<ElTooltipProps> & {
             style?: CSSProperties | undefined;
@@ -322,7 +322,7 @@ declare const _default: __VLS_WithTemplateSlots< DefineComponent<__VLS_WithDefau
             };
             rows: number;
             autocomplete: string;
-            type: "" | "number" | "default" | "color" | "search" | "button" | "textarea" | "time" | "circle" | "image" | "line" | "text" | "datetimerange" | "daterange" | "monthrange" | "checkbox" | "radio" | "success" | "warning" | "info" | "primary" | "danger" | "reset" | "submit" | "hidden" | "range" | "date" | "year" | "years" | "month" | "dates" | "week" | "datetime" | "dashboard" | "datetime-local" | "email" | "file" | "password" | "tel" | "url";
+            type: "" | "number" | "default" | "search" | "button" | "textarea" | "time" | "circle" | "image" | "line" | "text" | "datetimerange" | "daterange" | "monthrange" | "checkbox" | "radio" | "color" | "success" | "warning" | "info" | "primary" | "danger" | "reset" | "submit" | "hidden" | "range" | "date" | "year" | "years" | "month" | "dates" | "week" | "datetime" | "dashboard" | "datetime-local" | "email" | "file" | "password" | "tel" | "url";
             loading: EpPropMergeType<BooleanConstructor, unknown, unknown> | EpPropMergeType<StringConstructor, "lazy" | "eager", unknown> | undefined;
             step: string | number;
             format: string | ProgressFn | undefined;
@@ -367,7 +367,7 @@ declare const _default: __VLS_WithTemplateSlots< DefineComponent<__VLS_WithDefau
     fieldInstance?: any;
     valueIsReady?: Ref<boolean> | undefined;
     prop: string;
-    modelValue: string | number | boolean | string[] | [string, string] | RecordType | Date | boolean[] | number[] | Date[] | [Date, Date] | [number, number] | string[][] | number[][] | null;
+    modelValue: string | number | boolean | string[] | [string, string] | boolean[] | RecordType | Date | number[] | Date[] | [Date, Date] | [number, number] | string[][] | number[][] | null;
     hasLabel: boolean | Ref<boolean> | ComputedRef<boolean>;
     tooltip: string | ComputedRef<string> | Partial< Mutable<ElTooltipProps> & {
         style?: CSSProperties | undefined;

package/lib/components/display-item/src/index.vue2.js

@@ -112,16 +112,18 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
       const value = props.column.valueType === "link" ? props.column.linkText || displayValue.value : displayValue.value;
       if (!displayItem.selectValueTypeList.includes(props.column.valueType) && !isEdit.value) {
         if (props.column.formatter && is.isFunction(props.column.formatter)) {
-          return props.column.formatter(value, renderParams.value);
+          const formattedValue = props.column.formatter(value, renderParams.value);
+          return handleEmptyValue(formattedValue);
         }
         if (displayComponent.value.format && is.isFunction(displayComponent.value.format)) {
-          return displayComponent.value.format(
+          const formattedValue = displayComponent.value.format(
             value,
             customFieldProps.value.format || customFieldProps.value.valueFormat
           );
+          return handleEmptyValue(formattedValue);
         }
       }
-      return value;
+      return handleEmptyValue(value);
     });
     const modelValues = vue.computed({
       get() {
@@ -153,6 +155,17 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
       column: { ...props.rest.column, ...props.column }
     }));
     vue.provide(form.TableFormRowInfoInjectionKey, tableRowInfo);
+    const injectedColumnsEmptyText = vue.inject(form.TableColumnsEmptyTextInjectionKey, vue.computed(() => "-"));
+    const handleEmptyValue = (value) => {
+      var _a;
+      if (value === null || value === void 0 || value === "") {
+        if (props.column.emptyText !== void 0) {
+          return props.column.emptyText;
+        }
+        return (_a = injectedColumnsEmptyText.value) != null ? _a : "-";
+      }
+      return value;
+    };
     const imageUrl = vue.computed(() => {
       const option = formatterValue.value;
       if (option && is.isString(option)) {