@wlydfe/pro-ui 0.2.5 → 0.2.6

package/es/components/display-item/src/index.vue2.mjs

@@ -6,11 +6,15 @@ import '../../../hooks/index.mjs';
 import { PlusRender } from '../../render/index.mjs';
 import { ElImage, ElLink, ElTag, ElProgress, ElIcon } from 'element-plus';
 import { useGetOptions } from '../../../hooks/useGetOptions.mjs';
-import { isArray, isFunction } from '../../utils/is.mjs';
 import { formatDate, formatMoney } from '../../utils/format.mjs';
+import { isArray, isFunction } from '../../utils/is.mjs';
 
 const _hoisted_1 = ["innerHTML"];
-const _hoisted_2 = { class: "plus-display-item" };
+const _hoisted_2 = {
+  key: 1,
+  class: "plus-display-item"
+};
+const _hoisted_3 = { class: "plus-display-item" };
 const _sfc_main = /* @__PURE__ */ defineComponent({
   ...{
     name: "PlusDisplayItem"
@@ -33,9 +37,26 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const columns = ref([]);
     const subRow = ref(props.row);
     const customFieldPropsIsReady = ref(false);
+    const rawValue = computed(() => getValue(subRow.value, props.column.prop));
     const displayValue = computed({
       get() {
-        return getValue(subRow.value, props.column.prop);
+        var _a, _b;
+        const value = rawValue.value;
+        const isEmpty = value === "" || value === null || value === void 0;
+        if (isEmpty) {
+          switch (props.column.valueType) {
+            case "progress":
+              return 0;
+            default:
+              return ((_a = props.column.tableColumnProps) == null ? void 0 : _a.emptyText) || "-";
+          }
+        }
+        switch (props.column.valueType) {
+          case "date-picker":
+            return value ? formatDate(value) : ((_b = props.column.tableColumnProps) == null ? void 0 : _b.emptyText) || "-";
+          default:
+            return value;
+        }
       },
       set(value) {
         setValue(subRow.value, props.column.prop, value);
@@ -314,7 +335,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             ],
             2112
             /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */
-          )) : _ctx.column.valueType === "date-picker" && displayValue.value ? (openBlock(), createElementBlock(
+          )) : _ctx.column.valueType === "date-picker" ? (openBlock(), createElementBlock(
             Fragment,
             { key: 6 },
             [
@@ -322,7 +343,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               createElementVNode(
                 "span",
                 mergeProps({ class: "plus-display-item" }, customFieldProps.value),
-                toDisplayString(unref(formatDate)(displayValue.value)),
+                toDisplayString(displayValue.value),
                 17
                 /* TEXT, FULL_PROPS */
               )
@@ -353,25 +374,45 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 "span",
                 mergeProps({ class: "plus-display-item plus-display-item__badge" }, customFieldProps.value),
                 [
-                  getStatus.value.color || getStatus.value.type ? (openBlock(), createElementBlock(
-                    "span",
-                    {
-                      key: 0,
-                      class: normalizeClass([
-                        "plus-display-item__badge__dot",
-                        getStatus.value.type && !getStatus.value.color ? "plus-display-item__badge__dot--" + getStatus.value.type : ""
-                      ]),
-                      style: normalizeStyle({ backgroundColor: getStatus.value.color })
-                    },
-                    null,
-                    6
-                    /* CLASS, STYLE */
-                  )) : createCommentVNode("v-if", true),
-                  createTextVNode(
-                    " " + toDisplayString(getStatus.value.label),
-                    1
-                    /* TEXT */
-                  )
+                  rawValue.value !== "" && rawValue.value !== null && rawValue.value !== void 0 ? (openBlock(), createElementBlock(
+                    Fragment,
+                    { key: 0 },
+                    [
+                      getStatus.value.color || getStatus.value.type ? (openBlock(), createElementBlock(
+                        "span",
+                        {
+                          key: 0,
+                          class: normalizeClass([
+                            "plus-display-item__badge__dot",
+                            getStatus.value.type && !getStatus.value.color ? "plus-display-item__badge__dot--" + getStatus.value.type : ""
+                          ]),
+                          style: normalizeStyle({ backgroundColor: getStatus.value.color })
+                        },
+                        null,
+                        6
+                        /* CLASS, STYLE */
+                      )) : createCommentVNode("v-if", true),
+                      createTextVNode(
+                        " " + toDisplayString(getStatus.value.label),
+                        1
+                        /* TEXT */
+                      )
+                    ],
+                    64
+                    /* STABLE_FRAGMENT */
+                  )) : (openBlock(), createElementBlock(
+                    Fragment,
+                    { key: 1 },
+                    [
+                      createTextVNode(
+                        toDisplayString(displayValue.value),
+                        1
+                        /* TEXT */
+                      )
+                    ],
+                    64
+                    /* STABLE_FRAGMENT */
+                  ))
                 ],
                 16
                 /* FULL_PROPS */
@@ -379,14 +420,17 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             ],
             2112
             /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */
-          )) : _ctx.column.valueType === "tag" && displayValue.value ? (openBlock(), createElementBlock(
+          )) : _ctx.column.valueType === "tag" ? (openBlock(), createElementBlock(
             Fragment,
             { key: 9 },
             [
               createCommentVNode(" \u6807\u7B7E "),
-              createVNode(
+              rawValue.value !== "" && rawValue.value !== null && rawValue.value !== void 0 ? (openBlock(), createBlock(
                 unref(ElTag),
-                mergeProps({ class: "plus-display-item" }, customFieldProps.value),
+                mergeProps({
+                  key: 0,
+                  class: "plus-display-item"
+                }, customFieldProps.value),
                 createSlots({
                   default: withCtx(() => [
                     createTextVNode(
@@ -415,10 +459,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 ]),
                 1040
                 /* FULL_PROPS, DYNAMIC_SLOTS */
-              )
+              )) : (openBlock(), createElementBlock(
+                "span",
+                _hoisted_2,
+                toDisplayString(displayValue.value),
+                1
+                /* TEXT */
+              ))
             ],
-            2112
-            /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */
+            64
+            /* STABLE_FRAGMENT */
           )) : _ctx.column.valueType === "progress" ? (openBlock(), createElementBlock(
             Fragment,
             { key: 10 },
@@ -454,7 +504,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             { key: 11 },
             [
               createCommentVNode(" \u590D\u5236 "),
-              createElementVNode("span", _hoisted_2, [
+              createElementVNode("span", _hoisted_3, [
                 createTextVNode(
                   toDisplayString(displayValue.value) + " ",
                   1