From c50651c267501d52b9ab4ccad2bf4e9dacc2ffe0 Mon Sep 17 00:00:00 2001 From: what Date: Wed, 15 Jan 2025 15:04:38 +0800 Subject: [PATCH] v0.4.62 --- dist/button.js | 2 +- .../{main-DGjcW09m.js => main-RYPExuUh.js} | 16 ++++++++-------- dist/components.js | 2 +- dist/container.js | 2 +- dist/data-converter.js | 2 +- dist/data-list.js | 2 +- dist/data-list/utils.js | 2 +- dist/grid-layout-form.js | 2 +- dist/grid-layout-form/utils.js | 2 +- dist/grid-layout.js | 2 +- dist/grid-layout/utils.js | 2 +- dist/hooks.js | 2 +- dist/iconfont.js | 2 +- dist/index.js | 2 +- dist/res-ws.js | 2 +- dist/utils.js | 2 +- package.json | 2 +- 17 files changed, 24 insertions(+), 24 deletions(-) rename dist/common/{main-DGjcW09m.js => main-RYPExuUh.js} (99%) diff --git a/dist/button.js b/dist/button.js index fc57a15..4eabf5c 100644 --- a/dist/button.js +++ b/dist/button.js @@ -1,4 +1,4 @@ -import { a4 as s, a3 as u, a5 as e } from "./common/main-DGjcW09m.js"; +import { a4 as s, a3 as u, a5 as e } from "./common/main-RYPExuUh.js"; export { s as auth, u as default, diff --git a/dist/common/main-DGjcW09m.js b/dist/common/main-RYPExuUh.js similarity index 99% rename from dist/common/main-DGjcW09m.js rename to dist/common/main-RYPExuUh.js index 4fee346..118aef6 100644 --- a/dist/common/main-DGjcW09m.js +++ b/dist/common/main-RYPExuUh.js @@ -232,14 +232,14 @@ const Xi = (e, t = {}) => H(() => e == null ? void 0 : e.map(({ widgetByJs: i, w }, ri = (e = [], t = /* @__PURE__ */ new Map(), i = "id", n) => { const r = Y(n ? (a) => c.get(a, i, c.get(a, [n, i])) : (a) => c.get(a, i), [i, n]); return Y((a) => e == null ? void 0 : e.filter((o) => !o.uuid || !t.has(o.uuid) || t.get(o.uuid).includes(`${r(a)}`)), [e, t, r]); -}, ht = (e = [], t = [], i = /* @__PURE__ */ new Map(), n = "id", r) => { +}, ht = (e = [], t = /* @__PURE__ */ new Map(), i = [], n = "id", r) => { const a = Y(r ? (o) => c.get(o, n, c.get(o, [r, n])) : (o) => c.get(o, n), [n, r]); return H(() => { - if (c.isEmpty(t) || !t.some(({ uuid: s }) => Gi.check(s))) return !1; - if (c.isEmpty(i) || c.isEmpty(e)) return !0; - const o = e.map((s) => `${a(s)}`); - return t.some(({ uuid: s }) => !s || !i.has(s) || i.get(s).some((l) => o.includes(`${l}`))); - }, [t, e, i, a]); + if (c.isEmpty(e) || !e.some(({ uuid: s }) => Gi.check(s))) return !1; + if (c.isEmpty(t) || c.isEmpty(i)) return !0; + const o = i.map((s) => `${a(s)}`); + return e.some(({ uuid: s }) => !s || !t.has(s) || t.get(s).some((l) => o.includes(`${l}`))); + }, [e, i, t, a]); }, Qi = (e, t, i = "id", n = null) => { const r = rt(), a = U(!1), o = U(e.dataSource), s = U(e.itemOperationsAccess); return A(() => (o.current = e.dataSource, s.current = e.itemOperationsAccess, () => a.current = !1), [e.dataSource, e.itemOperationsAccess]), a.current && (e.dataSource = o.current, e.itemOperationsAccess = s.current), [e, (l = 0, u = null) => { @@ -278,7 +278,7 @@ const Xi = (e, t = {}) => H(() => e == null ? void 0 : e.map(({ widgetByJs: i, w const { classNames: T, onClickCallback: z } = le(te), M = ri(l, u, d, p), q = Y((j, V, $) => g(tn, { className: I("ff-data-list-framework-item", T.item), operations: a ? M(V) : [], data: p ? { [p]: V } : V, children: j, onClickCallback: z }), [p, d, a, z, l, u]); return L("div", { className: I("ff-data-list-framework", t), children: [g(i.sider, { isTreeSider: x, ...N }), L("div", { className: I("ff-data-list-container", T == null ? void 0 : T.container), children: [g(i.filter, { isConditionFormLayout: w }), g(i.toolbar, { title: h, tabs: C }), g(mn, { ...m, style: { "--col-num": (f == null ? void 0 : f.colNum) || 1 }, primaryKey: d, itemRender: q, dataSource: n }), g(i.footer, { isPaginate: r, isOperations: o, operations: s })] })] }); }, tn = ({ className: e, operations: t, children: i, data: n, onClickCallback: r }) => L("div", { className: I("data-list-grid-layout-item-container", e), children: [i, !!(t != null && t.length) && g("div", { className: "data-list-grid-layout-item-actions", children: t.map((a) => g("span", { className: "data-list-grid-layout-item-action", children: g(P.Link, { uuid: a.uuid, type: a.type, name: a.name, widget: a.widget, widgetType: a.widgetType, widgetProps: a.widgetProps, widgetSetting: a.widgetSetting, widgetContainerProps: a.widgetContainerSetting, data: n, confirm: a.confirm, onAfterClick: (o) => o !== !1 && (r == null ? void 0 : r(a.isRefresh, n)) }, a.uuid || Le()) }, (a == null ? void 0 : a.uuid) || Le())) })] }), nn = ({ listCode: e, className: t, layouts: i, dataSource: n, columns: r, isItemOperations: a, isBatchOperations: o, batchOperations: s, itemOperations: l, itemOperationsAccess: u, resource: p, primaryKey: d, title: h, tabs: m, isPaginate: f, isTreeSider: C, treeSiderConfig: w, isConditionFormLayout: x, ...N }) => { - const { classNames: T, onClickCallback: z } = le(te), M = ri(l, u, d, p), q = ht(n, l, u, d, p); + const { classNames: T, onClickCallback: z } = le(te), M = ri(l, u, d, p), q = ht(l, u, n, d, p); return L("div", { className: I("ff-data-table-framework", t), children: [g(i.sider, { isTreeSider: C, ...w }), L("div", { className: I("ff-data-table-container", T == null ? void 0 : T.container), children: [g(i.filter, { isConditionFormLayout: x }), g(i.toolbar, { title: h, tabs: m }), g(cn, { ...N, primaryKey: d, className: "ff-data-table-content", columns: r, dataSource: n, operationRender: q ? (j) => { var V; return g("div", { className: "ff-data-table-actions", children: (V = M(j)) == null ? void 0 : V.map(($, v) => g(P.Link, { size: "small", uuid: $.uuid, type: $.type, name: $.name, widget: $.widget, widgetType: $.widgetType, widgetProps: $.widgetProps, widgetData: $.widgetData, widgetSetting: $.widgetSetting, widgetContainerProps: $.widgetContainerSetting, data: j, confirm: $.confirm, onAfterClick: (E) => E !== !1 && (z == null ? void 0 : z($.isRefresh, j)) }, $.uuid || v)) }); @@ -373,7 +373,7 @@ const re = class re { me = new WeakMap(), de = new WeakMap(), ve = new WeakMap(), it = new WeakMap(), R(re, me, null), S(re, "getInstance", () => (y(re, me) || W(re, me, new re()), y(re, me))); let ft = re; const li = ft.getInstance(), St = k.forwardRef(({ listCode: e, base62params: t, className: i, theme: n, themeProps: r, layouts: a, classNames: o }, s) => { - const [{ resource: l, primaryKey: u, batchOperations: p = [], itemOperations: d = [], columns: h = [], themeConfig: m, theme: f, isConditionFormLayout: C = !1, isTreeSider: w, treeSiderConfig: x, isItemGridLayout: N, itemGridLayout: T, title: z, isPaginate: M, tabs: q }, j] = F({ isItemGridLayout: !1, itemGridLayout: {} }), V = Zi(e, t), [{ dataSource: $, itemOperationsAccess: v, condition: E, tab: B, keyword: X, page: Se, total: K, pageSize: st, sider: He, onConditionChange: ot, onTabChange: Ft, onKeywordChange: wi, onPageChange: bi, onPageSizeChange: Ci, onSiderChange: ki, onReload: lt }, Et] = Qi(V, e, u, l), xi = ht(d, $, v, u), vi = ht(p); + const [{ resource: l, primaryKey: u, batchOperations: p = [], itemOperations: d = [], columns: h = [], themeConfig: m, theme: f, isConditionFormLayout: C = !1, isTreeSider: w, treeSiderConfig: x, isItemGridLayout: N, itemGridLayout: T, title: z, isPaginate: M, tabs: q }, j] = F({ isItemGridLayout: !1, itemGridLayout: {} }), V = Zi(e, t), [{ dataSource: $, itemOperationsAccess: v, condition: E, tab: B, keyword: X, page: Se, total: K, pageSize: st, sider: He, onConditionChange: ot, onTabChange: Ft, onKeywordChange: wi, onPageChange: bi, onPageSizeChange: Ci, onSiderChange: ki, onReload: lt }, Et] = Qi(V, e, u, l), xi = ht(d, v, $, u), vi = ht(p); return A(() => { let Ke = null; return e && O.get(`/api/_/${e}`).resp(({ data: Je, res: Si }) => { diff --git a/dist/components.js b/dist/components.js index 26e03ad..03c48c0 100644 --- a/dist/components.js +++ b/dist/components.js @@ -1,4 +1,4 @@ -import { ab as s, a2 as p, ac as d, ad as n, aa as t } from "./common/main-DGjcW09m.js"; +import { ab as s, a2 as p, ac as d, ad as n, aa as t } from "./common/main-RYPExuUh.js"; export { s as Empty, p as Icon, diff --git a/dist/container.js b/dist/container.js index f36c14d..722c602 100644 --- a/dist/container.js +++ b/dist/container.js @@ -1,4 +1,4 @@ -import { a7 as o, ab as s, ac as d, ad as p, a8 as t, aa as n, a9 as r, a6 as u } from "./common/main-DGjcW09m.js"; +import { a7 as o, ab as s, ac as d, ad as p, a8 as t, aa as n, a9 as r, a6 as u } from "./common/main-RYPExuUh.js"; export { o as Context, s as Empty, diff --git a/dist/data-converter.js b/dist/data-converter.js index 89e32cd..4b8a8f8 100644 --- a/dist/data-converter.js +++ b/dist/data-converter.js @@ -1,6 +1,6 @@ import "lodash"; import "react"; -import { D as p } from "./common/main-DGjcW09m.js"; +import { D as p } from "./common/main-RYPExuUh.js"; export { p as default }; diff --git a/dist/data-list.js b/dist/data-list.js index e509493..908108a 100644 --- a/dist/data-list.js +++ b/dist/data-list.js @@ -1,4 +1,4 @@ -import { z as t, x as e, p as r, v as o, A as i, w as u, s as D, y as l, q as L, B as n, o as p, C as m, L as C, F as c, J as F, I as b, K as d, E as k } from "./common/main-DGjcW09m.js"; +import { z as t, x as e, p as r, v as o, A as i, w as u, s as D, y as l, q as L, B as n, o as p, C as m, L as C, F as c, J as F, I as b, K as d, E as k } from "./common/main-RYPExuUh.js"; export { t as DataListContent, e as DataListContext, diff --git a/dist/data-list/utils.js b/dist/data-list/utils.js index 90b9e0d..169ebf2 100644 --- a/dist/data-list/utils.js +++ b/dist/data-list/utils.js @@ -1,5 +1,5 @@ import "lodash"; -import { j as a } from "../common/main-DGjcW09m.js"; +import { j as a } from "../common/main-RYPExuUh.js"; export { a as getDefaultExpandRowKeys }; diff --git a/dist/grid-layout-form.js b/dist/grid-layout-form.js index 6f3d58c..f6ea26d 100644 --- a/dist/grid-layout-form.js +++ b/dist/grid-layout-form.js @@ -1,4 +1,4 @@ -import { V as s, X as r, W as u, U as o, $ as t, _ as d, a1 as m, Z as F, Y as i, a0 as g } from "./common/main-DGjcW09m.js"; +import { V as s, X as r, W as u, U as o, $ as t, _ as d, a1 as m, Z as F, Y as i, a0 as g } from "./common/main-RYPExuUh.js"; export { s as GridLayoutForm, r as GridLayoutFormHelper, diff --git a/dist/grid-layout-form/utils.js b/dist/grid-layout-form/utils.js index 5ae4b75..c3d0dcf 100644 --- a/dist/grid-layout-form/utils.js +++ b/dist/grid-layout-form/utils.js @@ -1,5 +1,5 @@ import "lodash"; -import { g as o, a as g } from "../common/main-DGjcW09m.js"; +import { g as o, a as g } from "../common/main-RYPExuUh.js"; export { o as getOptionItemByValue, g as getWidgetByNormalize diff --git a/dist/grid-layout.js b/dist/grid-layout.js index 3d8208b..84f8776 100644 --- a/dist/grid-layout.js +++ b/dist/grid-layout.js @@ -1,4 +1,4 @@ -import { k as d, l as e, H as i, G as t, m as u, n as o } from "./common/main-DGjcW09m.js"; +import { k as d, l as e, H as i, G as t, m as u, n as o } from "./common/main-RYPExuUh.js"; export { d as GridLayout, e as GridLayoutWidget, diff --git a/dist/grid-layout/utils.js b/dist/grid-layout/utils.js index 1ad7cf9..012acef 100644 --- a/dist/grid-layout/utils.js +++ b/dist/grid-layout/utils.js @@ -1,4 +1,4 @@ -import { h as o, i as a } from "../common/main-DGjcW09m.js"; +import { h as o, i as a } from "../common/main-RYPExuUh.js"; export { o as getBoxStyle, a as getWidgetByNormalize diff --git a/dist/hooks.js b/dist/hooks.js index 4579738..a8e7e69 100644 --- a/dist/hooks.js +++ b/dist/hooks.js @@ -1,7 +1,7 @@ import "lodash"; import "rc-field-form"; import "react"; -import { Q as r, P as o, S as p, N as f, O as i, T as m, M as c } from "./common/main-DGjcW09m.js"; +import { Q as r, P as o, S as p, N as f, O as i, T as m, M as c } from "./common/main-RYPExuUh.js"; import { default as S } from "rc-util/lib/hooks/useMergedState"; export { r as useDeepEffect, diff --git a/dist/iconfont.js b/dist/iconfont.js index 8576bf2..b38061c 100644 --- a/dist/iconfont.js +++ b/dist/iconfont.js @@ -2,7 +2,7 @@ import "react/jsx-runtime"; import "react"; import "prop-types"; import "classnames"; -import { a2 as a } from "./common/main-DGjcW09m.js"; +import { a2 as a } from "./common/main-RYPExuUh.js"; export { a as default }; diff --git a/dist/index.js b/dist/index.js index b77af73..9c2b7df 100644 --- a/dist/index.js +++ b/dist/index.js @@ -1,4 +1,4 @@ -import { am as t, an as e, ai as o, aj as n, ae as p, ak as r, ah as c, ag as f, af as l, al as i } from "./common/main-DGjcW09m.js"; +import { am as t, an as e, ai as o, aj as n, ae as p, ak as r, ah as c, ag as f, af as l, al as i } from "./common/main-RYPExuUh.js"; export { t as AppContext, e as AppGlobalParamsContext, diff --git a/dist/res-ws.js b/dist/res-ws.js index 10909f4..43c0d81 100644 --- a/dist/res-ws.js +++ b/dist/res-ws.js @@ -1,5 +1,5 @@ import "lodash"; -import { R as a } from "./common/main-DGjcW09m.js"; +import { R as a } from "./common/main-RYPExuUh.js"; export { a as default }; diff --git a/dist/utils.js b/dist/utils.js index fec22fb..0d31289 100644 --- a/dist/utils.js +++ b/dist/utils.js @@ -1,5 +1,5 @@ import "lodash"; -import { d as s, e as g, c as r, f as o, b as i, r as m, t as p, u as P } from "./common/main-DGjcW09m.js"; +import { d as s, e as g, c as r, f as o, b as i, r as m, t as p, u as P } from "./common/main-RYPExuUh.js"; export { s as deepSome, g as getPkgCategory, diff --git a/package.json b/package.json index a80a2ea..1b67d0c 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ff", "private": true, - "version": "0.4.61", + "version": "0.4.62", "author": "www.fsdpf.com", "type": "module", "main": "./dist/index.js",