@airpower/web 1.7.0 → 1.7.2

package/dist/main.js

@@ -17429,7 +17429,12 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
   setup(__props) {
     const props = __props;
     const key = props.column.key;
-    const value = computed(() => (props.data[key] || "").toString() || props.column.emptyValue || "-");
+    const value = computed(() => {
+      if (props.column.formatter) {
+        return props.column.formatter(props.data);
+      }
+      return (props.data[key] || "").toString() || props.column.emptyValue || "-";
+    });
     return (_ctx, _cache) => {
       return openBlock(), createBlock(unref(ACopy), { content: value.value }, {
         default: withCtx(() => [
@@ -17594,7 +17599,7 @@ const _hoisted_5$1 = {
   style: { "color": "#aaa", "margin-right": "3px" }
 };
 const _hoisted_6 = {
-  key: 11,
+  key: 10,
   style: { "color": "#aaa" }
 };
 const _hoisted_7 = { class: "ctrlRow" };
@@ -18231,11 +18236,15 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
     function getRowEntity(scope) {
       return scope.row;
     }
-    function getValue(scope, key) {
+    function getValue(scope, config) {
+      const key = config.key;
+      if (config.formatter) {
+        return config.formatter(getRowEntity(scope));
+      }
       return getRowEntity(scope)[key];
     }
-    function getPayloadArray(scope, key) {
-      const value = getValue(scope, key);
+    function getPayloadArray(scope, config) {
+      const value = getValue(scope, config);
       return value;
     }
     function tableRowClassName({ row }) {
@@ -18560,49 +18569,46 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
                     data: getRowEntity(scope),
                     index: scope.$index
                   }, () => [
-                    item.prefixText ? (openBlock(), createElementBlock("span", _hoisted_5$1, toDisplayString(item.prefixText), 1)) : createCommentVNode("", true),
-                    item.formatter ? (openBlock(), createElementBlock(Fragment, { key: 1 }, [
-                      createTextVNode(toDisplayString(item.formatter(getRowEntity(scope))), 1)
-                    ], 64)) : unref(getDictionary)(unref(EntityClass), item.key) ? (openBlock(), createBlock(unref(EnumColumn), {
-                      key: 2,
+                    item.prefixText ? (openBlock(), createElementBlock("span", _hoisted_5$1, toDisplayString(item.prefixText), 1)) : unref(getDictionary)(unref(EntityClass), item.key) ? (openBlock(), createBlock(unref(EnumColumn), {
+                      key: 1,
                       column: item,
-                      data: scope.row,
+                      data: getRowEntity(scope),
                       dictionary: unref(getDictionary)(unref(EntityClass), item.key)
                     }, null, 8, ["column", "data", "dictionary"])) : item.image ? (openBlock(), createBlock(unref(_sfc_main$k), {
-                      key: 3,
+                      key: 2,
                       height: item.imageHeight || 40,
-                      src: getValue(scope, item.key),
+                      src: getValue(scope, item),
                       width: item.imageWidth || 40
                     }, null, 8, ["height", "src", "width"])) : item.phone ? (openBlock(), createBlock(unref(APhone), {
-                      key: 4,
+                      key: 3,
                       desensitize: item.desensitize,
-                      phone: getValue(scope, item.key)
+                      phone: getValue(scope, item)
                     }, null, 8, ["desensitize", "phone"])) : item.datetime ? (openBlock(), createBlock(unref(ADateTime), {
-                      key: 5,
+                      key: 4,
                       formatter: item.datetime === true ? unref(DateTimeFormatter).FULL_DATE_TIME : item.datetime,
-                      "milli-second": getValue(scope, item.key)
+                      "milli-second": getValue(scope, item)
                     }, null, 8, ["formatter", "milli-second"])) : item.money ? (openBlock(), createBlock(unref(AMoney), {
-                      key: 6,
-                      money: getValue(scope, item.key)
-                    }, null, 8, ["money"])) : item.payload ? (openBlock(), createElementBlock(Fragment, { key: 7 }, [
+                      key: 5,
+                      money: getValue(scope, item)
+                    }, null, 8, ["money"])) : item.payload ? (openBlock(), createElementBlock(Fragment, { key: 6 }, [
                       item.array ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
-                        createTextVNode(toDisplayString(getPayloadArray(scope, item.key).map((payload) => payload.getPayloadLabel()).join(",")), 1)
+                        createTextVNode(toDisplayString(getPayloadArray(scope, item).map((payload) => payload.getPayloadLabel()).join(",")), 1)
                       ], 64)) : (openBlock(), createBlock(unref(APayload), {
                         key: 1,
-                        payload: getValue(scope, item.key)
+                        payload: getValue(scope, item)
                       }, null, 8, ["payload"]))
                     ], 64)) : item.desensitize ? (openBlock(), createBlock(unref(ADesensitize), {
-                      key: 8,
-                      content: getValue(scope, item.key),
+                      key: 7,
+                      content: getValue(scope, item),
                       type: item.desensitize
                     }, null, 8, ["content", "type"])) : item.copy ? (openBlock(), createBlock(unref(_sfc_main$4), {
-                      key: 9,
+                      key: 8,
                       column: item,
-                      data: scope.row
+                      data: getRowEntity(scope)
                     }, null, 8, ["column", "data"])) : (openBlock(), createElementBlock("div", {
-                      key: 10,
+                      key: 9,
                       class: normalizeClass([item.wrap ? "" : "nowrap", "a-table-column"])
-                    }, toDisplayString(getStringValue(getValue(scope, item.key)) ?? item.emptyValue), 3)),
+                    }, toDisplayString(getStringValue(getValue(scope, item)) ?? item.emptyValue), 3)),
                     item.suffixText ? (openBlock(), createElementBlock("span", _hoisted_6, toDisplayString(item.suffixText), 1)) : createCommentVNode("", true)
                   ]) : createCommentVNode("", true)
                 ]),

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@airpower/web",
   "type": "module",
-  "version": "1.7.0",
+  "version": "1.7.2",
   "description": "AirPower-Web",
   "author": {
     "name": "Hamm",