rj-grid 0.2.5 → 0.2.7

package/dist/rj-grid.js

@@ -4,7 +4,7 @@ var __publicField = (obj, key, value) => {
   __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
   return value;
 };
-import { reactive, ref, watch, computed, defineComponent, h, inject, openBlock, createElementBlock, normalizeStyle, Fragment, renderList, normalizeClass, createElementVNode, withModifiers, createTextVNode, toDisplayString, unref, createCommentVNode, createBlock, onMounted, nextTick, resolveDynamicComponent, withDirectives, withKeys, vModelText, vShow, mergeProps, toHandlers, render, vModelCheckbox, vModelSelect, vModelDynamic, resolveComponent, createVNode, onBeforeUnmount, useSlots, renderSlot, provide, isRef, createSlots, withCtx } from "vue";
+import { reactive, ref, watch, computed, defineComponent, h, inject, openBlock, createElementBlock, normalizeStyle, Fragment, renderList, normalizeClass, createElementVNode, withModifiers, createTextVNode, toDisplayString, unref, createCommentVNode, createBlock, onMounted, nextTick, resolveDynamicComponent, withDirectives, withKeys, vModelText, vShow, mergeProps, toHandlers, vModelCheckbox, vModelSelect, vModelDynamic, resolveComponent, createVNode, onBeforeUnmount, useSlots, renderSlot, provide, isRef, createSlots, withCtx } from "vue";
 function getValueByPath(obj, path) {
   if (!path)
     return void 0;
@@ -6109,14 +6109,16 @@ const RjSlotRender = defineComponent({
     };
   }
 });
