@aplus-frontend/ui 0.1.16 → 0.1.18

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

@@ -1,13 +1,14 @@
 import { ColumnType, TableProps } from 'ant-design-vue/es/table';
-import { ApTableValueFields, ApTableValueTypes, ValueEnum } from '../ap-table';
+import { ApTableValueFields, ApTableValueTypes, CommonFieldReturnType, FieldPropsType, ValueEnum } from '../ap-table';
 import { NamePath, ValidateOptions } from 'ant-design-vue/es/form/interface';
 import { DataIndex } from 'ant-design-vue/es/vc-table/interface';
 import { FormItemProps } from 'ant-design-vue';
 import { VNode } from 'vue';
 import { EllipsisConfig } from 'ant-design-vue/es/typography/Base';
 import { StandardBehaviorOptions } from '../../node_modules/scroll-into-view-if-needed';
-export type EditableColumnType<RecordType = any, ValueType extends ApTableValueTypes = ApTableValueTypes> = ValueType extends ApTableValueTypes ? Omit<ColumnType<RecordType>, 'children' | 'customRender' | 'ellipsis'> & {
-    children?: EditableColumnType<RecordType, ValueType>;
+import { Recordable } from '../type';
+export type EditableColumnType<RecordType = any, ExtraValueType = 'text', ValueType extends ApTableValueTypes = ApTableValueTypes, MergedValueType extends ExtraValueType | ValueType = ExtraValueType | ValueType> = MergedValueType extends ExtraValueType | ValueType ? Omit<ColumnType<RecordType>, 'children' | 'customRender' | 'ellipsis'> & {
+    children?: EditableColumnType<RecordType, ExtraValueType, ValueType, MergedValueType>;
     /**
      * 在title之后展示一个icon并触发tooltip
      */
@@ -31,22 +32,15 @@ export type EditableColumnType<RecordType = any, ValueType extends ApTableValueT
     /**
      * 自定义表单，适用于内置`valueType`不满足的情况下使用
      */
-    customRenderFormItem?: (config: EditableColumnType<RecordType, ValueType>, fieldProps: Record<string, any>, editable: boolean) => any;
+    customRenderFormItem?: (config: EditableColumnType<RecordType>, fieldProps: Recordable, editable: boolean) => any;
     /**
      * 指定值类型（将会用于普通列和可编辑表格的渲染）
      */
-    valueType?: ValueType;
+    valueType?: MergedValueType;
     /**
      * 值类型额外配置的参数（支持函数）
      */
-    fieldProps?: ApTableValueFields[ValueType] | ((opt: {
-        value: any;
-        text: any;
-        record: RecordType;
-        index: number;
-        renderIndex: number;
-        column: EditableColumnType<RecordType, ValueType>;
-    }) => ApTableValueFields[ValueType]);
+    fieldProps?: FieldPropsType<Extract<MergedValueType, ValueType> extends never ? CommonFieldReturnType : ApTableValueFields[Extract<MergedValueType, ValueType>], RecordType, ExtraValueType, ValueType, MergedValueType>;
     /**
      * 自定义渲染，添加了`editable`以及`originalNode`
      * @param opt

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

@@ -1,5 +1,6 @@
 import { EditableColumnType } from './interface';
 import { StandardBehaviorOptions } from '../../node_modules/scroll-into-view-if-needed';
+import { ValueTypeRenderConfig } from '../config-provider';
 /**
  * 获取编辑模式下默认映射的组件
  * @param valueType
@@ -8,10 +9,11 @@ import { StandardBehaviorOptions } from '../../node_modules/scroll-into-view-if-
 export declare function getEditableComponent(valueType: EditableColumnType['valueType']): any;
 /**
  * 获取可编辑表格的某列字段是否是required
+ * @description 请注意，此方法只根据`fieldProps.required`和`fieldProps.rules`来判断，并不会关注当前列是否可以渲染编辑节点
  * @param column
  * @returns
  */
-export declare function getColumnIsRequired(column: EditableColumnType<any, 'text'>): boolean;
+export declare function getColumnIsRequired(column: EditableColumnType<any, 'tex', 'text'>): boolean;
 /**
  * 获取ellipsis模式下最终需要渲染的字符串
  * @param column
@@ -27,4 +29,14 @@ 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;
+/**
+ * 获取最终需要渲染到单元格的节点
+ * @param column 表格列配置
+ * @param editable 是否可编辑
+ * @param innerProps props
+ * @param value 当前表格映射的值
+ * @param record 当前行数据
+ * @param extraValueTypes 自定义valueType映射
+ * @returns
+ */
+export declare function getFinalNode(column: EditableColumnType, editable: boolean, innerProps: Record<string, any>, value: any, record: any, extraRenderMap?: Record<string, ValueTypeRenderConfig>): any;

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

@@ -1,91 +1,100 @@
-import { isVNode as f, createVNode as n, mergeProps as d } from "vue";
-import { isFunction as p, isArray as s, isBoolean as a, omit as u } from "lodash-unified";
-import { apTableFormItemMap as c, noRenderAsFormItemValueList as m, apTableRenderItemMap as y } 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 { isVNode as F, createVNode as f, mergeProps as g } from "vue";
+import { isFunction as b, isArray as T, isBoolean as h, omit as P } from "lodash-unified";
+import { apTableFormItemMap as V, noRenderAsFormItemValueList as j, apTableRenderItemMap as q } from "../ap-table/constants.mjs";
+import { isDef as w } from "../utils/index.mjs";
+import { getValueStr as S } from "../ap-field/number/helper.mjs";
+import A from "scroll-into-view-if-needed";
+import { Typography as v } from "ant-design-vue";
 import "../ap-form/index.mjs";
-import { objectToString as I } from "../ap-table/utils.mjs";
-import P from "../ap-form/ap-form-item.vue.mjs";
-function R(e) {
-  return typeof e == "function" || Object.prototype.toString.call(e) === "[object Object]" && !f(e);
-}
-function F(e) {
-  return c[e];
+import { objectToString as C } from "../ap-table/utils.mjs";
+import m from "../ap-form/ap-form-item.vue.mjs";
+function y(e) {
+  return typeof e == "function" || Object.prototype.toString.call(e) === "[object Object]" && !F(e);
 }
 function N(e) {
+  return V[e];
+}
+function Q(e) {
   if (!e.fieldProps)
     return !1;
-  const r = p(e.fieldProps) ? e.fieldProps({}) : e.fieldProps;
-  return b(r.required) ? r.required : (s(r.rules) ? r.rules : r.rules ? [r.rules] : []).some((t) => t.required);
+  const t = b(e.fieldProps) ? e.fieldProps({}) : e.fieldProps;
+  return w(t.required) ? t.required : (T(t.rules) ? t.rules : t.rules ? [t.rules] : []).some((r) => r.required);
 }
-function V(e, r) {
+function _(e, t) {
   if (e.valueType === "text" || e.valueType === "textArea")
-    return r || "--";
+    return t || "--";
   if (e.valueType === "number") {
-    const o = e.fieldProps ? p(e.fieldProps) ? e.fieldProps({}) : e.fieldProps : {};
-    return g(r, o) || "--";
+    const o = e.fieldProps ? b(e.fieldProps) ? e.fieldProps({}) : e.fieldProps : {};
+    return S(t, o) || "--";
   }
-  return I(r);
+  return C(t);
 }
-function O(e, r) {
+function R(e, t) {
   const o = [e];
-  if (r) {
-    const t = s(r) ? r : [r];
-    o.unshift(...t);
+  if (t) {
+    const r = T(t) ? t : [t];
+    o.unshift(...r);
   }
   return o.join(" ");
 }
-function k(e, r = document.body, o = {}) {
-  const t = r.querySelectorAll("tr.ant-table-row")[e];
-  t && T(t, {
+function U(e, t = document.body, o = {}) {
+  const r = t.querySelectorAll("tr.ant-table-row")[e];
+  r && A(r, {
     scrollMode: "if-needed",
     block: "nearest",
     behavior: "smooth",
     ...o
   });
 }
-function h(e, r, o) {
-  return m.includes(e.valueType) ? o : e.copyable || e.ellipsis ? n(C.Paragraph, {
+function D(e, t, o) {
+  return j.includes(e.valueType) ? o : e.copyable || e.ellipsis ? f(v.Paragraph, {
     copyable: e.copyable ? {
-      text: r,
+      text: t,
       tooltip: !1
     } : !1,
-    ellipsis: e.ellipsis ? a(e.ellipsis) ? {
-      tooltip: r
+    ellipsis: e.ellipsis ? h(e.ellipsis) ? {
+      tooltip: t
     } : {
       ...e.ellipsis,
-      tooltip: r
+      tooltip: t
     } : !1,
-    content: e.ellipsis ? V(e, r) : o
+    content: e.ellipsis ? _(e, t) : o
   }, null) : o;
 }
-function B(e, r, o, t) {
-  let l;
-  if (e.valueType)
-    if (r) {
-      const i = F(e.valueType);
-      l = n(i, o, null);
-    } else {
-      const i = y[e.valueType];
-      l = h(e, t, n(i, d(o.field, {
-        mode: "read"
-      }), null));
+function W(e, t, o, r, I, i) {
+  var c, a;
+  if (t) {
+    if (e.customRenderFormItem) {
+      const n = e.customRenderFormItem(e, o.field, t);
+      return f(m, P(o, ["field"]), y(n) ? n : {
+        default: () => [n]
+      });
     }
-  if (e.customRenderFormItem) {
-    const i = e.customRenderFormItem(e, o.field, r);
-    l = n(P, u(o, ["field"]), R(i) ? i : {
-      default: () => [i]
-    });
+    const l = N(e.valueType);
+    if (l)
+      return f(l, o, null);
+    const s = i == null ? void 0 : i[e.valueType], u = (c = s == null ? void 0 : s.renderFormItem) == null ? void 0 : c.call(s, o.field);
+    return u ? f(m, o, y(u) ? u : {
+      default: () => [u]
+    }) : null;
+  }
+  let p;
+  const d = q[e.valueType];
+  if (d)
+    p = f(d, g(o.field, {
+      mode: "read"
+    }), null);
+  else {
+    const l = i == null ? void 0 : i[e.valueType];
+    p = (a = l == null ? void 0 : l.render) == null ? void 0 : a.call(l, r, I, o.field);
   }
-  return l;
+  return p ? D(e, r, p) : null;
 }
 export {
-  N as getColumnIsRequired,
-  F as getEditableComponent,
-  B as getFinalNode,
-  V as getRawDisplayValue,
-  O as mergeClass,
-  k as scrollToRowIndex
+  Q as getColumnIsRequired,
+  N as getEditableComponent,
+  W as getFinalNode,
+  _ as getRawDisplayValue,
+  R as mergeClass,
+  U as scrollToRowIndex
 };