@aplus-frontend/ui 0.0.15 → 0.0.17

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

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

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

@@ -1,10 +1,12 @@
 import { ColumnType, TableProps } from 'ant-design-vue/es/table';
-import { ApTableValueFields, ValueEnum } from '../ap-table';
+import { ApTableValueFields, ApTableValueTypes, 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';
 
-export type EditableColumnType<ValueType extends keyof ApTableValueFields = 'text', RecordType = any> = Omit<ColumnType<RecordType>, 'children'> & {
+export type EditableColumnType<RecordType = any, ValueType extends ApTableValueTypes = ApTableValueTypes> = ValueType extends ApTableValueTypes ? Omit<ColumnType<RecordType>, 'children' | 'customRender'> & {
+    children?: EditableColumnType<RecordType, ValueType>;
     /**
      * 在title之后展示一个icon并触发tooltip
      */
@@ -25,11 +27,11 @@ export type EditableColumnType<ValueType extends keyof ApTableValueFields = 'tex
      * 自定义表单
      * @deprecated 未实现，请使用`customRender`
      */
-    customRenderFormItem?: (config: EditableColumnType<ValueType, RecordType>) => any;
+    customRenderFormItem?: (config: EditableColumnType<RecordType, ValueType>) => any;
     /**
      * 指定值类型（将会用于普通列和可编辑表格的渲染）
      */
-    valueType?: keyof ApTableValueFields;
+    valueType?: ValueType;
     /**
      * 值类型额外配置的参数（支持函数）
      */
@@ -39,14 +41,29 @@ export type EditableColumnType<ValueType extends keyof ApTableValueFields = 'tex
         record: RecordType;
         index: number;
         renderIndex: number;
-        column: EditableColumnType<ValueType, RecordType>;
+        column: EditableColumnType<RecordType, ValueType>;
     }) => ApTableValueFields[ValueType]);
-};
+    /**
+     * 自定义渲染，添加了`editable`以及`originalNode`
+     * @param opt
+     * @returns
+     */
+    customRender?: (opt: {
+        value: any;
+        text: any;
+        record: RecordType;
+        index: number;
+        renderIndex: number;
+        column: ColumnType<RecordType>;
+        editable?: boolean;
+        originalNode?: VNode;
+    }) => any;
+} : never;
 export type EditableTableProps<RecordType = any> = Omit<TableProps<RecordType>, 'columns' | 'dataSource'> & {
     /**
      * 列配置
      */
-    columns?: EditableColumnType<any, RecordType>[];
+    columns?: EditableColumnType<RecordType, any>[];
     /**
      * 表格数据v-model
      */

package/es/src/hooks/useControllableValue.mjs

@@ -1,21 +1,23 @@
-import { ref as c, watch as m } from "vue";
-function N(a, r, e) {
-  const d = (e == null ? void 0 : e.defaultValuePropName) || "defaultValue", u = (e == null ? void 0 : e.valuePropName) || "value", f = c(
-    a[u] || a[d] || (e == null ? void 0 : e.defaultValue)
-  );
-  function v(l) {
-    a[u] === void 0 && (f.value = l), r(`update:${u}`, l);
+import { ref as v, watch as V } from "vue";
+import { isUndefined as d } from "lodash-unified";
+function P(u, t, e) {
+  const f = (e == null ? void 0 : e.defaultValuePropName) || "defaultValue", a = (e == null ? void 0 : e.valuePropName) || "value", r = v(c());
+  function m(l) {
+    u[a] === void 0 && (r.value = l), t(`update:${a}`, l);
   }
-  return m(
-    () => a[u],
+  function c() {
+    return d(u[a]) ? d(u[f]) ? e == null ? void 0 : e.defaultValue : u[f] : u[a];
+  }
+  return V(
+    () => u[a],
     (l) => {
-      f.value = l;
+      r.value = l;
     }
   ), {
-    value: f,
-    updateValue: v
+    value: r,
+    updateValue: m
   };
 }
 export {
-  N as useControllableValue
+  P as useControllableValue
 };

package/es/src/index.d.ts

@@ -26,6 +26,7 @@ export * from './ap-tag';
 export * from './ap-layout';
 export * from './ap-upload';
 export * from './ap-download';
+export * from './check-card';
 export * from './business';
 export * from './ap-table';
 export * from './editable-table';