-defineComponent({
+const RjFnRender = defineComponent({
   name: "RjFnRender",
   props: {
-    render: { type: Function, required: true },
+    render: { type: Function, default: void 0 },
     params: { type: Object, required: true }
   },
   setup(props) {
     return () => {
+      if (!props.render)
+        return null;
       const out = props.render(props.params);
       if (out == null)
         return null;
@@ -7035,32 +7037,16 @@ const _sfc_main$e = /* @__PURE__ */ defineComponent({
       return typeof t2 === "function" ? t2(cellParams.value) : t2;
     });
     const slotName = computed(() => "cell-" + props.leaf.colId);
-    function vnodeToHtml() {
+    const cellSlot = computed(() => {
       var _a;
-      const slotFn = (_a = props.gridSlots) == null ? void 0 : _a[slotName.value];
-      let vnode = null;
-      if (slotFn)
-        vnode = slotFn(cellParams.value);
-      else if (props.leaf.col.cellRenderer) {
-        const out = props.leaf.col.cellRenderer(cellParams.value);
-        vnode = typeof out === "string" || typeof out === "number" ? String(out) : out;
-      }
-      if (vnode == null)
-        return null;
-      const host = document.createElement("div");
-      render(h("div", null, Array.isArray(vnode) ? vnode : [vnode]), host);
-      const html = host.innerHTML;
-      render(null, host);
-      return html;
-    }
+      return ((_a = props.gridSlots) == null ? void 0 : _a[slotName.value]) ? slotName.value : "";
+    });
+    const cellRendererFn = computed(() => cellSlot.value ? void 0 : props.leaf.col.cellRenderer);
     function esc(s) {
       return s.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
     }
     const richContent = computed(() => {
       var _a;
-      const custom = vnodeToHtml();
-      if (custom != null)
-        return custom;
       const text = props.display ?? "";
       if (text === "")
         return "";
@@ -7085,12 +7071,11 @@ const _sfc_main$e = /* @__PURE__ */ defineComponent({
       return html;
     });
     const imgUrls = computed(() => {
-      var _a;
       const c = props.leaf.col;
       if (c.type !== "image")
         return [];
       const cfg = c.image || {};
-      if (((_a = props.gridSlots) == null ? void 0 : _a[slotName.value]) || c.cellRenderer)
+      if (cellSlot.value || c.cellRenderer)
         return [];
       const raw = cfg.src ? cfg.src(cellParams.value) : props.value;
       if (raw == null || raw === "")
@@ -7121,7 +7106,7 @@ const _sfc_main$e = /* @__PURE__ */ defineComponent({
       emit("img-preview", url);
     }
     return (_ctx, _cache) => {
-      var _a, _b, _c;
+      var _a, _b, _c, _d, _e;
       return openBlock(), createElementBlock("div", {
         class: normalizeClass(["rj-cell", cellClass.value]),
         style: normalizeStyle([baseStyle.value, dynStyle.value]),
@@ -7193,18 +7178,46 @@ const _sfc_main$e = /* @__PURE__ */ defineComponent({
             class: "rj-expand-icon",
             onClick: _cache[6] || (_cache[6] = withModifiers(($event) => _ctx.$emit("toggle-detail", _ctx.drow.key), ["stop"]))
           }, toDisplayString(_ctx.detailOpen ? unref(icons).collapse : unref(icons).expand), 1)) : (openBlock(), createElementBlock("span", _hoisted_5$c)),
-          imgUrls.value.length ? (openBlock(), createBlock(_sfc_main$g, mergeProps({ key: 3 }, imgBind.value, { onPreview: onImgPreview }), null, 16)) : (openBlock(), createElementBlock("span", {
+          imgUrls.value.length ? (openBlock(), createBlock(_sfc_main$g, mergeProps({ key: 3 }, imgBind.value, { onPreview: onImgPreview }), null, 16)) : cellSlot.value || cellRendererFn.value ? (openBlock(), createElementBlock("span", {
             key: 4,
+            class: normalizeClass(["rj-cell-inner rj-cell-custom", { wrap: _ctx.leaf.col.wrapText }])
+          }, [
+            ((_b = _ctx.gridSlots) == null ? void 0 : _b[cellSlot.value]) ? (openBlock(), createBlock(unref(RjSlotRender), {
+              key: 0,
+              slots: _ctx.gridSlots,
+              name: cellSlot.value,
+              params: cellParams.value
+            }, null, 8, ["slots", "name", "params"])) : (openBlock(), createBlock(unref(RjFnRender), {
+              key: 1,
+              render: cellRendererFn.value,
+              params: cellParams.value
+            }, null, 8, ["render", "params"]))
+          ], 2)) : (openBlock(), createElementBlock("span", {
+            key: 5,
             class: normalizeClass(["rj-cell-inner", { wrap: _ctx.leaf.col.wrapText }]),
             innerHTML: richContent.value
           }, null, 10, _hoisted_6$c))
-        ], 64)) : imgUrls.value.length ? (openBlock(), createBlock(_sfc_main$g, mergeProps({ key: 5 }, imgBind.value, { onPreview: onImgPreview }), null, 16)) : sparkData.value ? (openBlock(), createBlock(_sfc_main$f, {
+        ], 64)) : imgUrls.value.length ? (openBlock(), createBlock(_sfc_main$g, mergeProps({ key: 5 }, imgBind.value, { onPreview: onImgPreview }), null, 16)) : cellSlot.value || cellRendererFn.value ? (openBlock(), createElementBlock("span", {
           key: 6,
+          class: normalizeClass(["rj-cell-inner rj-cell-custom", { wrap: _ctx.leaf.col.wrapText }])
+        }, [
+          ((_c = _ctx.gridSlots) == null ? void 0 : _c[cellSlot.value]) ? (openBlock(), createBlock(unref(RjSlotRender), {
+            key: 0,
+            slots: _ctx.gridSlots,
+            name: cellSlot.value,
+            params: cellParams.value
+          }, null, 8, ["slots", "name", "params"])) : (openBlock(), createBlock(unref(RjFnRender), {
+            key: 1,
+            render: cellRendererFn.value,
+            params: cellParams.value
+          }, null, 8, ["render", "params"]))
+        ], 2)) : sparkData.value ? (openBlock(), createBlock(_sfc_main$f, {
+          key: 7,
           data: sparkData.value,
-          style: normalizeStyle(((_b = _ctx.leaf.col.sparkline) == null ? void 0 : _b.style) || "bar"),
-          color: (_c = _ctx.leaf.col.sparkline) == null ? void 0 : _c.color
+          style: normalizeStyle(((_d = _ctx.leaf.col.sparkline) == null ? void 0 : _d.style) || "bar"),
+          color: (_e = _ctx.leaf.col.sparkline) == null ? void 0 : _e.color
         }, null, 8, ["data", "style", "color"])) : (openBlock(), createElementBlock("span", {
-          key: 7,
+          key: 8,
           class: normalizeClass(["rj-cell-inner", { wrap: _ctx.leaf.col.wrapText }]),
           innerHTML: richContent.value
         }, null, 10, _hoisted_7$b))

package/dist/style.css

@@ -985,6 +985,9 @@
   white-space: normal;
   word-break: break-all;
 }
+.rj-cell .rj-cell-inner.rj-cell-custom {
+  line-height: normal;
+}
 .rj-cell.is-editing {
   padding: 0;
   overflow: visible;

package/dist/types/src/RjSlotRender.d.ts

@@ -38,7 +38,7 @@ export default _default;
 export declare const RjFnRender: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
     render: {
         type: PropType<(p: any) => any>;
-        required: true;
+        default: undefined;
     };
     params: {
         type: PropType<any>;
@@ -47,10 +47,12 @@ export declare const RjFnRender: import("vue").DefineComponent<import("vue").Ext
 }>, () => any, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     render: {
         type: PropType<(p: any) => any>;
-        required: true;
+        default: undefined;
     };
     params: {
         type: PropType<any>;
         required: true;
     };
-}>> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
+}>> & Readonly<{}>, {
+    render: (p: any) => any;
+}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rj-grid",
-  "version": "0.2.5",
+  "version": "0.2.7",
   "description": "零第三方依赖的自研 Vue3 虚拟表格：虚拟滚动 / 冻结列 / 行拖拽 / 分组透视 / 公式 / SSRM / 主题 i18n / 自然语言查询",
   "type": "module",
   "license": "MIT",