dsh-workbench-storage 1.5.6 → 1.5.9

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.
Files changed (3) hide show
  1. package/lib/client.js +540 -283
  2. package/lib/index.js +2 -1
  3. package/package.json +3 -3
package/lib/client.js CHANGED
@@ -754,6 +754,42 @@ var require_styles = __commonJS({
754
754
  }
755
755
  });
756
756
 
757
+ // packages/addons/lib/icons.cjs
758
+ var require_icons = __commonJS({
759
+ "packages/addons/lib/icons.cjs"(exports2, module2) {
760
+ "use strict";
761
+ var h2 = require("react").createElement;
762
+ function create(prefix, glyphs, options) {
763
+ var opts = options || {};
764
+ var ICONS = Object.assign({}, glyphs);
765
+ function Icon3(props) {
766
+ var C = ICONS[props.name] || (opts.fallback ? ICONS[opts.fallback] : null);
767
+ if (!C) return null;
768
+ var size = typeof opts.sizeOf === "function" ? opts.sizeOf(props) : props.size || 14;
769
+ var cls = prefix + "-svg" + (opts.classNameAppend && props.className ? " " + props.className : "");
770
+ var attrs = {
771
+ size,
772
+ strokeWidth: props.strokeWidth || 2,
773
+ "aria-hidden": "true",
774
+ className: cls
775
+ };
776
+ if (opts.focusable) attrs.focusable = false;
777
+ return h2(C, attrs);
778
+ }
779
+ var set = { ICONS, Icon: Icon3 };
780
+ if (opts.tabIcon) {
781
+ set.tabIcon = function(name) {
782
+ return function TabIcon() {
783
+ return h2(Icon3, { name, size: 14 });
784
+ };
785
+ };
786
+ }
787
+ return set;
788
+ }
789
+ module2.exports = { create };
790
+ }
791
+ });
792
+
757
793
  // node_modules/.pnpm/lucide-react@1.70.0_react@19.2.0/node_modules/lucide-react/dist/esm/icons/box.mjs
758
794
  var box_exports = {};
