@orangelogic/design-system 2.163.0 → 2.164.0
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/library/chunks/{asset-link-format.BdB6fQA_.js → asset-link-format.0q_MQOYh.js} +689 -633
- package/library/chunks/asset-link-format.ClaYu_v8.js +7 -0
- package/library/chunks/{color-swatch-group.w5DMzNco.js → color-swatch-group.ChP9amU9.js} +375 -296
- package/library/chunks/{document-viewer.gyH0NGM5.js → document-viewer.Cng07M-1.js} +1 -1
- package/library/chunks/{folder-select.Dh4SX0eU.js → folder-select.Dw1ZKZAq.js} +156 -136
- package/library/chunks/position-picker.DjnhxIKF.js +4 -0
- package/library/chunks/{toast.C5Ir5yKA.js → toast.CXEAfCvN.js} +1 -1
- package/library/chunks/transformation.8uLv6uwG.js +264 -0
- package/library/chunks/{tree.Dvnw_4vz.js → tree.vn5sHbdt.js} +120 -114
- package/library/components/asset-link-format.js +5 -4
- package/library/components/atoms.js +2 -2
- package/library/components/color-swatch-group.js +3 -3
- package/library/components/cropper.js +1 -1
- package/library/components/document-viewer.js +1 -1
- package/library/components/file-on-demand.js +1 -1
- package/library/components/folder-select.js +2 -2
- package/library/components/masonry.js +74 -71
- package/library/components/molecules.js +1 -1
- package/library/components/organisms.js +2 -2
- package/library/components/position-picker.js +25 -25
- package/library/components/tree-item.js +1 -1
- package/library/components/tree.js +1 -1
- package/library/components/types.js +10511 -10509
- package/library/package.json +1 -1
- package/library/packages/atoms/src/components/tree/tree.d.ts +7 -1
- package/library/packages/atoms/src/components/tree-item/tree-item.d.ts +11 -1
- package/library/packages/events/src/cx-folder-select-loading-change.d.ts +8 -0
- package/library/packages/events/src/events.d.ts +1 -0
- package/library/packages/hybrid/table-core/src/table/styles/table-frozen.styles.d.ts +8 -0
- package/library/packages/hybrid/table-core/src/table/table.d.ts +9 -1
- package/library/packages/hybrid/table-core/src/tabulator-tables/modules/FrozenColumns/FrozenColumns.d.ts +14 -1
- package/library/packages/hybrid/table-core/src/tabulator-tables/modules/ResizeColumns/ResizeColumns.d.ts +18 -1
- package/library/packages/molecules/src/folder-select/components/folder-select-tree/folder-select-tree.d.ts +7 -0
- package/library/packages/molecules/src/folder-select/folder-select.d.ts +7 -0
- package/library/packages/molecules/src/masonry/masonry.d.ts +5 -0
- package/library/packages/organisms/src/asset-link-format/asset-link-format.d.ts +9 -0
- package/library/packages/organisms/src/asset-link-format/components/asset-link-format-crop/asset-link-format-crop.d.ts +30 -0
- package/library/packages/types/src/asset-link-format.d.ts +19 -0
- package/library/packages/types/src/tree-item.d.ts +12 -0
- package/library/react-web-component.d.ts +15 -3
- package/library/utils.js +63 -64
- package/package.json +1 -1
- package/library/chunks/asset-link-format.QzzboHHE.js +0 -6
- package/library/chunks/content-builder.BX4pHujE.js +0 -60
- package/library/chunks/transformation.D1alV_s4.js +0 -189
|
@@ -3,16 +3,16 @@ import { C as fe } from "./input.DOorVTYZ.js";
|
|
|
3
3
|
import te from "../components/line-clamp.js";
|
|
4
4
|
import me from "../components/select.js";
|
|
5
5
|
import ye from "../components/tag.js";
|
|
6
|
-
import { C as
|
|
6
|
+
import { C as S, a as ge } from "./tree.vn5sHbdt.js";
|
|
7
7
|
import { n as s, C as B } from "./lib-cortex-element.CVMmyPMC.js";
|
|
8
|
-
import { h as
|
|
9
|
-
import { M as
|
|
8
|
+
import { h as M, F as xe, A as be } from "./endpoints.CwgTrs4A.js";
|
|
9
|
+
import { M as U } from "./asset-link-format.ClaYu_v8.js";
|
|
10
10
|
import { c as re } from "./component.styles.CRO4Odto.js";
|
|
11
11
|
import { c as N } from "./custom-element.L4WJXn1j.js";
|
|
12
12
|
import { L as W } from "./i18n.Bchq8v1d.js";
|
|
13
13
|
import { w as m } from "./watch.DJF5K-8U.js";
|
|
14
14
|
import { x as y, i as $e } from "./lit-element.jLBm65_O.js";
|
|
15
|
-
import { r as
|
|
15
|
+
import { r as g } from "./state.CSDxrqLd.js";
|
|
16
16
|
import { e as se } from "./query.BBf1UFkC.js";
|
|
17
17
|
import { r as ve } from "./choose.BTbF6BAn.js";
|
|
18
18
|
import { C as ie } from "./button.DGyqdBou.js";
|
|
@@ -36,14 +36,14 @@ async function q({
|
|
|
36
36
|
includeDirectChild: u,
|
|
37
37
|
limit: f = De,
|
|
38
38
|
searchTerm: $,
|
|
39
|
-
self:
|
|
39
|
+
self: C,
|
|
40
40
|
start: H = 0,
|
|
41
41
|
token: de
|
|
42
42
|
}) {
|
|
43
|
-
let
|
|
44
|
-
e && e.length > 0 && !i ? (
|
|
43
|
+
let P = [], Q = u ?? !0;
|
|
44
|
+
e && e.length > 0 && !i ? (P = e, C = !0, Q = !1) : i && (P = [i]);
|
|
45
45
|
try {
|
|
46
|
-
return (await
|
|
46
|
+
return (await M.request({
|
|
47
47
|
baseURL: t,
|
|
48
48
|
headers: {
|
|
49
49
|
Authorization: `Bearer ${r}`
|
|
@@ -53,9 +53,9 @@ async function q({
|
|
|
53
53
|
IncludeDirectChild: Q,
|
|
54
54
|
IncludeVirtualFolders: !l,
|
|
55
55
|
Limit: f,
|
|
56
|
-
ObjectRecordIDs:
|
|
56
|
+
ObjectRecordIDs: P,
|
|
57
57
|
SeeThru: !!$,
|
|
58
|
-
Self:
|
|
58
|
+
Self: C,
|
|
59
59
|
Start: H,
|
|
60
60
|
Text: $ || void 0,
|
|
61
61
|
Token: de || void 0
|
|
@@ -65,42 +65,42 @@ async function q({
|
|
|
65
65
|
},
|
|
66
66
|
responseType: "json",
|
|
67
67
|
transformResponse: [
|
|
68
|
-
...Array.isArray(
|
|
69
|
-
(
|
|
68
|
+
...Array.isArray(M.defaults.transformResponse) ? M.defaults.transformResponse : [],
|
|
69
|
+
(F, Re, E) => {
|
|
70
70
|
if (E !== void 0 && (E < 200 || E >= 300))
|
|
71
71
|
return {
|
|
72
72
|
data: [],
|
|
73
73
|
hasMore: !1,
|
|
74
74
|
totalCount: 0
|
|
75
75
|
};
|
|
76
|
-
if (!
|
|
76
|
+
if (!F || typeof F != "object")
|
|
77
77
|
throw new Error("Invalid response format");
|
|
78
|
-
const ue =
|
|
78
|
+
const ue = F.contentItems?.length ?? 0;
|
|
79
79
|
return {
|
|
80
|
-
data:
|
|
81
|
-
const O =
|
|
82
|
-
let j =
|
|
83
|
-
(O ===
|
|
84
|
-
const Z =
|
|
80
|
+
data: F.contentItems?.map((x) => {
|
|
81
|
+
const O = x.fields[b.DocType] ?? "", R = x.fields[b.TitleWithFallback] ?? "", w = x.fields[b.CortexPath] ?? "", L = w.endsWith("/") && w.length > 1 ? w.slice(0, -1) : w;
|
|
82
|
+
let j = L;
|
|
83
|
+
(O === U.Album || O === U.ProjectDocument) && (j = L ? `${L}/${R}` : R);
|
|
84
|
+
const Z = x.fields[b.DocSubTypeIsFontIcon];
|
|
85
85
|
return {
|
|
86
86
|
docType: O,
|
|
87
87
|
fullPath: j,
|
|
88
|
-
hasChildren:
|
|
89
|
-
iconColor:
|
|
90
|
-
iconImageUrl:
|
|
91
|
-
iconName:
|
|
92
|
-
id:
|
|
88
|
+
hasChildren: x.fields[b.HasBrowserChildren] === "1",
|
|
89
|
+
iconColor: x.fields[b.DocSubTypeIconColor],
|
|
90
|
+
iconImageUrl: x.fields[b.DocSubTypeIconImageUrl],
|
|
91
|
+
iconName: x.fields[b.DocSubTypeIconName],
|
|
92
|
+
id: x.recordID,
|
|
93
93
|
isFontIcon: Z === void 0 ? void 0 : Z === "1",
|
|
94
|
-
representativeAssetId:
|
|
94
|
+
representativeAssetId: x.fields[b.RepresentativeAssetId] ?? "",
|
|
95
95
|
title: R
|
|
96
96
|
};
|
|
97
97
|
}) ?? [],
|
|
98
|
-
hasMore: H + ue <
|
|
99
|
-
totalCount:
|
|
98
|
+
hasMore: H + ue < F.totalCount,
|
|
99
|
+
totalCount: F.totalCount
|
|
100
100
|
};
|
|
101
101
|
}
|
|
102
102
|
],
|
|
103
|
-
url:
|
|
103
|
+
url: xe
|
|
104
104
|
})).data;
|
|
105
105
|
} catch {
|
|
106
106
|
return {
|
|
@@ -114,14 +114,14 @@ const ae = {
|
|
|
114
114
|
fromAttribute: (e) => (e ?? "").split(" ").filter((t) => t !== ""),
|
|
115
115
|
toAttribute: (e) => e.join(" ")
|
|
116
116
|
};
|
|
117
|
-
var
|
|
117
|
+
var D = /* @__PURE__ */ ((e) => (e.Input = "input", e.Select = "select", e))(D || {}), _e = Object.defineProperty, we = Object.getOwnPropertyDescriptor, h = (e, t, r, l) => {
|
|
118
118
|
for (var i = l > 1 ? void 0 : l ? we(t, r) : t, u = e.length - 1, f; u >= 0; u--)
|
|
119
119
|
(f = e[u]) && (i = (l ? f(t, r, i) : f(i)) || i);
|
|
120
120
|
return l && i && _e(t, r, i), i;
|
|
121
121
|
};
|
|
122
122
|
let a = class extends B {
|
|
123
123
|
constructor() {
|
|
124
|
-
super(...arguments), this.localize = new W(this), this.role = "treeitem", this.disabledSyncCheckboxes = !0, this.folderId = "", this.hasChildren = !1, this.selectable = !1, this.fullPath = "", this.docType =
|
|
124
|
+
super(...arguments), this.localize = new W(this), this.role = "treeitem", this.disabledSyncCheckboxes = !0, this.folderId = "", this.hasChildren = !1, this.selectable = !1, this.fullPath = "", this.docType = U.Story, this.name = "", this.representativeAssetId = "", this.selectedValue = "", this.selection = "single", this.currentRootIDsSet = /* @__PURE__ */ new Set(), this.removedIDs = [], this.token = "", this.bearerToken = "", this.baseUrl = "", this.searchTerm = "", this.api = q, this.excludeVirtualFolders = !1, this.url = "", this.icon = "", this.iconName = "", this.iconImageUrl = "", this.iconColor = "", this.isFontIcon = !1, this.data = null, this.hasMore = !1, this.loading = !1;
|
|
125
125
|
}
|
|
126
126
|
/**
|
|
127
127
|
* This is used to render the cx-tree-item inside the cx-folder-item without the shadow root so that the cx-tree can query select the cx-tree-item inside
|
|
@@ -199,8 +199,8 @@ let a = class extends B {
|
|
|
199
199
|
const $ = Fe(f);
|
|
200
200
|
if (!$.path.trim() || !$.id.trim())
|
|
201
201
|
continue;
|
|
202
|
-
const
|
|
203
|
-
if (
|
|
202
|
+
const C = J($.path);
|
|
203
|
+
if (C.startsWith(r) && C !== r) {
|
|
204
204
|
i = !0;
|
|
205
205
|
break;
|
|
206
206
|
}
|
|
@@ -226,7 +226,7 @@ let a = class extends B {
|
|
|
226
226
|
return y`<cx-icon class="folder-select-tree__item__icon" src=${this.iconImageUrl} style=${e}></cx-icon>`;
|
|
227
227
|
if (!this.icon && this.isFontIcon !== !1 && this.iconName)
|
|
228
228
|
return y`<cx-icon class="folder-select-tree__item__icon" name=${this.iconName} variant="fa" style=${e}></cx-icon>`;
|
|
229
|
-
const t = this.docType ===
|
|
229
|
+
const t = this.docType === U.Album ? "outlined" : "filled";
|
|
230
230
|
return y`<cx-icon class="folder-select-tree__item__icon" name=${this.icon || "folder"} variant=${t}></cx-icon>`;
|
|
231
231
|
}
|
|
232
232
|
render() {
|
|
@@ -251,104 +251,104 @@ a.dependencies = {
|
|
|
251
251
|
"cx-icon": ee,
|
|
252
252
|
"cx-line-clamp": te,
|
|
253
253
|
"cx-space": Ie,
|
|
254
|
-
"cx-tree-item":
|
|
254
|
+
"cx-tree-item": S
|
|
255
255
|
};
|
|
256
|
-
|
|
256
|
+
h([
|
|
257
257
|
se("cx-tree-item")
|
|
258
258
|
], a.prototype, "treeItem", 2);
|
|
259
|
-
|
|
259
|
+
h([
|
|
260
260
|
s({ attribute: "folder-id", reflect: !0, type: String })
|
|
261
261
|
], a.prototype, "folderId", 2);
|
|
262
|
-
|
|
262
|
+
h([
|
|
263
263
|
s({ attribute: "has-children", reflect: !0, type: Boolean })
|
|
264
264
|
], a.prototype, "hasChildren", 2);
|
|
265
|
-
|
|
265
|
+
h([
|
|
266
266
|
s({ reflect: !0, type: Boolean })
|
|
267
267
|
], a.prototype, "selectable", 2);
|
|
268
|
-
|
|
268
|
+
h([
|
|
269
269
|
s({ attribute: "full-path", reflect: !0, type: String })
|
|
270
270
|
], a.prototype, "fullPath", 2);
|
|
271
|
-
|
|
271
|
+
h([
|
|
272
272
|
s({ attribute: "doc-type", reflect: !0, type: String })
|
|
273
273
|
], a.prototype, "docType", 2);
|
|
274
|
-
|
|
274
|
+
h([
|
|
275
275
|
s({ reflect: !0, type: String })
|
|
276
276
|
], a.prototype, "name", 2);
|
|
277
|
-
|
|
277
|
+
h([
|
|
278
278
|
s({
|
|
279
279
|
attribute: "representative-asset-id",
|
|
280
280
|
reflect: !0,
|
|
281
281
|
type: String
|
|
282
282
|
})
|
|
283
283
|
], a.prototype, "representativeAssetId", 2);
|
|
284
|
-
|
|
284
|
+
h([
|
|
285
285
|
s({ attribute: "selected-value", reflect: !0, type: String })
|
|
286
286
|
], a.prototype, "selectedValue", 2);
|
|
287
|
-
|
|
287
|
+
h([
|
|
288
288
|
s({ attribute: "selection", reflect: !0, type: String })
|
|
289
289
|
], a.prototype, "selection", 2);
|
|
290
|
-
|
|
290
|
+
h([
|
|
291
291
|
s({ attribute: !1, type: Object })
|
|
292
292
|
], a.prototype, "currentRootIDsSet", 2);
|
|
293
|
-
|
|
293
|
+
h([
|
|
294
294
|
s({ attribute: !1, type: Array })
|
|
295
295
|
], a.prototype, "removedIDs", 2);
|
|
296
|
-
|
|
296
|
+
h([
|
|
297
297
|
s({ reflect: !0, type: String })
|
|
298
298
|
], a.prototype, "token", 2);
|
|
299
|
-
|
|
299
|
+
h([
|
|
300
300
|
s({ attribute: "bearer-token", reflect: !0, type: String })
|
|
301
301
|
], a.prototype, "bearerToken", 2);
|
|
302
|
-
|
|
302
|
+
h([
|
|
303
303
|
s({ attribute: "base-url", reflect: !0, type: String })
|
|
304
304
|
], a.prototype, "baseUrl", 2);
|
|
305
|
-
|
|
305
|
+
h([
|
|
306
306
|
s({ attribute: "search-term", reflect: !0, type: String })
|
|
307
307
|
], a.prototype, "searchTerm", 2);
|
|
308
|
-
|
|
308
|
+
h([
|
|
309
309
|
s({ type: Function })
|
|
310
310
|
], a.prototype, "api", 2);
|
|
311
|
-
|
|
311
|
+
h([
|
|
312
312
|
s({
|
|
313
313
|
attribute: "exclude-virtual-folders",
|
|
314
314
|
reflect: !0,
|
|
315
315
|
type: Boolean
|
|
316
316
|
})
|
|
317
317
|
], a.prototype, "excludeVirtualFolders", 2);
|
|
318
|
-
|
|
318
|
+
h([
|
|
319
319
|
s({ reflect: !0, type: String })
|
|
320
320
|
], a.prototype, "url", 2);
|
|
321
|
-
|
|
321
|
+
h([
|
|
322
322
|
s({ reflect: !0, type: String })
|
|
323
323
|
], a.prototype, "icon", 2);
|
|
324
|
-
|
|
324
|
+
h([
|
|
325
325
|
s({ attribute: "icon-name", reflect: !0, type: String })
|
|
326
326
|
], a.prototype, "iconName", 2);
|
|
327
|
-
|
|
327
|
+
h([
|
|
328
328
|
s({ attribute: "icon-image-url", reflect: !0, type: String })
|
|
329
329
|
], a.prototype, "iconImageUrl", 2);
|
|
330
|
-
|
|
330
|
+
h([
|
|
331
331
|
s({ attribute: "icon-color", reflect: !0, type: String })
|
|
332
332
|
], a.prototype, "iconColor", 2);
|
|
333
|
-
|
|
333
|
+
h([
|
|
334
334
|
s({ attribute: "is-font-icon", reflect: !0, type: Boolean })
|
|
335
335
|
], a.prototype, "isFontIcon", 2);
|
|
336
|
-
|
|
337
|
-
|
|
336
|
+
h([
|
|
337
|
+
g()
|
|
338
338
|
], a.prototype, "data", 2);
|
|
339
|
-
|
|
340
|
-
|
|
339
|
+
h([
|
|
340
|
+
g()
|
|
341
341
|
], a.prototype, "hasMore", 2);
|
|
342
|
-
|
|
343
|
-
|
|
342
|
+
h([
|
|
343
|
+
g()
|
|
344
344
|
], a.prototype, "loading", 2);
|
|
345
|
-
|
|
345
|
+
h([
|
|
346
346
|
m("currentRootIDsSet"),
|
|
347
347
|
m("removedIDs"),
|
|
348
348
|
m("fullPath"),
|
|
349
349
|
m("folderId")
|
|
350
350
|
], a.prototype, "syncBoxes", 1);
|
|
351
|
-
a =
|
|
351
|
+
a = h([
|
|
352
352
|
N("cx-folder-select-tree-item")
|
|
353
353
|
], a);
|
|
354
354
|
var ke = Object.defineProperty, Ve = Object.getOwnPropertyDescriptor, oe = (e) => {
|
|
@@ -357,10 +357,10 @@ var ke = Object.defineProperty, Ve = Object.getOwnPropertyDescriptor, oe = (e) =
|
|
|
357
357
|
for (var i = l > 1 ? void 0 : l ? Ve(t, r) : t, u = e.length - 1, f; u >= 0; u--)
|
|
358
358
|
(f = e[u]) && (i = (l ? f(t, r, i) : f(i)) || i);
|
|
359
359
|
return l && i && ke(t, r, i), i;
|
|
360
|
-
}, ne = (e, t, r) => t.has(e) || oe("Cannot " + r),
|
|
360
|
+
}, ne = (e, t, r) => t.has(e) || oe("Cannot " + r), v = (e, t, r) => (ne(e, t, "read from private field"), t.get(e)), z = (e, t, r) => t.has(e) ? oe("Cannot add the same private member more than once") : t instanceof WeakSet ? t.add(e) : t.set(e, r), K = (e, t, r, l) => (ne(e, t, "write to private field"), t.set(e, r), r), _, V, I;
|
|
361
361
|
let n = class extends B {
|
|
362
362
|
constructor() {
|
|
363
|
-
super(...arguments), this.localize = new W(this), this.minQueryLength = 1, this.selection = "single", this.searchTerm = "", this.selectedValue = "", this.token = "", this.bearerToken = "", this.baseUrl = "", this.allowedFolders = [], this.extraFolderId = "", this.extraFolderTitle = "", this.extraFolderIcon = "", this.seeThru = !1, this.extraFolderData = null, this.api = q, this.excludeVirtualFolders = !1, this.firstFetchCallback = null, this.autoPageSize = !1, this.data = [], this.hasMore = !1, this.loading = !1, this.preloadedFolders = [], this.currentRootIDsSet = /* @__PURE__ */ new Set(), this.removedIDs = [], z(this,
|
|
363
|
+
super(...arguments), this.localize = new W(this), this.minQueryLength = 1, this.selection = "single", this.searchTerm = "", this.selectedValue = "", this.token = "", this.bearerToken = "", this.baseUrl = "", this.allowedFolders = [], this.extraFolderId = "", this.extraFolderTitle = "", this.extraFolderIcon = "", this.seeThru = !1, this.extraFolderData = null, this.api = q, this.excludeVirtualFolders = !1, this.firstFetchCallback = null, this.autoPageSize = !1, this.data = [], this.hasMore = !1, this.loading = !1, this.preloading = !1, this.preloadedFolders = [], this.currentRootIDsSet = /* @__PURE__ */ new Set(), this.removedIDs = [], z(this, _, !1), z(this, V, 10), z(this, I, /* @__PURE__ */ new Set());
|
|
364
364
|
}
|
|
365
365
|
get empty() {
|
|
366
366
|
return !this.loading && this.data.length === 0;
|
|
@@ -385,6 +385,13 @@ let n = class extends B {
|
|
|
385
385
|
runFirstUpdated() {
|
|
386
386
|
this.searchTerm = "", this.autoPageSize && K(this, V, this.computeInitialLimit()), this.handleFetchFolders();
|
|
387
387
|
}
|
|
388
|
+
handleLoadingStateChange() {
|
|
389
|
+
this.emit("cx-folder-select-loading-change", {
|
|
390
|
+
detail: {
|
|
391
|
+
loading: this.loading || this.preloading
|
|
392
|
+
}
|
|
393
|
+
});
|
|
394
|
+
}
|
|
388
395
|
async handleExtraFolderIdChange() {
|
|
389
396
|
if (!this.extraFolderId || !this.api) {
|
|
390
397
|
this.extraFolderData = null;
|
|
@@ -448,10 +455,10 @@ let n = class extends B {
|
|
|
448
455
|
}
|
|
449
456
|
async handleFetchFolders() {
|
|
450
457
|
const { data: e, hasMore: t } = await this.fetchFolders();
|
|
451
|
-
|
|
458
|
+
v(this, _) || (e.length > 0 && this.firstFetchCallback?.(e), K(this, _, !0)), this.data = e, this.hasMore = t, this.loading = !1, this.seedSelectionFromValue(e), this.removePreloadedFolders(e), await this.preloadSelectedFolders();
|
|
452
459
|
}
|
|
453
460
|
async handleSelectedValueChange() {
|
|
454
|
-
if (!
|
|
461
|
+
if (!v(this, _))
|
|
455
462
|
return;
|
|
456
463
|
const e = new Set(
|
|
457
464
|
this.selectedValue.split(/[\s,]+/).filter(Boolean)
|
|
@@ -476,7 +483,7 @@ let n = class extends B {
|
|
|
476
483
|
bearerToken: this.bearerToken,
|
|
477
484
|
excludeVirtualFolders: this.excludeVirtualFolders,
|
|
478
485
|
folderId: "",
|
|
479
|
-
limit:
|
|
486
|
+
limit: v(this, V),
|
|
480
487
|
searchTerm: this.searchTerm,
|
|
481
488
|
seeThru: this.seeThru,
|
|
482
489
|
start: 0,
|
|
@@ -505,7 +512,7 @@ let n = class extends B {
|
|
|
505
512
|
...this.data.map((i) => i.id),
|
|
506
513
|
...this.extraFolderData ? [this.extraFolderData.id] : [],
|
|
507
514
|
...this.preloadedFolders.map((i) => i.id),
|
|
508
|
-
...
|
|
515
|
+
...v(this, I),
|
|
509
516
|
...[
|
|
510
517
|
...this.querySelectorAll(
|
|
511
518
|
"cx-folder-select-tree-item"
|
|
@@ -516,7 +523,7 @@ let n = class extends B {
|
|
|
516
523
|
);
|
|
517
524
|
if (r.length === 0)
|
|
518
525
|
return;
|
|
519
|
-
r.forEach((i) =>
|
|
526
|
+
r.forEach((i) => v(this, I).add(i)), this.preloading = !0;
|
|
520
527
|
const l = [];
|
|
521
528
|
if (await Promise.all(
|
|
522
529
|
r.map(async (i) => {
|
|
@@ -538,7 +545,7 @@ let n = class extends B {
|
|
|
538
545
|
} catch {
|
|
539
546
|
}
|
|
540
547
|
})
|
|
541
|
-
), r.forEach((i) =>
|
|
548
|
+
), r.forEach((i) => v(this, I).delete(i)), this.preloading = v(this, I).size > 0, l.length > 0) {
|
|
542
549
|
const i = new Set(this.preloadedFolders.map((f) => f.id)), u = l.filter((f) => !i.has(f.id));
|
|
543
550
|
u.length > 0 && (this.preloadedFolders = [...this.preloadedFolders, ...u].sort(
|
|
544
551
|
(f, $) => f.title.localeCompare($.title)
|
|
@@ -588,13 +595,13 @@ let n = class extends B {
|
|
|
588
595
|
)}`;
|
|
589
596
|
}
|
|
590
597
|
};
|
|
591
|
-
D = /* @__PURE__ */ new WeakMap();
|
|
592
|
-
V = /* @__PURE__ */ new WeakMap();
|
|
593
598
|
_ = /* @__PURE__ */ new WeakMap();
|
|
599
|
+
V = /* @__PURE__ */ new WeakMap();
|
|
600
|
+
I = /* @__PURE__ */ new WeakMap();
|
|
594
601
|
n.dependencies = {
|
|
595
602
|
"cx-button": ie,
|
|
596
603
|
"cx-folder-select-tree-item": a,
|
|
597
|
-
"cx-tree":
|
|
604
|
+
"cx-tree": ge
|
|
598
605
|
};
|
|
599
606
|
d([
|
|
600
607
|
s({ attribute: "min-query-length", reflect: !0, type: Number })
|
|
@@ -633,7 +640,7 @@ d([
|
|
|
633
640
|
s({ attribute: "see-thru", reflect: !0, type: Boolean })
|
|
634
641
|
], n.prototype, "seeThru", 2);
|
|
635
642
|
d([
|
|
636
|
-
|
|
643
|
+
g()
|
|
637
644
|
], n.prototype, "extraFolderData", 2);
|
|
638
645
|
d([
|
|
639
646
|
s({ type: Function })
|
|
@@ -652,23 +659,30 @@ d([
|
|
|
652
659
|
s({ attribute: "auto-page-size", reflect: !0, type: Boolean })
|
|
653
660
|
], n.prototype, "autoPageSize", 2);
|
|
654
661
|
d([
|
|
655
|
-
|
|
662
|
+
g()
|
|
656
663
|
], n.prototype, "data", 2);
|
|
657
664
|
d([
|
|
658
|
-
|
|
665
|
+
g()
|
|
659
666
|
], n.prototype, "hasMore", 2);
|
|
660
667
|
d([
|
|
661
|
-
|
|
668
|
+
g()
|
|
662
669
|
], n.prototype, "loading", 2);
|
|
663
670
|
d([
|
|
664
|
-
|
|
671
|
+
g()
|
|
672
|
+
], n.prototype, "preloading", 2);
|
|
673
|
+
d([
|
|
674
|
+
g()
|
|
665
675
|
], n.prototype, "preloadedFolders", 2);
|
|
666
676
|
d([
|
|
667
|
-
|
|
677
|
+
g()
|
|
668
678
|
], n.prototype, "currentRootIDsSet", 2);
|
|
669
679
|
d([
|
|
670
|
-
|
|
680
|
+
g()
|
|
671
681
|
], n.prototype, "removedIDs", 2);
|
|
682
|
+
d([
|
|
683
|
+
m("loading", { waitUntilFirstUpdate: !0 }),
|
|
684
|
+
m("preloading")
|
|
685
|
+
], n.prototype, "handleLoadingStateChange", 1);
|
|
672
686
|
d([
|
|
673
687
|
m("extraFolderId")
|
|
674
688
|
], n.prototype, "handleExtraFolderIdChange", 1);
|
|
@@ -686,24 +700,24 @@ d([
|
|
|
686
700
|
n = d([
|
|
687
701
|
N("cx-folder-select-tree")
|
|
688
702
|
], n);
|
|
689
|
-
const
|
|
690
|
-
var
|
|
703
|
+
const Ue = $e`:host{flex-direction:column;width:100%;height:100%;min-height:0;max-height:100%;display:flex}.folder-select{gap:var(--cx-spacing-x-small);flex-direction:column;flex:1;width:100%;min-height:0;display:flex}.folder-select__search{flex-shrink:0}.folder-select__tree{flex-direction:column;flex:1;min-height:0;display:flex}.folder-select-tree{flex:1;min-height:0;overflow:auto}.folder-select-tree__item__icon{color:var(--cx-color-primary)}.folder-select-tree__empty-message{font-size:var(--cx-font-size-small);color:var(--cx-color-neutral-500);padding-block:var(--cx-spacing-2x-small);padding-inline:var(--cx-spacing-small);text-align:center;cursor:default;user-select:none}.folder-select-tree__load-more{margin-inline:var(--cx-spacing-small)}.folder-select-tree-item::part(label),.folder-select-tree-item__label,.folder-select-tree-item__title{overflow:hidden}`;
|
|
704
|
+
var Pe = Object.defineProperty, Ee = Object.getOwnPropertyDescriptor, ce = (e) => {
|
|
691
705
|
throw TypeError(e);
|
|
692
|
-
},
|
|
706
|
+
}, c = (e, t, r, l) => {
|
|
693
707
|
for (var i = l > 1 ? void 0 : l ? Ee(t, r) : t, u = e.length - 1, f; u >= 0; u--)
|
|
694
708
|
(f = e[u]) && (i = (l ? f(t, r, i) : f(i)) || i);
|
|
695
|
-
return l && i &&
|
|
696
|
-
}, he = (e, t, r) => t.has(e) || ce("Cannot " + r), X = (e, t, r) => (he(e, t, "read from private field"), r ? r.call(e) : t.get(e)), Oe = (e, t, r) => t.has(e) ? ce("Cannot add the same private member more than once") : t instanceof WeakSet ? t.add(e) : t.set(e, r), Y = (e, t, r, l) => (he(e, t, "write to private field"), t.set(e, r), r),
|
|
709
|
+
return l && i && Pe(t, r, i), i;
|
|
710
|
+
}, he = (e, t, r) => t.has(e) || ce("Cannot " + r), X = (e, t, r) => (he(e, t, "read from private field"), r ? r.call(e) : t.get(e)), Oe = (e, t, r) => t.has(e) ? ce("Cannot add the same private member more than once") : t instanceof WeakSet ? t.add(e) : t.set(e, r), Y = (e, t, r, l) => (he(e, t, "write to private field"), t.set(e, r), r), T;
|
|
697
711
|
let o = class extends B {
|
|
698
712
|
constructor() {
|
|
699
|
-
super(), this.localize = new W(this), this.minQueryLength = 1, this.selection = "single", this.variant =
|
|
713
|
+
super(), this.localize = new W(this), this.minQueryLength = 1, this.selection = "single", this.variant = D.Input, this.value = "", this.name = "", this.selectedLabel = "", this.baseUrl = "", this.allowedFolders = [], this.open = !1, this.token = "", this.bearerToken = "", this.seeThru = !1, this.api = q, this.required = !1, this.form = void 0, this.excludeVirtualFolders = !1, this.extraFolderId = "", this.extraFolderTitle = "", this.extraFolderIcon = "", this.autoPageSize = !1, this.firstFetchCallback = null, this.searchTerm = "", this.treeLoading = !1, Oe(this, T), this.selectGetOptionValue = this.selectGetOptionValue.bind(this), this.selectGetOptionLabel = this.selectGetOptionLabel.bind(this), this.selectGetOptionSelected = this.selectGetOptionSelected.bind(this), this.selectFilterCallback = this.selectFilterCallback.bind(this), this.selectSetOptionSelected = this.selectSetOptionSelected.bind(this), this.selectGetTag = this.selectGetTag.bind(this), this.updateWrappedApi();
|
|
700
714
|
}
|
|
701
715
|
updateWrappedApi() {
|
|
702
716
|
if (!this.api) {
|
|
703
|
-
Y(this,
|
|
717
|
+
Y(this, T, void 0);
|
|
704
718
|
return;
|
|
705
719
|
}
|
|
706
|
-
Y(this,
|
|
720
|
+
Y(this, T, async (e) => {
|
|
707
721
|
try {
|
|
708
722
|
return await this.api(e);
|
|
709
723
|
} catch (t) {
|
|
@@ -724,6 +738,9 @@ let o = class extends B {
|
|
|
724
738
|
handleSearchTermSelectChange(e) {
|
|
725
739
|
e.target === e.currentTarget && (this.searchTerm = e.currentTarget.displayInput.value);
|
|
726
740
|
}
|
|
741
|
+
handleTreeLoadingChange(e) {
|
|
742
|
+
this.treeLoading = e.detail.loading;
|
|
743
|
+
}
|
|
727
744
|
handleSelectClear() {
|
|
728
745
|
if (this.searchTerm = "", this.selection !== "multiple")
|
|
729
746
|
return;
|
|
@@ -764,17 +781,17 @@ let o = class extends B {
|
|
|
764
781
|
), this.syncSelectValue(), this.selectEl.handleDefaultSlotChange(), await this.selectEl.updateComplete, this.selectEl.displayLabel = this.searchTerm);
|
|
765
782
|
}
|
|
766
783
|
selectGetOptionValue(e) {
|
|
767
|
-
return !e || !(e instanceof
|
|
784
|
+
return !e || !(e instanceof S) ? this.value : e.dataset.id || this.value;
|
|
768
785
|
}
|
|
769
786
|
selectGetOptionLabel(e) {
|
|
770
|
-
return !e || !(e instanceof
|
|
787
|
+
return !e || !(e instanceof S) ? this.selectedLabel : e.dataset.name || this.selectedLabel;
|
|
771
788
|
}
|
|
772
789
|
selectGetOptionSelected(e) {
|
|
773
|
-
if (!(!e || !(e instanceof
|
|
790
|
+
if (!(!e || !(e instanceof S)))
|
|
774
791
|
return e.selected;
|
|
775
792
|
}
|
|
776
793
|
selectFilterCallback(e) {
|
|
777
|
-
return !(!e || !(e instanceof
|
|
794
|
+
return !(!e || !(e instanceof S));
|
|
778
795
|
}
|
|
779
796
|
/**
|
|
780
797
|
* Custom tag renderer for cx-select multi mode. Identical visuals to the
|
|
@@ -791,11 +808,11 @@ let o = class extends B {
|
|
|
791
808
|
remove-button:tag__remove-button,
|
|
792
809
|
remove-button__base:tag__remove-button__base
|
|
793
810
|
" removable @cx-remove=${(r) => {
|
|
794
|
-
r.stopPropagation(), e instanceof
|
|
811
|
+
r.stopPropagation(), e instanceof S && (e.selected = !1);
|
|
795
812
|
}}><cx-line-clamp lines="1">${this.selectGetOptionLabel(e)}</cx-line-clamp></cx-tag>`;
|
|
796
813
|
}
|
|
797
814
|
selectSetOptionSelected(e, t) {
|
|
798
|
-
if (!(!e || !(e instanceof
|
|
815
|
+
if (!(!e || !(e instanceof S)) && this.selection !== "multiple") {
|
|
799
816
|
if (t === void 0) {
|
|
800
817
|
e.selected = !e.selected;
|
|
801
818
|
return;
|
|
@@ -816,7 +833,7 @@ let o = class extends B {
|
|
|
816
833
|
}
|
|
817
834
|
}
|
|
818
835
|
async handleVariantChange() {
|
|
819
|
-
this.variant ===
|
|
836
|
+
this.variant === D.Select && (await this.updateComplete, this.updateFunctionProps());
|
|
820
837
|
}
|
|
821
838
|
handleValueChange() {
|
|
822
839
|
this.selectEl && (this.searchTerm = "", this.selectEl.getOptionValue = this.selectGetOptionValue, this.selectEl.getOptionLabel = this.selectGetOptionLabel, this.selectEl.getOptionSelected = this.selectGetOptionSelected, this.selectEl.filterCallback = this.selectFilterCallback, this.selectEl.setOptionSelected = this.selectSetOptionSelected, this.selectEl.getTag = this.selectGetTag, this.syncSelectValue(), this.selectEl.handleDefaultSlotChange());
|
|
@@ -824,18 +841,18 @@ let o = class extends B {
|
|
|
824
841
|
render() {
|
|
825
842
|
return y`<div class="folder-select">${ve(this.variant, [
|
|
826
843
|
[
|
|
827
|
-
|
|
828
|
-
() => y`<cx-input class="folder-select__search" aria-label=${this.localize.term("searchFolders")} placeholder=${`${this.localize.term("searchFolders")}...`} value=${this.searchTerm} clearable @cx-input=${this.handleSearchTermInputChange}><cx-icon name="search" slot="prefix"></cx-icon></cx-input><cx-folder-select-tree class="folder-select__tree" base-url=${this.baseUrl} extra-folder-id=${this.extraFolderId} extra-folder-title=${this.extraFolderTitle} extra-folder-icon=${this.extraFolderIcon} min-query-length=${this.minQueryLength} search-term=${this.searchTerm} selected-value=${this.value} selection=${this.selection} token=${this.token} bearer-token=${this.bearerToken} ?exclude-virtual-folders=${this.excludeVirtualFolders} ?see-thru=${this.seeThru} ?auto-page-size=${this.autoPageSize} .allowedFolders=${this.allowedFolders} .api=${X(this,
|
|
844
|
+
D.Input,
|
|
845
|
+
() => y`<cx-input class="folder-select__search" aria-label=${this.localize.term("searchFolders")} placeholder=${`${this.localize.term("searchFolders")}...`} value=${this.searchTerm} clearable @cx-input=${this.handleSearchTermInputChange}><cx-icon name="search" slot="prefix"></cx-icon></cx-input><cx-folder-select-tree class="folder-select__tree" base-url=${this.baseUrl} extra-folder-id=${this.extraFolderId} extra-folder-title=${this.extraFolderTitle} extra-folder-icon=${this.extraFolderIcon} min-query-length=${this.minQueryLength} search-term=${this.searchTerm} selected-value=${this.value} selection=${this.selection} token=${this.token} bearer-token=${this.bearerToken} ?exclude-virtual-folders=${this.excludeVirtualFolders} ?see-thru=${this.seeThru} ?auto-page-size=${this.autoPageSize} .allowedFolders=${this.allowedFolders} .api=${X(this, T)} .firstFetchCallback=${this.firstFetchCallback}></cx-folder-select-tree>`
|
|
829
846
|
],
|
|
830
847
|
[
|
|
831
|
-
|
|
832
|
-
() => y`<cx-select clearable hoist lazy name=${this.name} value=${this.value} .form=${this.form} ?required=${this.required} ?multiple=${this.selection === "multiple"} @input=${this.handleSearchTermSelectChange} @cx-clear=${this.handleSelectClear} @cx-selected-change=${this.handleTreeSelectedChange} @cx-folder-select-selection-seeded=${this.handleTreeSelectedChange} allow-freetext><cx-folder-select-tree base-url=${this.baseUrl} extra-folder-id=${this.extraFolderId} extra-folder-title=${this.extraFolderTitle} extra-folder-icon=${this.extraFolderIcon} min-query-length=${this.minQueryLength} search-term=${this.searchTerm} selected-value=${this.value} selection=${this.selection} token=${this.token} bearer-token=${this.bearerToken} ?exclude-virtual-folders=${this.excludeVirtualFolders} ?see-thru=${this.seeThru} ?auto-page-size=${this.autoPageSize} .allowedFolders=${this.allowedFolders} .api=${X(this,
|
|
848
|
+
D.Select,
|
|
849
|
+
() => y`<cx-select clearable hoist lazy name=${this.name} value=${this.value} .form=${this.form} ?required=${this.required} ?multiple=${this.selection === "multiple"} ?loading=${this.treeLoading} @input=${this.handleSearchTermSelectChange} @cx-clear=${this.handleSelectClear} @cx-selected-change=${this.handleTreeSelectedChange} @cx-folder-select-selection-seeded=${this.handleTreeSelectedChange} @cx-folder-select-loading-change=${this.handleTreeLoadingChange} allow-freetext><cx-folder-select-tree base-url=${this.baseUrl} extra-folder-id=${this.extraFolderId} extra-folder-title=${this.extraFolderTitle} extra-folder-icon=${this.extraFolderIcon} min-query-length=${this.minQueryLength} search-term=${this.searchTerm} selected-value=${this.value} selection=${this.selection} token=${this.token} bearer-token=${this.bearerToken} ?exclude-virtual-folders=${this.excludeVirtualFolders} ?see-thru=${this.seeThru} ?auto-page-size=${this.autoPageSize} .allowedFolders=${this.allowedFolders} .api=${X(this, T)} .firstFetchCallback=${this.firstFetchCallback}></cx-folder-select-tree></cx-select>`
|
|
833
850
|
]
|
|
834
851
|
])}</div>`;
|
|
835
852
|
}
|
|
836
853
|
};
|
|
837
|
-
|
|
838
|
-
o.styles = [re,
|
|
854
|
+
T = /* @__PURE__ */ new WeakMap();
|
|
855
|
+
o.styles = [re, Ue];
|
|
839
856
|
o.dependencies = {
|
|
840
857
|
"cx-folder-select-tree": n,
|
|
841
858
|
"cx-icon": ee,
|
|
@@ -844,113 +861,116 @@ o.dependencies = {
|
|
|
844
861
|
"cx-select": me,
|
|
845
862
|
"cx-tag": ye
|
|
846
863
|
};
|
|
847
|
-
|
|
864
|
+
c([
|
|
848
865
|
se("cx-select")
|
|
849
866
|
], o.prototype, "selectEl", 2);
|
|
850
|
-
|
|
867
|
+
c([
|
|
851
868
|
s({ attribute: "min-query-length", reflect: !0, type: Number })
|
|
852
869
|
], o.prototype, "minQueryLength", 2);
|
|
853
|
-
|
|
870
|
+
c([
|
|
854
871
|
s({ attribute: "selection", reflect: !0, type: String })
|
|
855
872
|
], o.prototype, "selection", 2);
|
|
856
|
-
|
|
873
|
+
c([
|
|
857
874
|
s({ attribute: "variant", reflect: !0, type: String })
|
|
858
875
|
], o.prototype, "variant", 2);
|
|
859
|
-
|
|
876
|
+
c([
|
|
860
877
|
s({ reflect: !0, type: String })
|
|
861
878
|
], o.prototype, "value", 2);
|
|
862
|
-
|
|
879
|
+
c([
|
|
863
880
|
s({ reflect: !0, type: String })
|
|
864
881
|
], o.prototype, "name", 2);
|
|
865
|
-
|
|
882
|
+
c([
|
|
866
883
|
s({ attribute: "selected-label", reflect: !0, type: String })
|
|
867
884
|
], o.prototype, "selectedLabel", 2);
|
|
868
|
-
|
|
885
|
+
c([
|
|
869
886
|
s({ attribute: "base-url", reflect: !0, type: String })
|
|
870
887
|
], o.prototype, "baseUrl", 2);
|
|
871
|
-
|
|
888
|
+
c([
|
|
872
889
|
s({ attribute: "allowed-folders", converter: ae, type: Array })
|
|
873
890
|
], o.prototype, "allowedFolders", 2);
|
|
874
|
-
|
|
891
|
+
c([
|
|
875
892
|
s({ reflect: !0, type: Boolean })
|
|
876
893
|
], o.prototype, "open", 2);
|
|
877
|
-
|
|
894
|
+
c([
|
|
878
895
|
s({ reflect: !1, type: String })
|
|
879
896
|
], o.prototype, "token", 2);
|
|
880
|
-
|
|
897
|
+
c([
|
|
881
898
|
s({ attribute: "bearer-token", reflect: !0, type: String })
|
|
882
899
|
], o.prototype, "bearerToken", 2);
|
|
883
|
-
|
|
900
|
+
c([
|
|
884
901
|
s({ attribute: "see-thru", reflect: !0, type: Boolean })
|
|
885
902
|
], o.prototype, "seeThru", 2);
|
|
886
|
-
|
|
903
|
+
c([
|
|
887
904
|
s({ type: Function })
|
|
888
905
|
], o.prototype, "api", 2);
|
|
889
|
-
|
|
906
|
+
c([
|
|
890
907
|
s({ reflect: !0, type: Boolean })
|
|
891
908
|
], o.prototype, "required", 2);
|
|
892
|
-
|
|
909
|
+
c([
|
|
893
910
|
s({ reflect: !1 })
|
|
894
911
|
], o.prototype, "form", 2);
|
|
895
|
-
|
|
912
|
+
c([
|
|
896
913
|
s({
|
|
897
914
|
attribute: "exclude-virtual-folders",
|
|
898
915
|
reflect: !0,
|
|
899
916
|
type: Boolean
|
|
900
917
|
})
|
|
901
918
|
], o.prototype, "excludeVirtualFolders", 2);
|
|
902
|
-
|
|
919
|
+
c([
|
|
903
920
|
s({
|
|
904
921
|
attribute: "extra-folder-id",
|
|
905
922
|
reflect: !0,
|
|
906
923
|
type: String
|
|
907
924
|
})
|
|
908
925
|
], o.prototype, "extraFolderId", 2);
|
|
909
|
-
|
|
926
|
+
c([
|
|
910
927
|
s({
|
|
911
928
|
attribute: "extra-folder-title",
|
|
912
929
|
reflect: !0,
|
|
913
930
|
type: String
|
|
914
931
|
})
|
|
915
932
|
], o.prototype, "extraFolderTitle", 2);
|
|
916
|
-
|
|
933
|
+
c([
|
|
917
934
|
s({
|
|
918
935
|
attribute: "extra-folder-icon",
|
|
919
936
|
reflect: !0,
|
|
920
937
|
type: String
|
|
921
938
|
})
|
|
922
939
|
], o.prototype, "extraFolderIcon", 2);
|
|
923
|
-
|
|
940
|
+
c([
|
|
924
941
|
s({ attribute: "auto-page-size", reflect: !0, type: Boolean })
|
|
925
942
|
], o.prototype, "autoPageSize", 2);
|
|
926
|
-
|
|
943
|
+
c([
|
|
927
944
|
s({ attribute: "first-fetch-callback", reflect: !1, type: Function })
|
|
928
945
|
], o.prototype, "firstFetchCallback", 2);
|
|
929
|
-
|
|
930
|
-
|
|
946
|
+
c([
|
|
947
|
+
g()
|
|
931
948
|
], o.prototype, "searchTerm", 2);
|
|
932
|
-
|
|
949
|
+
c([
|
|
950
|
+
g()
|
|
951
|
+
], o.prototype, "treeLoading", 2);
|
|
952
|
+
c([
|
|
933
953
|
m("api")
|
|
934
954
|
], o.prototype, "updateWrappedApi", 1);
|
|
935
|
-
|
|
955
|
+
c([
|
|
936
956
|
m("searchTerm", { waitUntilFirstUpdate: !0 })
|
|
937
957
|
], o.prototype, "handleSearchTermChange", 1);
|
|
938
|
-
|
|
958
|
+
c([
|
|
939
959
|
m("open")
|
|
940
960
|
], o.prototype, "handleOpenChange", 1);
|
|
941
|
-
|
|
961
|
+
c([
|
|
942
962
|
m("variant")
|
|
943
963
|
], o.prototype, "handleVariantChange", 1);
|
|
944
|
-
|
|
964
|
+
c([
|
|
945
965
|
m("selectedLabel", { waitUntilFirstUpdate: !0 }),
|
|
946
966
|
m("value", { waitUntilFirstUpdate: !0 })
|
|
947
967
|
], o.prototype, "handleValueChange", 1);
|
|
948
|
-
o =
|
|
968
|
+
o = c([
|
|
949
969
|
N("cx-folder-select")
|
|
950
970
|
], o);
|
|
951
971
|
export {
|
|
952
972
|
o as C,
|
|
953
|
-
|
|
973
|
+
D as F,
|
|
954
974
|
q as a,
|
|
955
975
|
ae as s
|
|
956
976
|
};
|