@aplus-frontend/ui 0.1.1 → 0.1.3

package/es/src/editable-table/hooks/use-get-columns.mjs

@@ -1,81 +1,63 @@
-import { computed as y, createVNode as s, mergeProps as x } from "vue";
-import { omit as C, isFunction as h, isBoolean as R } from "lodash-unified";
-import { getEditableComponent as F, mergeClass as T, getRawDisplayValue as I } from "../utils.mjs";
-import { updateFormProps as N, getFieldProps as V, getPlaceholder as w, getTableRenderProps as L } from "../../ap-table/utils.mjs";
+import { computed as f } from "vue";
+import { omit as g, isFunction as F } from "lodash-unified";
+import { mergeClass as b, getFinalNode as x } from "../utils.mjs";
+import { updateFormProps as R, getFieldProps as h, getPlaceholder as C, getTableRenderProps as I } from "../../ap-table/utils.mjs";
 import "../../config-provider/index.mjs";
-import { apTableRenderItemMap as M, noRenderAsFormItemValueList as A } from "../../ap-table/constants.mjs";
-import { Typography as B } from "ant-design-vue";
-import { useLocale as D } from "../../config-provider/hooks/use-locale.mjs";
-const v = (t) => {
+import { useLocale as y } from "../../config-provider/hooks/use-locale.mjs";
+const $ = (o) => {
   const {
-    t: u
-  } = D(), f = y(() => {
-    let l = t.columns;
-    return l ? (l = l.map((e) => ({
-      ...C(e, ["ellipsis"]),
+    t: i
+  } = y();
+  return f(() => {
+    let d = o.columns;
+    return d ? (d = d.map((e) => ({
+      ...g(e, ["ellipsis"]),
       customRender({
-        value: n,
-        ...a
+        value: t,
+        ...l
       }) {
-        const i = h(e.editable) ? e.editable(a.text, a.record, a.index) : !!e.editable;
-        let r;
-        if (i) {
-          const d = F(e.valueType), o = N(e, V(e.fieldProps, {
-            value: n,
-            ...a
-          })), c = {};
-          t.onFieldChange && (c[`onUpdate:${o.valuePropName || "value"}`] = (b) => {
-            var p;
-            return (p = t.onFieldChange) == null ? void 0 : p.call(t, a.index, e.dataIndex, b);
-          });
-          const g = {
-            name: [t.name, a.index, e.dataIndex],
-            ...o || {},
+        const a = F(e.editable) ? e.editable(l.text, l.record, l.index) : !!e.editable;
+        if (!e.valueType && !e.customRender && !e.customRenderFormItem)
+          return console.warn("can not render table cell because no `valueType` / `customRender` / `customRenderFormItem`"), null;
+        let c;
+        if (a) {
+          const n = R(e, h(e.fieldProps, {
+            value: t,
+            ...l
+          })), u = {};
+          o.onFieldChange && (u[`onUpdate:${n.valuePropName || "value"}`] = (s) => {
+            var m;
+            return (m = o.onFieldChange) == null ? void 0 : m.call(o, l.index, e.dataIndex, s);
+          }), c = {
+            name: [o.name, l.index, e.dataIndex],
+            ...n || {},
             // 格式化placeholder
-            placeholder: w(u, e.valueType, o == null ? void 0 : o.placeholder),
+            placeholder: C(i, e.valueType, n == null ? void 0 : n.placeholder),
             field: {
               style: "width: 100%",
-              ...(o == null ? void 0 : o.field) || {},
-              ...c,
-              class: T("is-editable", o.class)
+              ...(n == null ? void 0 : n.field) || {},
+              ...u,
+              class: b("is-editable", n.class)
             }
           };
-          r = s(d, g, null);
-        } else {
-          const d = M[e.valueType], o = L(e, {
-            value: n,
-            ...a
-          });
-          r = m(e, n, s(d, x(o, {
-            mode: "read"
-          }), null));
-        }
+        } else
+          c = {
+            field: I(e, {
+              value: t,
+              ...l
+            })
+          };
+        const r = x(e, a, c, t);
         return e.customRender ? e.customRender({
-          value: n,
-          ...a,
-          editable: i,
+          value: t,
+          ...l,
+          editable: a,
           originalNode: r
         }) : r;
       }
-    })), l) : [];
+    })), d) : [];
   });
-  function m(l, e, n) {
-    return A.includes(l.valueType) ? n : l.copyable || l.ellipsis ? s(B.Paragraph, {
-      copyable: l.copyable ? {
-        text: e,
-        tooltip: !1
-      } : !1,
-      ellipsis: l.ellipsis ? R(l.ellipsis) ? {
-        tooltip: e
-      } : {
-        ...l.ellipsis,
-        tooltip: e
-      } : !1,
-      content: l.ellipsis ? I(l, e) : n
-    }, null) : n;
-  }
-  return f;
 };
 export {
-  v as default
+  $ as default
 };

package/es/src/editable-table/interface.d.ts

@@ -29,10 +29,9 @@ export type EditableColumnType<RecordType = any, ValueType extends ApTableValueT
      */
     valueEnum?: ValueEnum;
     /**
-     * 自定义表单
-     * @deprecated 未实现，请使用`customRender`
+     * 自定义表单，适用于内置`valueType`不满足的情况下使用
      */
-    customRenderFormItem?: (config: EditableColumnType<RecordType, ValueType>) => any;
+    customRenderFormItem?: (config: EditableColumnType<RecordType, ValueType>, fieldProps: Record<string, any>, editable: boolean) => any;
     /**
      * 指定值类型（将会用于普通列和可编辑表格的渲染）
      */

package/es/src/editable-table/utils.d.ts

@@ -27,3 +27,4 @@ export declare function mergeClass(current: string, classNames?: string | string
  * @param options
  */
 export declare function scrollToRowIndex(index: number, container?: HTMLElement, options?: StandardBehaviorOptions): void;
+export declare function getFinalNode(column: EditableColumnType, editable: boolean, innerProps: Record<string, any>, value: any): any;

package/es/src/editable-table/utils.mjs

@@ -1,50 +1,90 @@
-import { isFunction as i, isArray as n } from "lodash-unified";
-import { apTableFormItemMap as s } from "../ap-table/constants.mjs";
-import { isDef as f } from "../utils/index.mjs";
-import { getValueStr as l } from "../ap-field/number/helper.mjs";
-import d from "scroll-into-view-if-needed";
-function m(r) {
-  const e = s[r];
-  return e || console.warn(
-    `${r} can not render because of no default renderer, use customRender instead.`
-  ), e;
-}
-function b(r) {
-  if (!r.fieldProps)
+import { isVNode as f, createVNode as s, mergeProps as d } from "vue";
+import { isFunction as n, isArray as p, isBoolean as a, omit as u } from "lodash-unified";
+import { apTableFormItemMap as c, noRenderAsFormItemValueList as y, apTableRenderItemMap as m } from "../ap-table/constants.mjs";
+import { isDef as b } from "../utils/index.mjs";
+import { getValueStr as g } from "../ap-field/number/helper.mjs";
+import T from "scroll-into-view-if-needed";
+import { Typography as C } from "ant-design-vue";
+import "../ap-form/index.mjs";
+import I from "../ap-form/ap-form-item.vue.mjs";
+function P(e) {
+  return typeof e == "function" || Object.prototype.toString.call(e) === "[object Object]" && !f(e);
+}
+function R(e) {
+  return c[e];
+}
+function _(e) {
+  if (!e.fieldProps)
     return !1;
-  const e = i(r.fieldProps) ? r.fieldProps({}) : r.fieldProps;
-  return f(e.required) ? e.required : (n(e.rules) ? e.rules : e.rules ? [e.rules] : []).some((t) => t.required);
-}
-function g(r, e) {
-  if (r.valueType === "text" || r.valueType === "textArea")
-    return e || "--";
-  if (r.valueType === "number") {
-    const o = r.fieldProps ? i(r.fieldProps) ? r.fieldProps({}) : r.fieldProps : {};
-    return l(e, o) || "--";
+  const r = n(e.fieldProps) ? e.fieldProps({}) : e.fieldProps;
+  return b(r.required) ? r.required : (p(r.rules) ? r.rules : r.rules ? [r.rules] : []).some((t) => t.required);
+}
+function F(e, r) {
+  if (e.valueType === "text" || e.valueType === "textArea")
+    return r || "--";
+  if (e.valueType === "number") {
+    const o = e.fieldProps ? n(e.fieldProps) ? e.fieldProps({}) : e.fieldProps : {};
+    return g(r, o) || "--";
   }
-  return e;
+  return r;
 }
-function w(r, e) {
-  const o = [r];
-  if (e) {
-    const t = n(e) ? e : [e];
+function D(e, r) {
+  const o = [e];
+  if (r) {
+    const t = p(r) ? r : [r];
     o.unshift(...t);
   }
   return o.join(" ");
 }
-function y(r, e = document.body, o = {}) {
-  const t = e.querySelectorAll("tr.ant-table-row")[r];
-  console.log(t), t && d(t, {
+function N(e, r = document.body, o = {}) {
+  const t = r.querySelectorAll("tr.ant-table-row")[e];
+  console.log(t), t && T(t, {
     scrollMode: "if-needed",
     block: "nearest",
     behavior: "smooth",
     ...o
   });
 }
+function V(e, r, o) {
+  return y.includes(e.valueType) ? o : e.copyable || e.ellipsis ? s(C.Paragraph, {
+    copyable: e.copyable ? {
+      text: r,
+      tooltip: !1
+    } : !1,
+    ellipsis: e.ellipsis ? a(e.ellipsis) ? {
+      tooltip: r
+    } : {
+      ...e.ellipsis,
+      tooltip: r
+    } : !1,
+    content: e.ellipsis ? F(e, r) : o
+  }, null) : o;
+}
+function O(e, r, o, t) {
+  let l;
+  if (e.valueType)
+    if (r) {
+      const i = R(e.valueType);
+      l = s(i, o, null);
+    } else {
+      const i = m[e.valueType];
+      l = V(e, t, s(i, d(o.field, {
+        mode: "read"
+      }), null));
+    }
+  if (e.customRenderFormItem) {
+    const i = e.customRenderFormItem(e, o.field, r);
+    l = s(I, u(o, ["field"]), P(i) ? i : {
+      default: () => [i]
+    });
+  }
+  return l;
+}
 export {
-  b as getColumnIsRequired,
-  m as getEditableComponent,
-  g as getRawDisplayValue,
-  w as mergeClass,
-  y as scrollToRowIndex
+  _ as getColumnIsRequired,
+  R as getEditableComponent,
+  O as getFinalNode,
+  F as getRawDisplayValue,
+  D as mergeClass,
+  N as scrollToRowIndex
 };