@pinnacle0/web-ui 0.7.4 → 0.7.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/admin/AdminApp/Menu.d.ts +1 -1
- package/admin/AdminApp/Menu.js +33 -5
- package/admin/AdminApp/Menu.js.map +1 -1
- package/admin/AdminApp/index.d.ts +1 -1
- package/admin/AdminApp/index.less +10 -0
- package/core/Table/index.d.ts +4 -1
- package/core/Table/index.js +8 -5
- package/core/Table/index.js.map +1 -1
- package/internal/ExpirableLocalStorage.d.ts +10 -1
- package/internal/ExpirableLocalStorage.js +15 -3
- package/internal/ExpirableLocalStorage.js.map +1 -1
- package/package.json +3 -3
package/admin/AdminApp/Menu.d.ts
CHANGED
package/admin/AdminApp/Menu.js
CHANGED
|
@@ -19,16 +19,27 @@ export function Menu({ siteName, permissions, superAdminPermission, navigationGr
|
|
|
19
19
|
*/
|
|
20
20
|
const shouldAlertNewBadge = React.useCallback((badges) => {
|
|
21
21
|
for (const [key, badge] of Object.entries(badges)) {
|
|
22
|
-
if (prevBadges
|
|
22
|
+
if (!prevBadges)
|
|
23
|
+
continue;
|
|
24
|
+
if (prevBadges[key] === undefined)
|
|
25
|
+
return true;
|
|
26
|
+
if (typeof prevBadges[key] === "number" && typeof badge === "number" && badge > prevBadges[key])
|
|
27
|
+
return true;
|
|
28
|
+
if (Array.isArray(prevBadges[key]) && Array.isArray(badge) && badgeHasUpdate(prevBadges[key], badge))
|
|
23
29
|
return true;
|
|
24
|
-
}
|
|
25
30
|
}
|
|
26
31
|
return false;
|
|
27
32
|
}, [prevBadges]);
|
|
28
33
|
const calculateTotalBadge = React.useCallback((badges) => {
|
|
29
34
|
let totalCount = 0;
|
|
30
35
|
shownNavigationGroups.forEach(({ modules }) => {
|
|
31
|
-
modules.forEach(_ =>
|
|
36
|
+
modules.forEach(_ => {
|
|
37
|
+
const badge = badges[_.url];
|
|
38
|
+
if (typeof badge === "number")
|
|
39
|
+
totalCount += badge;
|
|
40
|
+
if (Array.isArray(badge))
|
|
41
|
+
totalCount += badge.reduce((acc, curr) => acc + curr, 0);
|
|
42
|
+
});
|
|
32
43
|
});
|
|
33
44
|
return totalCount;
|
|
34
45
|
}, [shownNavigationGroups]);
|
|
@@ -77,9 +88,18 @@ export function Menu({ siteName, permissions, superAdminPermission, navigationGr
|
|
|
77
88
|
let totalCount = 0;
|
|
78
89
|
const children = groupItem.modules.map(({ title, url }) => {
|
|
79
90
|
const count = badges?.[url] || 0;
|
|
80
|
-
totalCount += count;
|
|
91
|
+
totalCount += typeof count === "number" ? count : count.reduce((acc, curr) => acc + curr, 0);
|
|
92
|
+
let label;
|
|
93
|
+
if (typeof count === "number") {
|
|
94
|
+
label = React.createElement(Badge, { count: count }, title);
|
|
95
|
+
}
|
|
96
|
+
else if (Array.isArray(count)) {
|
|
97
|
+
label = (React.createElement("div", { className: "g-admin-menu-badge-list" },
|
|
98
|
+
React.createElement("span", null, title),
|
|
99
|
+
count.map((item, index) => (React.createElement(Badge, { key: index, count: item })))));
|
|
100
|
+
}
|
|
81
101
|
return {
|
|
82
|
-
label
|
|
102
|
+
label,
|
|
83
103
|
key: url,
|
|
84
104
|
onClick() {
|
|
85
105
|
history.push(url);
|
|
@@ -106,4 +126,12 @@ export function Menu({ siteName, permissions, superAdminPermission, navigationGr
|
|
|
106
126
|
}, [badges]);
|
|
107
127
|
return (React.createElement(AntMenu, { theme: "dark", mode: "inline", openKeys: currentOpenedMenuKey ? [currentOpenedMenuKey] : [], selectedKeys: currentSelectedMenuKey ? [currentSelectedMenuKey] : [], onOpenChange: onMenuOpenChange, items: shownNavigationGroups.map(renderMenuGroup) }));
|
|
108
128
|
}
|
|
129
|
+
function badgeHasUpdate(a, b) {
|
|
130
|
+
// assume a.length == b.length
|
|
131
|
+
for (let i = 0; i < a.length; i++) {
|
|
132
|
+
if (a[i] !== b[i])
|
|
133
|
+
return true;
|
|
134
|
+
}
|
|
135
|
+
return false;
|
|
136
|
+
}
|
|
109
137
|
//# sourceMappingURL=Menu.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Menu.js","sourceRoot":"","sources":["../../../src/admin/AdminApp/Menu.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAC,UAAU,EAAE,WAAW,EAAC,MAAM,kBAAkB,CAAC;AACzD,OAAO,OAAO,MAAM,cAAc,CAAC;AACnC,OAAO,EAAC,gBAAgB,EAAC,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAC,SAAS,EAAC,MAAM,sBAAsB,CAAC;AAC/C,OAAO,EAAC,KAAK,EAAC,MAAM,kBAAkB,CAAC;AACvC,OAAO,EAAC,mBAAmB,EAAC,MAAM,gCAAgC,CAAC;AAenE,MAAM,iBAAiB,GAAG,qBAAqB,CAAC;AAEhD,MAAM,UAAU,IAAI,CAAiB,EAAC,QAAQ,EAAE,WAAW,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,EAAwB;IAC7I,MAAM,CAAC,oBAAoB,EAAE,uBAAuB,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAgB,IAAI,CAAC,CAAC;IAC5F,MAAM,CAAC,sBAAsB,EAAE,yBAAyB,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAgB,IAAI,CAAC,CAAC;IAChG,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAqB,SAAS,CAAC,CAAC;IAClF,MAAM,OAAO,GAAG,UAAU,EAAE,CAAC;IAC7B,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAE/B,MAAM,qBAAqB,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,mBAAmB,CAAC,MAAM,CAAC,gBAAgB,EAAE,WAAW,EAAE,oBAAoB,EAAE,KAAK,CAAC,EAAE,CAAC,gBAAgB,EAAE,WAAW,EAAE,oBAAoB,CAAC,CAAC,CAAC;IACjM,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,mBAAmB,CAAC,OAAO,CAAC,qBAAqB,CAAC,EAAE,CAAC,qBAAqB,CAAC,CAAC,CAAC;IAEjH;;OAEG;IACH,MAAM,mBAAmB,GAAG,KAAK,CAAC,WAAW,CACzC,CAAC,MAAc,EAAW,EAAE;QACxB,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YAChD,IAAI,UAAU,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,
|
|
1
|
+
{"version":3,"file":"Menu.js","sourceRoot":"","sources":["../../../src/admin/AdminApp/Menu.tsx"],"names":[],"mappings":"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"}
|
|
@@ -16,7 +16,7 @@ export interface Props<Feature, Field> {
|
|
|
16
16
|
WelcomeComponent?: React.ComponentType;
|
|
17
17
|
sideMenuWidth?: number;
|
|
18
18
|
badges?: {
|
|
19
|
-
[key: string]: number;
|
|
19
|
+
[key: string]: number | number[];
|
|
20
20
|
};
|
|
21
21
|
noBrowserRouter?: boolean;
|
|
22
22
|
onLifecycleError?: (error: unknown, componentStack: string) => void;
|
|
@@ -132,6 +132,16 @@
|
|
|
132
132
|
height: ~"calc(100vh - 45px)"; // Minus header height
|
|
133
133
|
overflow-y: auto;
|
|
134
134
|
}
|
|
135
|
+
|
|
136
|
+
.ant-menu-item {
|
|
137
|
+
.g-admin-menu-badge-list {
|
|
138
|
+
display: flex;
|
|
139
|
+
|
|
140
|
+
> .ant-badge {
|
|
141
|
+
width: 24px;
|
|
142
|
+
}
|
|
143
|
+
}
|
|
144
|
+
}
|
|
135
145
|
}
|
|
136
146
|
|
|
137
147
|
// Submenu popup is put directly under <body> in collapse mode
|
package/core/Table/index.d.ts
CHANGED
|
@@ -22,7 +22,10 @@ export interface TableColumn<RowType extends object, OrderByFieldType = undefine
|
|
|
22
22
|
sortField?: OrderByFieldType | true;
|
|
23
23
|
onHeaderClick?: () => void;
|
|
24
24
|
hidden?: boolean;
|
|
25
|
-
customizedKey?: string
|
|
25
|
+
customizedKey?: string | {
|
|
26
|
+
key: string;
|
|
27
|
+
defaultValue: boolean;
|
|
28
|
+
};
|
|
26
29
|
onCell?: (data: RowType, index?: number) => React.HTMLAttributes<any> | React.TdHTMLAttributes<any>;
|
|
27
30
|
}
|
|
28
31
|
export type TableColumns<RowType extends object, OrderByFieldType = undefined> = Array<TableColumn<RowType, OrderByFieldType>>;
|
package/core/Table/index.js
CHANGED
|
@@ -41,7 +41,7 @@ export const Table = ReactUtil.memo("Table", (props) => {
|
|
|
41
41
|
key: index.toString(),
|
|
42
42
|
onHeaderCell: () => ({ onClick: onHeaderClick, style: { minHeight: minHeaderHeight } }),
|
|
43
43
|
render: (_, record, index) => renderData(record, index),
|
|
44
|
-
hidden: originalColumn.hidden || (customizedKey ? customizationConfig[customizedKey] === false : false),
|
|
44
|
+
hidden: originalColumn.hidden || (customizedKey ? customizationConfig[typeof customizedKey === "string" ? customizedKey : customizedKey.key] === false : false),
|
|
45
45
|
...restColumnProps,
|
|
46
46
|
};
|
|
47
47
|
};
|
|
@@ -70,8 +70,11 @@ export const Table = ReactUtil.memo("Table", (props) => {
|
|
|
70
70
|
const renderPopoverContent = () => {
|
|
71
71
|
return columns
|
|
72
72
|
.filter(_ => _.customizedKey && !_.hidden)
|
|
73
|
-
.map((_, index) =>
|
|
74
|
-
|
|
73
|
+
.map((_, index) => {
|
|
74
|
+
const customizedKey = typeof _.customizedKey === "string" ? _.customizedKey : _.customizedKey.key;
|
|
75
|
+
return (React.createElement("div", { key: index },
|
|
76
|
+
React.createElement(Checkbox, { value: customizationConfig[customizedKey] !== false, onChange: checked => onCustomizationConfigChange(checked, customizedKey) }, _.title)));
|
|
77
|
+
});
|
|
75
78
|
};
|
|
76
79
|
const emptyTextNode = loading ? (React.createElement("div", null)) : (React.createElement("div", { className: "empty-text-node", style: { ...emptyPlaceHolderContainerStyle, ...emptyNodeStyle } }, emptyPlaceholder || (React.createElement(React.Fragment, null,
|
|
77
80
|
emptyIcon || React.createElement(FileSearchOutlined, { style: emptyPlaceHolderIconStyle }),
|
|
@@ -107,7 +110,7 @@ export const Table = ReactUtil.memo("Table", (props) => {
|
|
|
107
110
|
const getStorageKey = (customizedStorageKey) => `table-customization-config:${customizedStorageKey || location.pathname}`;
|
|
108
111
|
const getCustomizationConfig = (props, storageKey) => {
|
|
109
112
|
const columnsCustomizedKeyList = ArrayUtil.compactMap(props.columns, _ => _.customizedKey || null);
|
|
110
|
-
const defaultConfig = ArrayUtil.toObject(columnsCustomizedKeyList, key => [key, true]);
|
|
111
|
-
return LocalStorageUtil.getObject(storageKey, defaultConfig, item => typeof item === "object" && !Array.isArray(item) && columnsCustomizedKeyList.some(_ => item[_] !== undefined));
|
|
113
|
+
const defaultConfig = ArrayUtil.toObject(columnsCustomizedKeyList, key => [typeof key === "string" ? key : key.key, typeof key === "string" ? true : key.defaultValue]);
|
|
114
|
+
return LocalStorageUtil.getObject(storageKey, defaultConfig, item => typeof item === "object" && !Array.isArray(item) && columnsCustomizedKeyList.some(_ => item[typeof _ === "string" ? _ : _.key] !== undefined));
|
|
112
115
|
};
|
|
113
116
|
//# sourceMappingURL=index.js.map
|
package/core/Table/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/Table/index.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/Table/index.tsx"],"names":[],"mappings":"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"}
|
|
@@ -12,6 +12,11 @@ export declare class ExpirableLocalStorage {
|
|
|
12
12
|
* get the ExpirableStorage instance
|
|
13
13
|
*/
|
|
14
14
|
static getInstance(): ExpirableLocalStorage;
|
|
15
|
+
/**
|
|
16
|
+
* clear keys
|
|
17
|
+
* @param keys keys to clear
|
|
18
|
+
*/
|
|
19
|
+
clear(keys: string | string[]): void;
|
|
15
20
|
/**
|
|
16
21
|
* clear all keys
|
|
17
22
|
*/
|
|
@@ -119,7 +124,11 @@ export declare class ExpirableLocalStorage {
|
|
|
119
124
|
* @param data storage value
|
|
120
125
|
*/
|
|
121
126
|
private setData;
|
|
122
|
-
|
|
127
|
+
/**
|
|
128
|
+
* internal clear (keys should be canonical keys)
|
|
129
|
+
* @param keys keys to clear
|
|
130
|
+
*/
|
|
131
|
+
private internalClear;
|
|
123
132
|
/**
|
|
124
133
|
* delete the expired keys
|
|
125
134
|
*/
|
|
@@ -17,11 +17,19 @@ export class ExpirableLocalStorage {
|
|
|
17
17
|
}
|
|
18
18
|
return ExpirableLocalStorage.instance;
|
|
19
19
|
}
|
|
20
|
+
/**
|
|
21
|
+
* clear keys
|
|
22
|
+
* @param keys keys to clear
|
|
23
|
+
*/
|
|
24
|
+
clear(keys) {
|
|
25
|
+
const keysToClear = typeof keys === "string" ? [this.canonicalKey(keys)] : keys.map(this.canonicalKey);
|
|
26
|
+
this.internalClear(keysToClear);
|
|
27
|
+
}
|
|
20
28
|
/**
|
|
21
29
|
* clear all keys
|
|
22
30
|
*/
|
|
23
31
|
clearAll() {
|
|
24
|
-
this.
|
|
32
|
+
this.internalClear(Object.keys(this.storage).filter(key => key.startsWith(ExpirableLocalStorage.PREFIX)));
|
|
25
33
|
}
|
|
26
34
|
/**
|
|
27
35
|
* set boolean value
|
|
@@ -217,7 +225,11 @@ export class ExpirableLocalStorage {
|
|
|
217
225
|
setData(key, data) {
|
|
218
226
|
this.storage.setItem(key, JSON.stringify(data));
|
|
219
227
|
}
|
|
220
|
-
|
|
228
|
+
/**
|
|
229
|
+
* internal clear (keys should be canonical keys)
|
|
230
|
+
* @param keys keys to clear
|
|
231
|
+
*/
|
|
232
|
+
internalClear(keys) {
|
|
221
233
|
try {
|
|
222
234
|
keys.forEach(key => this.storage.removeItem(key));
|
|
223
235
|
}
|
|
@@ -237,7 +249,7 @@ export class ExpirableLocalStorage {
|
|
|
237
249
|
const { expiryTimestamp } = this.getData(key);
|
|
238
250
|
return this.now() > expiryTimestamp;
|
|
239
251
|
});
|
|
240
|
-
this.
|
|
252
|
+
this.internalClear(expiredKeys);
|
|
241
253
|
}
|
|
242
254
|
catch {
|
|
243
255
|
// Do nothing
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ExpirableLocalStorage.js","sourceRoot":"","sources":["../../src/internal/ExpirableLocalStorage.ts"],"names":[],"mappings":"AAKA;;GAEG;AACH,MAAM,OAAO,qBAAqB;IACtB,MAAM,CAAU,MAAM,GAAG,cAAc,CAAC;IACxC,MAAM,CAAU,IAAI,GAAG,MAAM,CAAC;IAC9B,MAAM,CAAU,KAAK,GAAG,OAAO,CAAC;IAChC,MAAM,CAAU,kBAAkB,GAAG,EAAC,eAAe,EAAE,CAAC,EAAE,KAAK,EAAE,IAAI,EAAC,CAAC;IAEvE,MAAM,CAAC,QAAQ,CAAwB;IAEvC,OAAO,GAAY,MAAM,CAAC,YAAY,CAAC;IAE/C;;OAEG;IACH,MAAM,CAAC,WAAW;QACd,IAAI,CAAC,qBAAqB,CAAC,QAAQ,EAAE,CAAC;YAClC,qBAAqB,CAAC,QAAQ,GAAG,IAAI,qBAAqB,EAAE,CAAC;QACjE,CAAC;QAED,OAAO,qBAAqB,CAAC,QAAQ,CAAC;IAC1C,CAAC;IAED;;OAEG;IACH,QAAQ;QACJ,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"ExpirableLocalStorage.js","sourceRoot":"","sources":["../../src/internal/ExpirableLocalStorage.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pinnacle0/web-ui",
|
|
3
|
-
"version": "0.7.
|
|
3
|
+
"version": "0.7.6",
|
|
4
4
|
"author": "Pinnacle",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"sideEffects": [
|
|
@@ -44,8 +44,8 @@
|
|
|
44
44
|
"react": "19.2.1",
|
|
45
45
|
"react-dom": "19.2.1",
|
|
46
46
|
"react-router-dom": "5.3.0",
|
|
47
|
-
"@pinnacle0/
|
|
48
|
-
"@pinnacle0/
|
|
47
|
+
"@pinnacle0/webpack-util": "0.8.24",
|
|
48
|
+
"@pinnacle0/devtool-util": "1.3.9"
|
|
49
49
|
},
|
|
50
50
|
"exports": {
|
|
51
51
|
"./core/*": {
|