dsh-workbench-sites 1.12.11 → 1.12.12

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 (2) hide show
  1. package/lib/client.js +322 -176
  2. package/package.json +2 -2
package/lib/client.js CHANGED
@@ -178,13 +178,266 @@ var require_filter_checklist = __commonJS({
178
178
  }
179
179
  });
180
180
 
181
+ // packages/addons/lib/search-picker.cjs
182
+ var require_search_picker = __commonJS({
183
+ "packages/addons/lib/search-picker.cjs"(exports2, module2) {
184
+ "use strict";
185
+ var React2 = require("react");
186
+ var h2 = React2.createElement;
187
+ var FilterChecklist = require_filter_checklist();
188
+ var DEFAULT_TEXTS = {
189
+ all: "\u5168\u90E8",
190
+ selected: "\u5DF2\u9009",
191
+ clear: "\u6E05\u7A7A",
192
+ searchPlaceholder: "\u641C\u7D22",
193
+ empty: "\u6682\u65E0\u6570\u636E",
194
+ noMatch: "\u6CA1\u6709\u5339\u914D\u9879",
195
+ loading: "\u52A0\u8F7D\u4E2D\u2026",
196
+ noMore: "\u6CA1\u6709\u66F4\u591A"
197
+ };
198
+ function asText(x) {
199
+ return String(x == null ? "" : x).toLowerCase();
200
+ }
201
+ function filterLocal(items, query) {
202
+ var q = String(query || "").trim();
203
+ if (!q) return items;
204
+ var needle = asText(q);
205
+ return items.filter(function(x) {
206
+ return asText(x.name).indexOf(needle) >= 0 || asText(x.meta).indexOf(needle) >= 0;
207
+ });
208
+ }
209
+ function useRemoteSource(conf) {
210
+ var RT = conf.React || React2;
211
+ var open = conf.open;
212
+ var query = conf.query;
213
+ var fetchPage = conf.fetchPage;
214
+ var pageSize = conf.pageSize;
215
+ var debounce = conf.debounce;
216
+ var dedupe = conf.dedupe;
217
+ var mapPage = conf.mapPage;
218
+ var reloadKey = conf.reloadKey;
219
+ var rowsS = RT.useState([]);
220
+ var totalS = RT.useState(0);
221
+ var pageS = RT.useState(0);
222
+ var moreS = RT.useState(false);
223
+ var loadS = RT.useState(false);
224
+ var seq = RT.useRef ? RT.useRef(0) : { current: 0 };
225
+ function load(q, pageNumber, append) {
226
+ var mine = ++seq.current;
227
+ loadS[1](true);
228
+ return Promise.resolve(fetchPage(q, pageNumber)).then(function(raw) {
229
+ if (mine !== seq.current) return;
230
+ loadS[1](false);
231
+ var next = mapPage ? mapPage(raw, pageNumber) : raw || {};
232
+ var list = next.rows || [];
233
+ rowsS[1](function(prev) {
234
+ if (!append) return list;
235
+ var joined = dedupe === false ? prev.concat(list) : prev.concat(list);
236
+ if (dedupe === false) return joined;
237
+ var seen = {};
238
+ return joined.filter(function(x) {
239
+ var key = String(x.id);
240
+ if (seen[key]) return false;
241
+ seen[key] = true;
242
+ return true;
243
+ });
244
+ });
245
+ totalS[1](typeof next.total === "number" ? next.total : list.length);
246
+ pageS[1](next.page || pageNumber);
247
+ moreS[1](!!next.hasMore);
248
+ }).catch(function() {
249
+ if (mine === seq.current) loadS[1](false);
250
+ });
251
+ }
252
+ RT.useEffect(
253
+ function() {
254
+ if (!open) return void 0;
255
+ var timer = setTimeout(
256
+ function() {
257
+ load(query, 1, false);
258
+ },
259
+ query ? debounce : 0
260
+ );
261
+ return function() {
262
+ clearTimeout(timer);
263
+ };
264
+ },
265
+ [open, query, reloadKey]
266
+ );
267
+ return {
268
+ rows: rowsS[0],
269
+ total: totalS[0],
270
+ page: pageS[0],
271
+ hasMore: moreS[0],
272
+ loading: loadS[0],
273
+ loadQuery: load,
274
+ reset: function() {
275
+ seq.current += 1;
276
+ rowsS[1]([]);
277
+ totalS[1](0);
278
+ pageS[1](0);
279
+ moreS[1](false);
280
+ loadS[1](false);
281
+ }
282
+ };
283
+ }
284
+ function SearchPicker(props) {
285
+ var RT = props.React || React2;
286
+ var texts = Object.assign({}, DEFAULT_TEXTS, props.texts || {});
287
+ var classes = props.classes || {};
288
+ var mode = props.mode === "single" ? "single" : "multi";
289
+ var disabled = props.disabled === true;
290
+ var selected = (props.selected || []).map(String);
291
+ var items = props.items || null;
292
+ var fetchPage = props.fetchPage || null;
293
+ var pageSize = props.pageSize || 20;
294
+ var debounce = props.debounce === void 0 ? 200 : props.debounce;
295
+ var allItems = items || [];
296
+ var openS = RT.useState(false);
297
+ var open = openS[0];
298
+ var queryS = RT.useState("");
299
+ var query = queryS[0];
300
+ var boxRef = RT.useRef ? RT.useRef(null) : { current: null };
301
+ var remote = fetchPage ? useRemoteSource({
302
+ React: RT,
303
+ open,
304
+ query,
305
+ fetchPage,
306
+ pageSize,
307
+ debounce,
308
+ dedupe: props.dedupe,
309
+ mapPage: props.mapPage,
310
+ reloadKey: props.reloadKey
311
+ }) : null;
312
+ var rows = remote ? remote.rows : filterLocal(allItems, query);
313
+ var loading = remote ? remote.loading : false;
314
+ var total = remote ? remote.total : rows.length;
315
+ var hasMore = remote ? remote.hasMore : false;
316
+ RT.useEffect(function() {
317
+ if (!open || typeof document === "undefined") return void 0;
318
+ function onDown(e) {
319
+ var box = boxRef.current;
320
+ if (box && !box.contains(e.target)) openS[1](false);
321
+ }
322
+ function onKey(e) {
323
+ if (e.key === "Escape") openS[1](false);
324
+ }
325
+ document.addEventListener("mousedown", onDown);
326
+ document.addEventListener("keydown", onKey);
327
+ return function() {
328
+ document.removeEventListener("mousedown", onDown);
329
+ document.removeEventListener("keydown", onKey);
330
+ };
331
+ }, [open]);
332
+ function commit(next) {
333
+ if (props.onChange) props.onChange(next);
334
+ }
335
+ function toggle(id) {
336
+ if (disabled) return;
337
+ var key = String(id);
338
+ if (mode === "single") {
339
+ openS[1](false);
340
+ if (props.onPick) props.onPick(key, rowOf(key));
341
+ commit([key]);
342
+ return;
343
+ }
344
+ var next = selected.slice();
345
+ var i = next.indexOf(key);
346
+ if (i >= 0) next.splice(i, 1);
347
+ else next.push(key);
348
+ commit(next);
349
+ }
350
+ function rowOf(id) {
351
+ var hit = rows.filter(function(x) {
352
+ return String(x.id) === String(id);
353
+ })[0];
354
+ if (hit) return hit;
355
+ return (allItems || []).filter(function(x) {
356
+ return String(x.id) === String(id);
357
+ })[0] || null;
358
+ }
359
+ var label = props.label || texts.all;
360
+ var caret = props.caret === void 0 ? "\u25BE" : props.caret;
361
+ var count = selected.length;
362
+ var chips = props.renderSelected ? props.renderSelected({ ids: selected, toggle, nameOf: props.nameOf || rowOf, texts }) : null;
363
+ return h2(
364
+ "div",
365
+ { className: classes.root, ref: boxRef },
366
+ h2(
367
+ "button",
368
+ {
369
+ type: "button",
370
+ className: classes.btn + (count ? " " + (classes.btnOn || "is-on") : ""),
371
+ "aria-haspopup": "dialog",
372
+ "aria-expanded": open ? "true" : "false",
373
+ disabled,
374
+ onClick: function(e) {
375
+ if (props.stopPropagation) e.stopPropagation();
376
+ openS[1](!open);
377
+ }
378
+ },
379
+ props.icon ? props.icon : null,
380
+ label + (count ? " \xB7 " + count : ""),
381
+ typeof caret === "function" ? caret : caret
382
+ ),
383
+ chips,
384
+ open ? h2(
385
+ "div",
386
+ {
387
+ className: classes.menu,
388
+ role: props.menuRole,
389
+ style: props.menuStyle,
390
+ onClick: props.stopPropagation ? function(e) {
391
+ e.stopPropagation();
392
+ } : void 0
393
+ },
394
+ h2(FilterChecklist, {
395
+ mode,
396
+ items: rows,
397
+ selected,
398
+ onToggle: toggle,
399
+ onPick: toggle,
400
+ query,
401
+ onQuery: queryS[1],
402
+ title: props.title || label,
403
+ total,
404
+ selectedText: texts.selected,
405
+ clearText: texts.clear,
406
+ onClear: function() {
407
+ commit([]);
408
+ queryS[1]("");
409
+ },
410
+ searchPlaceholder: texts.searchPlaceholder,
411
+ loading,
412
+ hasMore,
413
+ onLoadMore: remote ? function() {
414
+ remote.loadQuery(query, (remote.page || 1) + 1, true);
415
+ } : void 0,
416
+ emptyText: texts.empty,
417
+ noMatchText: texts.noMatch,
418
+ loadingText: texts.loading,
419
+ noMoreText: texts.noMore,
420
+ groupLabel: props.title || label,
421
+ autoFocus: props.autoFocus,
422
+ beforeHead: props.beforeHead || null
423
+ }),
424
+ props.footer || null
425
+ ) : null
426
+ );
427
+ }
428
+ module2.exports = SearchPicker;
429
+ module2.exports.filterLocal = filterLocal;
430
+ module2.exports.DEFAULT_TEXTS = DEFAULT_TEXTS;
431
+ }
432
+ });
433
+
181
434
  // packages/addons/lib/tag-filter.cjs