759
795
  __export(box_exports, {
@@ -1419,10 +1455,15 @@ var init_rotate_ccw = __esm({
1419
1455
  });
1420
1456
 
1421
1457
  // packages/addons/storage/client/ui/icons.cjs
1422
- var require_icons = __commonJS({
1458
+ var require_icons2 = __commonJS({
1423
1459
  "packages/addons/storage/client/ui/icons.cjs"(exports2, module2) {
1424
- var React = require("react");
1425
- var ICONS = {
1460
+ "use strict";
1461
+ var icons2 = require_icons();
1462
+ function sizeOf(props) {
1463
+ if (props.name === "empty" && props.size === 48) return 48;
1464
+ return [11, 14, 16].indexOf(props.size) >= 0 ? props.size : 14;
1465
+ }
1466
+ var set = icons2.create("wbi", {
1426
1467
  box: (init_box(), __toCommonJS(box_exports)).default,
1427
1468
  plus: (init_plus(), __toCommonJS(plus_exports)).default,
1428
1469
  search: (init_search(), __toCommonJS(search_exports)).default,
@@ -1448,18 +1489,172 @@ var require_icons = __commonJS({
1448
1489
  close: (init_x(), __toCommonJS(x_exports)).default,
1449
1490
  table: (init_table(), __toCommonJS(table_exports)).default,
1450
1491
  reset: (init_rotate_ccw(), __toCommonJS(rotate_ccw_exports)).default
1492
+ }, { fallback: "box", focusable: true, sizeOf });
1493
+ module2.exports = { ICONS: set.ICONS, Icon: set.Icon };
1494
+ }
1495
+ });
1496
+
1497
+ // packages/addons/lib/button.cjs
1498
+ var require_button = __commonJS({
1499
+ "packages/addons/lib/button.cjs"(exports2, module2) {
1500
+ "use strict";
1501
+ var React = require("react");
1502
+ var h2 = React.createElement;
1503
+ module2.exports = function createButton(options) {
1504
+ var opts = options || {};
1505
+ var prefix = opts.prefix;
1506
+ var Icon3 = opts.Icon;
1507
+ function Button(props) {
1508
+ var attrs = Object.assign({ type: "button", className: prefix + "-btn" }, props);
1509
+ delete attrs.icon;
1510
+ delete attrs.iconOnly;
1511
+ if (props.icon) {
1512
+ attrs["aria-label"] = props["aria-label"] || props.children;
1513
+ attrs.title = props.title || attrs["aria-label"];
1514
+ attrs.className += props.iconOnly ? " " + prefix + "-icon-only" : " " + prefix + "-icon-text";
1515
+ }
1516
+ return h2(
1517
+ "button",
1518
+ attrs,
1519
+ props.icon ? h2(Icon3, { name: props.icon }) : null,
1520
+ props.iconOnly ? null : props.icon ? h2("span", { className: prefix + "-btn-label" }, props.children) : props.children
1521
+ );
1522
+ }
1523
+ return Button;
1524
+ };
1525
+ }
1526
+ });
1527
+
1528
+ // packages/addons/lib/skeleton.cjs
1529
+ var require_skeleton = __commonJS({
1530
+ "packages/addons/lib/skeleton.cjs"(exports2, module2) {
1531
+ "use strict";
1532
+ var React = require("react");
1533
+ var h2 = React.createElement;
1534
+ module2.exports = function createSkeleton(options) {
1535
+ var opts = options || {};
1536
+ var prefix = opts.prefix;
1537
+ var text = opts.text || function(lang) {
1538
+ return lang === "en" ? "Loading\u2026" : "\u8BFB\u53D6\u4E2D\u2026";
1539
+ };
1540
+ return function Skeleton(props) {
1541
+ var label = props.label || text(props.lang);
1542
+ return h2(
1543
+ "div",
1544
+ { className: prefix + "-root " + prefix + "-grid " + prefix + "-skeleton", role: "status", "aria-label": label, "aria-busy": true },
1545
+ h2("span", { className: prefix + "-sr" }, label),
1546
+ [0, 1, 2].map(function(i) {
1547
+ return h2(
1548
+ "div",
1549
+ { key: i, className: prefix + "-card " + prefix + "-skeleton-card", "aria-hidden": true },
1550
+ h2("div", { className: prefix + "-sk" }),
1551
+ h2("div", { className: prefix + "-sk" }),
1552
+ h2("div", { className: prefix + "-sk" })
1553
+ );
1554
+ })
1555
+ );
1556
+ };
1557
+ };
1558
+ }
1559
+ });
1560
+
1561
+ // packages/addons/lib/overlay.cjs
1562
+ var require_overlay = __commonJS({
1563
+ "packages/addons/lib/overlay.cjs"(exports2, module2) {
1564
+ "use strict";
1565
+ var defaultReact = require("react");
1566
+ var FOCUSABLE = "button:not(:disabled),input:not(:disabled),textarea:not(:disabled),select:not(:disabled),a[href]";
1567
+ module2.exports = function createOverlay(options) {
1568
+ var opts = options || {};
1569
+ var React = opts.React || defaultReact;
1570
+ var h2 = React.createElement;
1571
+ var tag = opts.tag || "section";
1572
+ var maskClass = opts.maskClass;
1573
+ var dialogClass = opts.dialogClass;
1574
+ var dialogClassOf = opts.dialogClassOf || function() {
1575
+ return "";
1576
+ };
1577
+ var ariaLabelOf = opts.ariaLabelOf || function(props) {
1578
+ return props["aria-label"] || props.title;
1579
+ };
1580
+ var ariaLabelledByOf = opts.ariaLabelledByOf || function() {
1581
+ return null;
1582
+ };
1583
+ var header = opts.header || null;
1584
+ var closeOnEscape = opts.closeOnEscape || function() {
1585
+ return true;
1586
+ };
1587
+ var closeOnMask = opts.closeOnMask || function() {
1588
+ return true;
1589
+ };
1590
+ var extraKeyDown = opts.onKeyDown || null;
1591
+ var autoFocusDialog = opts.autoFocusDialog !== false;
1592
+ var focusableSelector = opts.focusableSelector || FOCUSABLE;
1593
+ function Modal(props) {
1594
+ var ref = React.useRef(null);
1595
+ React.useEffect(function() {
1596
+ var previous = typeof document !== "undefined" ? document.activeElement : null;
1597
+ var focusIt = props.autoFocus !== void 0 ? props.autoFocus : autoFocusDialog;
1598
+ if (focusIt && ref.current) ref.current.focus();
1599
+ return function() {
1600
+ if (previous && previous.isConnected) previous.focus();
1601
+ };
1602
+ }, []);
1603
+ function onKeyDown(e) {
1604
+ if (extraKeyDown && extraKeyDown(e, props, ref)) return;
1605
+ if (e.key === "Escape") {
1606
+ if (!(props.closeOnEscape !== void 0 ? props.closeOnEscape : closeOnEscape(props))) return;
1607
+ e.preventDefault();
1608
+ e.stopPropagation();
1609
+ if (props.onClose) props.onClose();
1610
+ return;
1611
+ }
1612
+ if (e.key !== "Tab" || !ref.current) return;
1613
+ var els = ref.current.querySelectorAll(focusableSelector);
1614
+ if (!els.length) {
1615
+ e.preventDefault();
1616
+ return;
1617
+ }
1618
+ var first = els[0];
1619
+ var last = els[els.length - 1];
1620
+ if (e.shiftKey && (document.activeElement === first || document.activeElement === ref.current)) {
1621
+ e.preventDefault();
1622
+ last.focus();
1623
+ }
1624
+ if (!e.shiftKey && document.activeElement === last) {
1625
+ e.preventDefault();
1626
+ first.focus();
1627
+ }
1628
+ }
1629
+ var labelledBy = ariaLabelledByOf(props);
1630
+ return h2(
1631
+ "div",
1632
+ {
1633
+ className: maskClass,
1634
+ onMouseDown: function(e) {
1635
+ var allowed = props.closeOnMask !== void 0 ? props.closeOnMask : closeOnMask(props);
1636
+ if (e.target === e.currentTarget && props.onClose && allowed) props.onClose();
1637
+ }
1638
+ },
1639
+ h2(
1640
+ tag,
1641
+ {
1642
+ className: dialogClass + dialogClassOf(props),
1643
+ role: "dialog",
1644
+ "aria-modal": true,
1645
+ "aria-label": labelledBy ? null : ariaLabelOf(props),
1646
+ "aria-labelledby": labelledBy || null,
1647
+ ref,
1648
+ tabIndex: -1,
1649
+ onKeyDown
1650
+ },
1651
+ header ? header(props) : null,
1652
+ props.children
1653
+ )
1654
+ );
1655
+ }
1656
+ return Modal;
1451
1657
  };
1452
- function Icon3(props) {
1453
- var size = props.name === "empty" && props.size === 48 ? 48 : [11, 14, 16].includes(props.size) ? props.size : 14;
1454
- return React.createElement(ICONS[props.name] || ICONS.box, {
1455
- size,
1456
- strokeWidth: 2,
1457
- "aria-hidden": true,
1458
- focusable: false,
1459
- className: "wbi-svg"
1460
- });
1461
- }
1462
- module2.exports = { ICONS, Icon: Icon3 };
1463
1658
  }
1464
1659
  });
1465
1660
 
@@ -1468,7 +1663,7 @@ var require_ui = __commonJS({
1468
1663
  "packages/addons/storage/client/ui/ui.cjs"(exports2, module2) {
1469
1664
  var React = require("react");
1470
1665
  var h2 = React.createElement;
1471
- var Icon3 = require_icons().Icon;
1666
+ var Icon3 = require_icons2().Icon;
1472
1667
  function call(api, name, args) {
1473
1668
  return api.call(name, args || {}).then(function(r) {
1474
1669
  if (!r || r.ok !== true) throw new Error(r && r.error || "\u8BF7\u6C42\u5931\u8D25");
@@ -1478,39 +1673,16 @@ var require_ui = __commonJS({
1478
1673
  function tr(lang, zh, en) {
1479
1674
  return lang === "en" ? en : zh;
1480
1675
  }
1481
- function Button(props) {
1482
- var attrs = Object.assign({ type: "button", className: "wbi-btn" }, props);
1483
- delete attrs.icon;
1484
- delete attrs.iconOnly;
1485
- if (props.icon) {
1486
- attrs["aria-label"] = props["aria-label"] || props.children;
1487
- attrs.title = props.title || attrs["aria-label"];
1488
- attrs.className += props.iconOnly ? " wbi-icon-only" : " wbi-icon-text";
1676
+ var createButton = require_button();
1677
+ var createSkeleton = require_skeleton();
1678
+ var createOverlay = require_overlay();
1679
+ var Button = createButton({ prefix: "wbi", Icon: Icon3 });
1680
+ var Skeleton = createSkeleton({
1681
+ prefix: "wbi",
1682
+ text: function(lang) {
1683
+ return tr(lang, "\u8BFB\u53D6\u4E2D\u2026", "Loading\u2026");
1489
1684
  }
1490
- return h2(
1491
- "button",
1492
- attrs,
1493
- props.icon ? h2(Icon3, { name: props.icon }) : null,
1494
- props.iconOnly ? null : props.icon ? h2("span", { className: "wbi-btn-label" }, props.children) : props.children
1495
- );
1496
- }
1497
- function Skeleton(props) {
1498
- var label = props.label || tr(props.lang, "\u8BFB\u53D6\u4E2D\u2026", "Loading\u2026");
1499
- return h2(
1500
- "div",
1501
- { className: "wbi-root wbi-grid wbi-skeleton", role: "status", "aria-label": label, "aria-busy": true },
1502
- h2("span", { className: "wbi-sr" }, label),
1503
- [0, 1, 2].map(function(i) {
1504
- return h2(
1505
- "div",
1506
- { key: i, className: "wbi-card wbi-skeleton-card", "aria-hidden": true },
1507
- h2("div", { className: "wbi-sk" }),
1508
- h2("div", { className: "wbi-sk" }),
1509
- h2("div", { className: "wbi-sk" })
1510
- );
1511
- })
1512
- );
1513
- }
1685
+ });
1514
1686
  function ErrorBox(props) {
1515
1687
  return props.error ? h2("div", { className: "wbi-error", role: "alert" }, String(props.error.message || props.error)) : null;
1516
1688
  }
@@ -1522,70 +1694,23 @@ var require_ui = __commonJS({
1522
1694
  return "";
1523
1695
  }
1524
1696
  }
1525
- function Modal(props) {
1526
- var ref = React.useRef(null);
1527
- React.useEffect(function() {
1528
- var previous = document.activeElement;
1529
- if (ref.current) ref.current.focus();
1530
- return function() {
1531
- if (previous && previous.isConnected) previous.focus();
1532
- };
1533
- }, []);
1534
- function key(e) {
1535
- if (e.key === "Escape") {
1536
- e.preventDefault();
1537
- e.stopPropagation();
1538
- if (props.onClose) props.onClose();
1539
- return;
1540
- }
1541
- if (e.key !== "Tab") return;
1542
- var els = ref.current.querySelectorAll(
1543
- "button:not(:disabled),input:not(:disabled),textarea:not(:disabled),select:not(:disabled),a[href]"
1697
+ var Modal = createOverlay({
1698
+ tag: "section",
1699
+ maskClass: "wbi-mask",
1700
+ dialogClass: "wbi-modal",
1701
+ ariaLabelOf: function(props) {
1702
+ return props.title;
1703
+ },
1704
+ header: function(props) {
1705
+ return h2(
1706
+ "header",
1707
+ { className: "wbi-row" },
1708
+ h2("h2", null, props.title),
1709
+ h2("span", { className: "wbi-grow" }),
1710
+ h2(Button, { icon: "close", iconOnly: true, onClick: props.onClose, disabled: !props.onClose, "aria-label": "\u5173\u95ED / Close" }, "\xD7")
1544
1711
  );
1545
- if (!els.length) {
1546
- e.preventDefault();
1547
- return;
1548
- }
1549
- var first = els[0], last = els[els.length - 1];
1550
- if (e.shiftKey && (document.activeElement === first || document.activeElement === ref.current)) {
1551
- e.preventDefault();
1552
- last.focus();
1553
- }
1554
- if (!e.shiftKey && document.activeElement === last) {
1555
- e.preventDefault();
1556
- first.focus();
1557
- }
1558
1712
  }
1559
- return h2(
1560
- "div",
1561
- {
1562
- className: "wbi-mask",
1563
- onMouseDown: function(e) {
1564
- if (e.target === e.currentTarget && props.onClose) props.onClose();
1565
- }
1566
- },
1567
- h2(
1568
- "section",
1569
- {
1570
- className: "wbi-modal",
1571
- role: "dialog",
1572
- "aria-modal": true,
1573
- "aria-label": props.title,
1574
- ref,
1575
- tabIndex: -1,
1576
- onKeyDown: key
1577
- },
1578
- h2(
1579
- "header",
1580
- { className: "wbi-row" },
1581
- h2("h2", null, props.title),
1582
- h2("span", { className: "wbi-grow" }),
1583
- h2(Button, { icon: "close", iconOnly: true, onClick: props.onClose, disabled: !props.onClose, "aria-label": "\u5173\u95ED / Close" }, "\xD7")
1584
- ),
1585
- props.children
1586
- )
1587
- );
1588
- }
1713
+ });
1589
1714
  module2.exports = { Icon: Icon3, Skeleton, h: h2, call, tr, Button, ErrorBox, Modal, safeImage };
1590
1715
  }
1591
1716
  });
@@ -2301,193 +2426,323 @@ var require_filter_checklist = __commonJS({
2301
2426
  }
2302
2427
  });
2303
2428
 
2304
- // packages/addons/storage/client/ui/tagfilter.cjs
2305
- var require_tagfilter = __commonJS({
2306
- "packages/addons/storage/client/ui/tagfilter.cjs"(exports2, module2) {
2429
+ // packages/addons/lib/tag-filter.cjs
2430
+ var require_tag_filter = __commonJS({
2431
+ "packages/addons/lib/tag-filter.cjs"(exports2, module2) {
2432
+ "use strict";
2307
2433
  var React = require("react");
2308
- var ui = require_ui();
2309
- var FilterChecklist = require_filter_checklist();
2310
2434
  var h2 = React.createElement;
2311
- var tr = ui.tr;
2312
- module2.exports = function TagFilter(props) {
2313
- var api = props.api, lang = props.lang, enabled = props.enabled !== false, ids = props.ids || [], onChange = props.onChange;
2314
- var openS = React.useState(false), open = openS[0], setOpen = openS[1];
2315
- var queryS = React.useState(""), query = queryS[0], setQuery = queryS[1];
2316
- var optsS = React.useState({ tags: [], total: 0, pageNumber: 0, hasMore: false }), opts = optsS[0], setOpts = optsS[1];
2317
- var loadingS = React.useState(false), loading = loadingS[0], setLoading = loadingS[1];
2318
- var namesS = React.useState({}), names = namesS[0], setNames = namesS[1];
2319
- var seq = React.useRef(0);
2320
- var load = React.useCallback(
2321
- function(text, pageNumber, append) {
2322
- var mine = ++seq.current;
2323
- setLoading(true);
2324
- return api.call("storageTags.search", { text: text || "", pageNumber, pageSize: 20 }).then(function(r) {
2325
- if (mine !== seq.current) return;
2326
- setLoading(false);
2327
- if (!r || !r.ok) return;
2328
- var out = r.result || {}, records = out.records || [], current = out.current || pageNumber, pages = out.pages || 0;
2329
- setOpts(function(prev) {
2330
- var list = append ? (prev.tags || []).slice() : [];
2331
- var seen = {};
2332
- list.forEach(function(x) {
2333
- seen[String(x.id)] = true;
2435
+ var FilterChecklist = require_filter_checklist();
2436
+ module2.exports = function createTagFilter(options) {
2437
+ var conf = options || {};
2438
+ var classes = conf.classes || {};
2439
+ var pageSize = conf.pageSize || 20;
2440
+ var debounce = conf.debounce === void 0 ? 200 : conf.debounce;
2441
+ var dedupe = conf.dedupe !== false;
2442
+ var mapPage = conf.mapPage || function(out, pageNumber) {
2443
+ return {
2444
+ rows: out.records || [],
2445
+ total: out.total || 0,
2446
+ page: out.current || pageNumber,
2447
+ hasMore: !!out.hasNext
2448
+ };
2449
+ };
2450
+ var items = conf.items || function(rows) {
2451
+ return rows.map(function(x) {
2452
+ return { id: x.id, name: x.name };
2453
+ });
2454
+ };
2455
+ var text = conf.text || function() {
2456
+ return {};
2457
+ };
2458
+ var icon = conf.icon || function() {
2459
+ return null;
2460
+ };
2461
+ var caret = conf.caret === void 0 ? "\u25BE" : conf.caret;
2462
+ var enabled = conf.enabled || function() {
2463
+ return true;
2464
+ };
2465
+ var renderSelected = conf.renderSelected || null;
2466
+ return function TagFilter(props) {
2467
+ var api = props.api;
2468
+ var ids = props.ids || [];
2469
+ var onChange = props.onChange || function() {
2470
+ };
2471
+ var t = text(props);
2472
+ var availS = React.useState(true);
2473
+ var openS = React.useState(false);
2474
+ var open = openS[0];
2475
+ var setOpen = openS[1];
2476
+ var queryS = React.useState("");
2477
+ var query = queryS[0];
2478
+ var setQuery = queryS[1];
2479
+ var rowsS = React.useState([]);
2480
+ var rows = rowsS[0];
2481
+ var setRows = rowsS[1];
2482
+ var totalS = React.useState(0);
2483
+ var total = totalS[0];
2484
+ var setTotal = totalS[1];
2485
+ var pageS = React.useState(0);
2486
+ var page = pageS[0];
2487
+ var setPage = pageS[1];
2488
+ var hasMoreS = React.useState(false);
2489
+ var hasMore = hasMoreS[0];
2490
+ var setHasMore = hasMoreS[1];
2491
+ var loadingS = React.useState(false);
2492
+ var loading = loadingS[0];
2493
+ var setLoading = loadingS[1];
2494
+ var namesS = React.useState({});
2495
+ var names = namesS[0];
2496
+ var setNames = namesS[1];
2497
+ var seq = React.useRef(0);
2498
+ var load = React.useCallback(
2499
+ function(q, pageNumber, append) {
2500
+ var mine = ++seq.current;
2501
+ setLoading(true);
2502
+ return api.call(conf.action, { text: q || "", pageNumber, pageSize }).then(function(r) {
2503
+ if (mine !== seq.current) return;
2504
+ setLoading(false);
2505
+ if (!r || !r.ok) return;
2506
+ var next = mapPage(r.result || {}, pageNumber);
2507
+ setRows(function(prev) {
2508
+ if (!append) return next.rows;
2509
+ if (!dedupe) return prev.concat(next.rows);
2510
+ var seen = {};
2511
+ var out = [];
2512
+ prev.concat(next.rows).forEach(function(x) {
2513
+ var key = String(x.id);
2514
+ if (seen[key]) return;
2515
+ seen[key] = true;
2516
+ out.push(x);
2517
+ });
2518
+ return out;
2334
2519
  });
2335
- records.forEach(function(x) {
2336
- if (!seen[String(x.id)]) list.push(x);
2520
+ setTotal(next.total);
2521
+ setPage(next.page);
2522
+ setHasMore(next.hasMore);
2523
+ setNames(function(prev) {
2524
+ var map = Object.assign({}, prev);
2525
+ next.rows.forEach(function(x) {
2526
+ map[String(x.id)] = x.name;
2527
+ });
2528
+ return map;
2337
2529
  });
2338
- return { tags: list, total: out.total || 0, pageNumber: current, hasMore: current < pages };
2530
+ }).catch(function() {
2531
+ if (mine === seq.current) setLoading(false);
2339
2532
  });
2340
- setNames(function(prev) {
2341
- var next = Object.assign({}, prev);
2342
- records.forEach(function(x) {
2343
- next[String(x.id)] = x.name;
2344
- });
2345
- return next;
2533
+ },
2534
+ [api]
2535
+ );
2536
+ React.useEffect(
2537
+ function() {
2538
+ if (!open) return void 0;
2539
+ var timer = setTimeout(
2540
+ function() {
2541
+ load(query, 1, false);
2542
+ },
2543
+ query ? debounce : 0
2544
+ );
2545
+ return function() {
2546
+ clearTimeout(timer);
2547
+ };
2548
+ },
2549
+ [open, query, load, props.reloadKey]
2550
+ );
2551
+ React.useEffect(
2552
+ function() {
2553
+ if (!conf.probe) return;
2554
+ api.call(conf.probe.action || conf.action, conf.probe.args || {}).then(function(r) {
2555
+ if (r && r.ok) availS[1](!!(conf.probe.available && conf.probe.available(r.result)));
2556
+ }).catch(function() {
2346
2557
  });
2347
- }).catch(function() {
2348
- if (mine === seq.current) setLoading(false);
2349
- });
2350
- },
2351
- [api]
2352
- );
2353
- React.useEffect(
2354
- function() {
2355
- if (!open) return void 0;
2356
- var timer = setTimeout(
2357
- function() {
2358
- load(query, 1, false);
2359
- },
2360
- query ? 200 : 0
2361
- );
2362
- return function() {
2363
- clearTimeout(timer);
2364
- };
2365
- },
2366
- [open, query, load, props.reloadKey]
2367
- );
2368
- React.useEffect(
2369
- function() {
2370
- if (!open || !ids.length) return;
2371
- var wanted = ids.filter(function(id) {
2372
- return !names[String(id)];
2373
- });
2374
- if (!wanted.length) return;
2375
- api.call("storageTags.byIds", { ids: wanted }).then(function(r) {
2376
- if (!r || !r.ok) return;
2377
- var next = {};
2378
- (r.result && r.result.records || []).forEach(function(x) {
2379
- next[String(x.id)] = x.name;
2558
+ },
2559
+ [api]
2560
+ );
2561
+ React.useEffect(
2562
+ function() {
2563
+ if (!open || !ids.length || !conf.names) return;
2564
+ var wanted = ids.filter(function(id) {
2565
+ return !names[String(id)];
2380
2566
  });
2381
- if (!Object.keys(next).length) return;
2382
- setNames(function(prev) {
2383
- return Object.assign({}, prev, next);
2567
+ if (!wanted.length) return;
2568
+ var args = conf.names.args ? conf.names.args(wanted) : { ids: wanted };
2569
+ api.call(conf.names.action, args).then(function(r) {
2570
+ if (!r || !r.ok) return;
2571
+ var map = {};
2572
+ (r.result && r.result.records || []).forEach(function(x) {
2573
+ map[String(x.id)] = x.name;
2574
+ });
2575
+ if (!Object.keys(map).length) return;
2576
+ setNames(function(prev) {
2577
+ return Object.assign({}, prev, map);
2578
+ });
2579
+ }).catch(function() {
2384
2580
  });
2385
- }).catch(function() {
2386
- });
2387
- },
2388
- [open, ids.join(",")]
2389
- );
2390
- React.useEffect(
2391
- function() {
2392
- if (!open) return void 0;
2393
- function onKey(e) {
2394
- if (e.key === "Escape") setOpen(false);
2395
- }
2396
- document.addEventListener("keydown", onKey);
2397
- return function() {
2398
- document.removeEventListener("keydown", onKey);
2399
- };
2400
- },
2401
- [open]
2402
- );
2403
- function toggle(id) {
2404
- var key = String(id), next = ids.slice(), i = next.indexOf(key);
2405
- if (i >= 0) next.splice(i, 1);
2406
- else next.push(key);
2407
- onChange(next);
2408
- }
2409
- if (!enabled) return null;
2410
- return h2(
2411
- "div",
2412
- { className: "wbi-tagfilter" },
2413
- h2(
2414
- "button",
2415
- {
2416
- type: "button",
2417
- className: "wbi-btn" + (ids.length ? " wbi-tagon" : ""),
2418
- "aria-expanded": open ? "true" : "false",
2419
- onClick: function(e) {
2420
- e.stopPropagation();
2421
- setOpen(!open);
2581
+ },
2582
+ [open, ids.join(",")]
2583
+ );
2584
+ React.useEffect(
2585
+ function() {
2586
+ if (!open) return void 0;
2587
+ function onKey(e) {
2588
+ if (e.key === "Escape") setOpen(false);
2422
2589
  }
2590
+ document.addEventListener("keydown", onKey);
2591
+ return function() {
2592
+ document.removeEventListener("keydown", onKey);
2593
+ };
2423
2594
  },
2424
- h2(ui.Icon, { name: "tag", size: 13 }),
2425
- tr(lang, "\u6807\u7B7E\u7B5B\u9009", "Tag filter") + (ids.length ? " \xB7 " + ids.length : ""),
2426
- "\u25BE"
2427
- ),
2428
- open ? h2(
2595
+ [open]
2596
+ );
2597
+ function toggle(id) {
2598
+ var key = String(id);
2599
+ var next = ids.slice();
2600
+ var i = next.indexOf(key);
2601
+ if (i >= 0) next.splice(i, 1);
2602
+ else next.push(key);
2603
+ onChange(next);
2604
+ }
2605
+ if (!enabled(props)) return null;
2606
+ var caretNode = typeof caret === "function" ? caret(props, t) : caret;
2607
+ var selectedNode = renderSelected ? renderSelected({ ids, names, toggle, text: t, classes, h: h2 }) : null;
2608
+ return h2(
2429
2609
  "div",
2430
- { className: "wbi-tagmenu", role: "menu", onClick: function(e) {
2431
- e.stopPropagation();
2432
- } },
2433
- h2(FilterChecklist, {
2434
- beforeHead: ids.length ? h2(
2435
- "div",
2436
- { className: "wbi-tagsel" },
2437
- h2("div", { className: "wbi-tagmenu-head" }, h2("span", null, tr(lang, "\u5DF2\u9009", "Selected") + " " + ids.length)),
2438
- h2(
2439
- "div",
2440
- { className: "wbi-tagsel-list" },
2441
- ids.map(function(id) {
2442
- return h2(
2443
- "button",
2444
- {
2445
- key: id,
2446
- type: "button",
2447
- className: "wbi-tagselitem",
2448
- title: tr(lang, "\u79FB\u9664", "Remove"),
2449
- onClick: function() {
2450
- toggle(id);
2451
- }
2452
- },
2453
- h2("span", { className: "wbi-tagnm" }, names[String(id)] || "#" + id),
2454
- h2("span", { className: "wbi-tagx" }, "\xD7")
2455
- );
2456
- })
2457
- )
2458
- ) : null,
2459
- items: opts.tags.map(function(x) {
2460
- return { id: x.id, name: x.name };
2461
- }),
2462
- selected: ids,
2463
- onToggle: toggle,
2464
- query,
2465
- onQuery: setQuery,
2466
- title: tr(lang, "\u5168\u90E8\u6807\u7B7E", "All tags"),
2467
- total: opts.total,
2468
- selectedText: tr(lang, "\u5DF2\u9009", "Selected"),
2469
- clearText: tr(lang, "\u6E05\u7A7A", "Clear"),
2470
- onClear: function() {
2471
- onChange([]);
2472
- setQuery("");
2610
+ { className: classes.root },
2611
+ h2(
2612
+ "button",
2613
+ {
2614
+ type: "button",
2615
+ className: classes.btn + (ids.length ? " " + (classes.btnOn || "on") : ""),
2616
+ "aria-expanded": open ? "true" : "false",
2617
+ onClick: function(e) {
2618
+ if (conf.stopPropagation) e.stopPropagation();
2619
+ setOpen(!open);
2620
+ }
2473
2621
  },
2474
- searchPlaceholder: tr(lang, "\u641C\u7D22\u6807\u7B7E\u540D\u79F0", "Search tag names"),
2475
- loading,
2476
- hasMore: opts.hasMore,
2477
- onLoadMore: function() {
2478
- load(query, (opts.pageNumber || 1) + 1, true);
2622
+ icon(props, "tag", 13),
2623
+ t.label + (ids.length ? " \xB7 " + ids.length : ""),
2624
+ caretNode
2625
+ ),
2626
+ open ? h2(
2627
+ "div",
2628
+ {
2629
+ className: classes.menu,
2630
+ role: conf.menuRole,
2631
+ style: conf.menuStyle,
2632
+ onClick: conf.stopPropagation ? function(e) {
2633
+ e.stopPropagation();
2634
+ } : void 0
2479
2635
  },
2480
- emptyText: tr(lang, "\u6682\u65E0\u6807\u7B7E", "No tags yet"),
2481
- noMatchText: tr(lang, "\u6CA1\u6709\u5339\u914D\u7684\u6807\u7B7E", "No matching tags"),
2482
- loadingText: tr(lang, "\u52A0\u8F7D\u4E2D\u2026", "Loading\u2026"),
2483
- noMoreText: tr(lang, "\u6CA1\u6709\u66F4\u591A", "No more")
2484
- })
2485
- ) : null
2486
- );
2636
+ h2(FilterChecklist, {
2637
+ beforeHead: selectedNode,
2638
+ items: items(rows),
2639
+ selected: ids,
2640
+ onToggle: toggle,
2641
+ query,
2642
+ onQuery: setQuery,
2643
+ title: t.all,
2644
+ total,
2645
+ selectedText: t.selected,
2646
+ clearText: t.clear,
2647
+ onClear: function() {
2648
+ onChange([]);
2649
+ setQuery("");
2650
+ },
2651
+ searchPlaceholder: t.searchPlaceholder,
2652
+ loading,
2653
+ hasMore,
2654
+ onLoadMore: function() {
2655
+ load(query, (page || 1) + 1, true);
2656
+ },
2657
+ emptyText: t.empty,
2658
+ noMatchText: t.noMatch,
2659
+ loadingText: t.loading,
2660
+ noMoreText: t.noMore
2661
+ })
2662
+ ) : null
2663
+ );
2664
+ };
2487
2665
  };
2488
2666
  }
2489
2667
  });
2490
2668
 
2669
+ // packages/addons/storage/client/ui/tagfilter.cjs
2670
+ var require_tagfilter = __commonJS({
2671
+ "packages/addons/storage/client/ui/tagfilter.cjs"(exports2, module2) {
2672
+ var React = require("react");
2673
+ var h2 = React.createElement;
2674
+ var ui = require_ui();
2675
+ var createTagFilter = require_tag_filter();
2676
+ module2.exports = createTagFilter({
2677
+ action: "storageTags.search",
2678
+ stopPropagation: true,
2679
+ classes: { root: "wbi-tagfilter", btn: "wbi-btn", btnOn: "wbi-tagon", menu: "wbi-tagmenu" },
2680
+ menuRole: "menu",
2681
+ enabled: function(props) {
2682
+ return props.enabled !== false;
2683
+ },
2684
+ // 已选标签可能不在当前页甚至不在当前搜索词里,按 id 补名字。
2685
+ names: { action: "storageTags.byIds" },
2686
+ text: function(props) {
2687
+ var lang = props.lang;
2688
+ return {
2689
+ label: ui.tr(lang, "\u6807\u7B7E\u7B5B\u9009", "Tag filter"),
2690
+ selected: ui.tr(lang, "\u5DF2\u9009", "Selected"),
2691
+ all: ui.tr(lang, "\u5168\u90E8\u6807\u7B7E", "All tags"),
2692
+ clear: ui.tr(lang, "\u6E05\u7A7A", "Clear"),
2693
+ searchPlaceholder: ui.tr(lang, "\u641C\u7D22\u6807\u7B7E\u540D\u79F0", "Search tag names"),
2694
+ empty: ui.tr(lang, "\u6682\u65E0\u6807\u7B7E", "No tags yet"),
2695
+ noMatch: ui.tr(lang, "\u6CA1\u6709\u5339\u914D\u7684\u6807\u7B7E", "No matching tags"),
2696
+ loading: ui.tr(lang, "\u52A0\u8F7D\u4E2D\u2026", "Loading\u2026"),
2697
+ noMore: ui.tr(lang, "\u6CA1\u6709\u66F4\u591A", "No more"),
2698
+ remove: ui.tr(lang, "\u79FB\u9664", "Remove")
2699
+ };
2700
+ },
2701
+ icon: function(props, name, size) {
2702
+ return h2(ui.Icon, { name, size });
2703
+ },
2704
+ caret: "\u25BE",
2705
+ mapPage: function(out, pageNumber) {
2706
+ var pages = out.pages || 0;
2707
+ var current = out.current || pageNumber;
2708
+ return { rows: out.records || [], total: out.total || 0, page: current, hasMore: current < pages };
2709
+ },
2710
+ renderSelected: function(ctx) {
2711
+ if (!ctx.ids.length) return null;
2712
+ return h2(
2713
+ "div",
2714
+ { className: "wbi-tagsel" },
2715
+ h2(
2716
+ "div",
2717
+ { className: "wbi-tagmenu-head" },
2718
+ h2("span", null, ctx.text.selected + " " + ctx.ids.length)
2719
+ ),
2720
+ h2(
2721
+ "div",
2722
+ { className: "wbi-tagsel-list" },
2723
+ ctx.ids.map(function(id) {
2724
+ return h2(
2725
+ "button",
2726
+ {
2727
+ key: id,
2728
+ type: "button",
2729
+ className: "wbi-tagselitem",
2730
+ title: ctx.text.remove,
2731
+ onClick: function() {
2732
+ ctx.toggle(id);
2733
+ }
2734
+ },
2735
+ h2("span", { className: "wbi-tagnm" }, ctx.names[String(id)] || "#" + id),
2736
+ h2("span", { className: "wbi-tagx" }, "\xD7")
2737
+ );
2738
+ })
2739
+ )
2740
+ );
2741
+ }
2742
+ });
2743
+ }
2744
+ });
2745
+
2491
2746
  // packages/addons/storage/client/ui/selection.cjs
2492
2747
  var require_selection = __commonJS({
2493
2748
  "packages/addons/storage/client/ui/selection.cjs"(exports2, module2) {
@@ -4653,7 +4908,7 @@ var require_data = __commonJS({
4653
4908
  "use strict";
4654
4909
  module2.exports = require_data_view()({
4655
4910
  domain: "storage",
4656
- Icon: require_icons().Icon,
4911
+ Icon: require_icons2().Icon,
4657
4912
  Skeleton: require_ui().Skeleton,
4658
4913
  prefix: "wbi",
4659
4914
  tables: ["storage"],
@@ -5313,11 +5568,11 @@ if (host) {
5313
5568
  style.textContent = require_styles();
5314
5569
  document.head.appendChild(style);
5315
5570
  }
5316
- h = require("react").createElement, Icon2 = require_icons().Icon;
5571
+ h = require("react").createElement, icons = require_icons2(), Icon2 = icons.Icon, GLYPHS = icons.ICONS;
5317
5572
  host.registerAddon({
5318
5573
  id: "wb-addon-storage",
5319
- version: "1.5.6",
5320
- icon: (init_package(), __toCommonJS(package_exports)).default,
5574
+ version: "1.5.9",
5575
+ icon: GLYPHS["package"],
5321
5576
  views: [
5322
5577
  { id: "stats", icon: tabIcon2("chart"), title: { zh: "\u7EDF\u8BA1", en: "Statistics" }, component: require_stats().Stats },
5323
5578
  { id: "storage", icon: tabIcon2("list"), title: { zh: "\u8BB0\u5F55", en: "Records" }, component: require_records().Records },
@@ -5330,7 +5585,9 @@ if (host) {
5330
5585
  var styleId;
5331
5586
  var style;
5332
5587
  var h;
5588
+ var icons;
5333
5589
  var Icon2;
5590
+ var GLYPHS;
5334
5591
  var tabIcon;
5335
5592
  module.exports = { name: "dsh-workbench-storage", inject: [], apply: function() {
5336
5593
  } };
package/lib/index.js CHANGED
@@ -67,7 +67,8 @@ export function apply(ctx) {
67
67
  id: "wb-addon-storage",
68
68
  title: "储物",
69
69
  description: "储物:记录物品名称、品牌、单位、库存文本、存放位置、图片URL、备注与可选标签",
70
- version: "1.5.6",
70
+ version: "1.5.9",
71
+ category: "assets",
71
72
  tables: ["storage"],
72
73
  sync: storageSync,
73
74
  backupAfter: ["wb-addon-tags"],
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "dsh-workbench-storage",
3
- "version": "1.5.6",
3
+ "version": "1.5.9",
4
4
  "type": "module",
5
5
  "description": "个人工作台储物插件:名称、品牌、位置、单位、库存文本与标签",
6
6
  "main": "lib/index.js",
@@ -9,7 +9,7 @@
9
9
  "id": "wb-addon-storage",
10
10
  "title": "储物",
11
11
  "description": "储物:统计/记录/配置/数据四个视图",
12
- "version": "1.5.6",
12
+ "version": "1.5.9",
13
13
  "minShell": "0.8.0",
14
14
  "tables": [
15
15
  "storage"
@@ -47,7 +47,7 @@
47
47
  "./package.json": "./package.json"
48
48
  },
49
49
  "dependencies": {
50
- "dsh-workbench-host": "^0.8.0"
50
+ "dsh-workbench-host": "^0.8.2"
51
51
  },
52
52
  "dsh": {
53
53
  "bundle": {