182
435
  var require_tag_filter = __commonJS({
183
436
  "packages/addons/lib/tag-filter.cjs"(exports2, module2) {
184
437
  "use strict";
185
438
  var React2 = require("react");
186
439
  var h2 = React2.createElement;
187
- var FilterChecklist = require_filter_checklist();
440
+ var SearchPicker = require_search_picker();
188
441
  module2.exports = function createTagFilter(options) {
189
442
  var conf = options || {};
190
443
  var classes = conf.classes || {};
@@ -220,99 +473,26 @@ var require_tag_filter = __commonJS({
220
473
  var ids = props.ids || [];
221
474
  var onChange = props.onChange || function() {
222
475
  };
223
- var t = text(props);
224
- var availS = React2.useState(true);
225
- var openS = React2.useState(false);
226
- var open = openS[0];
227
- var setOpen = openS[1];
228
- var queryS = React2.useState("");
229
- var query = queryS[0];
230
- var setQuery = queryS[1];
231
- var rowsS = React2.useState([]);
232
- var rows = rowsS[0];
233
- var setRows = rowsS[1];
234
- var totalS = React2.useState(0);
235
- var total = totalS[0];
236
- var setTotal = totalS[1];
237
- var pageS = React2.useState(0);
238
- var page = pageS[0];
239
- var setPage = pageS[1];
240
- var hasMoreS = React2.useState(false);
241
- var hasMore = hasMoreS[0];
242
- var setHasMore = hasMoreS[1];
243
- var loadingS = React2.useState(false);
244
- var loading = loadingS[0];
245
- var setLoading = loadingS[1];
476
+ var tx = text(props);
246
477
  var namesS = React2.useState({});
247
478
  var names = namesS[0];
248
- var setNames = namesS[1];
249
- var seq = React2.useRef(0);
250
- var load = React2.useCallback(
251
- function(q, pageNumber, append) {
252
- var mine = ++seq.current;
253
- setLoading(true);
254
- return api.call(conf.action, { text: q || "", pageNumber, pageSize }).then(function(r) {
255
- if (mine !== seq.current) return;
256
- setLoading(false);
257
- if (!r || !r.ok) return;
258
- var next = mapPage(r.result || {}, pageNumber);
259
- setRows(function(prev) {
260
- if (!append) return next.rows;
261
- if (!dedupe) return prev.concat(next.rows);
262
- var seen = {};
263
- var out = [];
264
- prev.concat(next.rows).forEach(function(x) {
265
- var key = String(x.id);
266
- if (seen[key]) return;
267
- seen[key] = true;
268
- out.push(x);
269
- });
270
- return out;
271
- });
272
- setTotal(next.total);
273
- setPage(next.page);
274
- setHasMore(next.hasMore);
275
- setNames(function(prev) {
276
- var map = Object.assign({}, prev);
277
- next.rows.forEach(function(x) {
278
- map[String(x.id)] = x.name;
279
- });
280
- return map;
281
- });
282
- }).catch(function() {
283
- if (mine === seq.current) setLoading(false);
284
- });
285
- },
286
- [api]
287
- );
288
- React2.useEffect(
289
- function() {
290
- if (!open) return void 0;
291
- var timer = setTimeout(
292
- function() {
293
- load(query, 1, false);
294
- },
295
- query ? debounce : 0
296
- );
297
- return function() {
298
- clearTimeout(timer);
299
- };
300
- },
301
- [open, query, load, props.reloadKey]
302
- );
303
- React2.useEffect(
304
- function() {
305
- if (!conf.probe) return;
306
- api.call(conf.probe.action || conf.action, conf.probe.args || {}).then(function(r) {
307
- if (r && r.ok) availS[1](!!(conf.probe.available && conf.probe.available(r.result)));
308
- }).catch(function() {
479
+ function mergeNames(rows) {
480
+ if (!rows || !rows.length) return;
481
+ namesS[1](function(prev) {
482
+ var next = Object.assign({}, prev);
483
+ var changed = false;
484
+ rows.forEach(function(x) {
485
+ if (next[String(x.id)] !== x.name) {
486
+ next[String(x.id)] = x.name;
487
+ changed = true;
488
+ }
309
489
  });
310
- },
311
- [api]
312
- );
490
+ return changed ? next : prev;
491
+ });
492
+ }
313
493
  React2.useEffect(
314
494
  function() {
315
- if (!open || !ids.length || !conf.names) return;
495
+ if (!ids.length || !conf.names) return;
316
496
  var wanted = ids.filter(function(id) {
317
497
  return !names[String(id)];
318
498
  });
@@ -320,99 +500,65 @@ var require_tag_filter = __commonJS({
320
500
  var args = conf.names.args ? conf.names.args(wanted) : { ids: wanted };
321
501
  api.call(conf.names.action, args).then(function(r) {
322
502
  if (!r || !r.ok) return;
323
- var map = {};
324
- (r.result && r.result.records || []).forEach(function(x) {
325
- map[String(x.id)] = x.name;
326
- });
327
- if (!Object.keys(map).length) return;
328
- setNames(function(prev) {
329
- return Object.assign({}, prev, map);
330
- });
503
+ mergeNames(r.result && r.result.records || []);
331
504
  }).catch(function() {
332
505
  });
333
506
  },
334
- [open, ids.join(",")]
507
+ [ids.join(",")]
335
508
  );
336
- React2.useEffect(
337
- function() {
338
- if (!open) return void 0;
339
- function onKey(e) {
340
- if (e.key === "Escape") setOpen(false);
341
- }
342
- document.addEventListener("keydown", onKey);
343
- return function() {
344
- document.removeEventListener("keydown", onKey);
345
- };
346
- },
347
- [open]
348
- );
349
- function toggle(id) {
350
- var key = String(id);
351
- var next = ids.slice();
352
- var i = next.indexOf(key);
353
- if (i >= 0) next.splice(i, 1);
354
- else next.push(key);
355
- onChange(next);
509
+ function fetchPage(q, pageNumber) {
510
+ return api.call(conf.action, { text: q || "", pageNumber, pageSize }).then(function(r) {
511
+ if (!r || !r.ok) return { rows: [], total: 0, page: pageNumber, hasMore: false };
512
+ var next = mapPage(r.result || {}, pageNumber);
513
+ mergeNames(next.rows);
514
+ return { rows: items(next.rows), total: next.total, page: next.page, hasMore: next.hasMore };
515
+ });
516
+ }
517
+ function nameOf(id) {
518
+ return names[String(id)] || String(id).slice(0, 6);
356
519
  }
357
520
  if (!enabled(props)) return null;
358
- var caretNode = typeof caret === "function" ? caret(props, t) : caret;
359
- var selectedNode = renderSelected ? renderSelected({ ids, names, toggle, text: t, classes, h: h2 }) : null;
360
- return h2(
361
- "div",
362
- { className: classes.root },
363
- h2(
364
- "button",
365
- {
366
- type: "button",
367
- className: classes.btn + (ids.length ? " " + (classes.btnOn || "on") : ""),
368
- "aria-expanded": open ? "true" : "false",
369
- onClick: function(e) {
370
- if (conf.stopPropagation) e.stopPropagation();
371
- setOpen(!open);
372
- }
373
- },
374
- icon(props, "tag", 13),
375
- t.label + (ids.length ? " \xB7 " + ids.length : ""),
376
- caretNode
377
- ),
378
- open ? h2(
379
- "div",
380
- {
381
- className: classes.menu,
382
- role: conf.menuRole,
383
- style: conf.menuStyle,
384
- onClick: conf.stopPropagation ? function(e) {
385
- e.stopPropagation();
386
- } : void 0
387
- },
388
- h2(FilterChecklist, {
389
- beforeHead: selectedNode,
390
- items: items(rows),
391
- selected: ids,
392
- onToggle: toggle,
393
- query,
394
- onQuery: setQuery,
395
- title: t.all,
396
- total,
397
- selectedText: t.selected,
398
- clearText: t.clear,
399
- onClear: function() {
400
- onChange([]);
401
- setQuery("");
402
- },
403
- searchPlaceholder: t.searchPlaceholder,
404
- loading,
405
- hasMore,
406
- onLoadMore: function() {
407
- load(query, (page || 1) + 1, true);
408
- },
409
- emptyText: t.empty,
410
- noMatchText: t.noMatch,
411
- loadingText: t.loading,
412
- noMoreText: t.noMore
413
- })
414
- ) : null
415
- );
521
+ return h2(SearchPicker, {
522
+ h: h2,
523
+ React: React2,
524
+ mode: "multi",
525
+ label: tx.label,
526
+ title: tx.all,
527
+ fetchPage,
528
+ pageSize,
529
+ debounce,
530
+ dedupe,
531
+ classes,
532
+ menuRole: conf.menuRole,
533
+ menuStyle: conf.menuStyle,
534
+ stopPropagation: conf.stopPropagation,
535
+ reloadKey: props.reloadKey,
536
+ texts: {
537
+ all: tx.all,
538
+ selected: tx.selected,
539
+ clear: tx.clear,
540
+ searchPlaceholder: tx.searchPlaceholder,
541
+ empty: tx.empty,
542
+ noMatch: tx.noMatch,
543
+ loading: tx.loading,
544
+ noMore: tx.noMore
545
+ },
546
+ icon: icon(props, "tag", 13),
547
+ caret: typeof caret === "function" ? caret(props) : caret,
548
+ selected: ids,
549
+ onChange,
550
+ nameOf,
551
+ renderSelected: renderSelected ? function(ctx) {
552
+ return renderSelected({
553
+ ids: ctx.ids,
554
+ names,
555
+ toggle: ctx.toggle,
556
+ text: tx,
557
+ classes,
558
+ h: h2
559
+ });
560
+ } : null
561
+ });
416
562
  };
417
563
  };
418
564
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "dsh-workbench-sites",
3
- "version": "1.12.11",
3
+ "version": "1.12.12",
4
4
  "type": "module",
5
5
  "description": "个人工作台站点插件:目录树、链接与标签",
6
6
  "main": "lib/index.js",
@@ -9,7 +9,7 @@
9
9
  "id": "wb-addon-sites",
10
10
  "title": "站点",
11
11
  "description": "站点 + 统计/记录/配置/数据四个视图:目录树、链接与标签,附表数据浏览",
12
- "version": "1.12.11",
12
+ "version": "1.12.12",
13
13
  "minShell": "0.8.0",
14
14
  "tables": [
15
15
  "site",