@aplus-frontend/ui 7.12.6 → 7.13.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/es/src/ag-grid/components/loading/index.vue.d.ts +3 -0
- package/es/src/ag-grid/components/loading/index.vue.mjs +4 -0
- package/es/src/ag-grid/components/loading/index.vue2.mjs +18 -0
- package/es/src/ag-grid/context.mjs +1 -1
- package/es/src/ag-grid/editable/form-item.vue.mjs +33 -31
- package/es/src/ag-grid/editable/index.vue.mjs +1 -0
- package/es/src/ag-grid/hooks/use-pinned-row.mjs +2 -2
- package/es/src/ag-grid/index.vue.mjs +209 -202
- package/es/src/ag-grid/interface.d.ts +4 -0
- package/es/src/ag-grid/style/index.mjs +8 -5
- package/es/src/ap-drawer/interface.d.ts +13 -2
- package/es/src/ap-drawer/utils/createDrawer.mjs +37 -32
- package/es/src/ap-field/select/index.vue.d.ts +1 -2
- package/es/src/ap-field/select/index.vue.mjs +126 -88
- package/es/src/ap-field/style/index.mjs +8 -6
- package/es/src/ap-field/style/select.d.ts +2 -0
- package/es/src/ap-field/style/select.mjs +43 -0
- package/es/src/ap-form/context.mjs +1 -1
- package/es/src/ap-form/item-group/helper.mjs +2 -2
- package/es/src/ap-form/items/select/index.vue.d.ts +4 -8
- package/es/src/ap-form/provider/context.mjs +1 -1
- package/es/src/ap-grid/utils/table.mjs +2 -2
- package/es/src/ap-pro-card/components/card/index.vue2.mjs +2 -2
- package/es/src/ap-table/ap-table.vue2.mjs +15 -16
- package/es/src/ap-table/components/setting/context.d.ts +17 -0
- package/es/src/ap-table/components/setting/context.mjs +18 -0
- package/es/src/ap-table/components/setting/modal/index.vue.d.ts +1 -1
- package/es/src/ap-table/components/setting/modal/index.vue2.mjs +217 -88
- package/es/src/ap-table/components/setting/sorter/context.mjs +1 -1
- package/es/src/ap-table/components/setting/sorter/index.vue2.mjs +49 -51
- package/es/src/ap-table/components/setting/template/edit-form.vue.d.ts +844 -0
- package/es/src/ap-table/components/setting/template/edit-form.vue.mjs +4 -0
- package/es/src/ap-table/components/setting/template/edit-form.vue2.mjs +74 -0
- package/es/src/ap-table/components/setting/template/index.vue.d.ts +11 -0
- package/es/src/ap-table/components/setting/template/index.vue.mjs +4 -0
- package/es/src/ap-table/components/setting/template/index.vue2.mjs +51 -0
- package/es/src/ap-table/components/setting/template/item.vue.d.ts +13 -0
- package/es/src/ap-table/components/setting/template/item.vue.mjs +4 -0
- package/es/src/ap-table/components/setting/template/item.vue2.mjs +77 -0
- package/es/src/ap-table/components/setting/tree-select/index.vue.d.ts +1 -1
- package/es/src/ap-table/components/setting/tree-select/index.vue2.mjs +26 -29
- package/es/src/ap-table/components/setting/utils.d.ts +1 -0
- package/es/src/ap-table/components/setting/utils.mjs +22 -15
- package/es/src/ap-table/constants.d.ts +2 -4
- package/es/src/ap-table/context.mjs +1 -1
- package/es/src/ap-table/hooks/use-table-column-state.d.ts +4 -23
- package/es/src/ap-table/hooks/use-table-column-state.mjs +32 -120
- package/es/src/ap-table/hooks/use-table-template-storage.d.ts +49 -0
- package/es/src/ap-table/hooks/use-table-template-storage.mjs +150 -0
- package/es/src/ap-table/interface.d.ts +26 -3
- package/es/src/ap-table/style/index.d.ts +1 -0
- package/es/src/ap-table/style/index.mjs +2 -1
- package/es/src/ap-table/style/setting.d.ts +2 -0
- package/es/src/ap-table/style/setting.mjs +114 -19
- package/es/src/ap-table/utils.mjs +1 -1
- package/es/src/business/ag-grid-modal/hooks/use-ag-grid-instance.mjs +1 -1
- package/es/src/business/ag-grid-modal/style/index.mjs +7 -7
- package/es/src/business/ap-attachment/ApAttachment.mjs +96 -89
- package/es/src/business/ap-attachment/style/index.mjs +33 -16
- package/es/src/business/ap-batch-action-group/ApBatchActionGroup.vue2.mjs +24 -22
- package/es/src/business/ap-batch-action-group/MenuItemGroup.vue.d.ts +1 -1
- package/es/src/business/ap-batch-action-group/MenuItemGroup.vue2.mjs +35 -31
- package/es/src/business/ap-batch-action-group/index.d.ts +3 -3
- package/es/src/business/ap-batch-action-group/interface.d.ts +1 -1
- package/es/src/business/ap-download/hooks/index.mjs +1 -1
- package/es/src/business/ap-draggable-grid/ApDraggableGrid.vue2.mjs +1 -3
- package/es/src/business/ap-keep-alive/hook.mjs +1 -1
- package/es/src/business/ap-keep-alive/utils.mjs +1 -1
- package/es/src/business/ap-upload/components/MultipleFile.vue2.mjs +19 -19
- package/es/src/business/ap-upload/components/Picture.vue2.mjs +34 -34
- package/es/src/business/ap-value-select-card/style/index.mjs +3 -2
- package/es/src/business/ap-view/components/menu-list-content.vue2.mjs +21 -21
- package/es/src/business/ap-view/hooks/use-view-provide.mjs +1 -1
- package/es/src/business/ap-view/style/index.mjs +2 -2
- package/es/src/check-card/context.mjs +1 -1
- package/es/src/config-provider/constants.mjs +1 -1
- package/es/src/config-provider/hooks/use-locale.mjs +1 -1
- package/es/src/config-provider/hooks/use-namespace.mjs +1 -1
- package/es/src/config-provider/hooks/use-token.mjs +1 -1
- package/es/src/design-token/index.mjs +5 -5
- package/es/src/editable-table/utils.mjs +1 -1
- package/es/src/locale/lang/en.mjs +15 -4
- package/es/src/locale/lang/zh-cn.mjs +18 -7
- package/es/src/text/context.mjs +1 -1
- package/es/src/time-ago/useTimeAgo.mjs +26 -27
- package/es/src/utils/data-range-persets.d.ts +13 -1
- package/es/src/utils/data-range-persets.mjs +80 -60
- package/es/src/utils/index.d.ts +1 -0
- package/es/src/utils/index.mjs +56 -48
- package/es/src/utils/retry.d.ts +12 -0
- package/es/src/utils/retry.mjs +27 -0
- package/es/src/utils/slot.mjs +1 -1
- package/es/src/version.d.ts +1 -1
- package/es/src/version.mjs +1 -1
- package/lib/src/ag-grid/components/loading/index.vue.d.ts +3 -0
- package/lib/src/ag-grid/components/loading/index.vue.js +1 -0
- package/lib/src/ag-grid/components/loading/index.vue2.js +1 -0
- package/lib/src/ag-grid/editable/form-item.vue.js +1 -1
- package/lib/src/ag-grid/editable/index.vue.js +1 -1
- package/lib/src/ag-grid/hooks/use-pinned-row.js +1 -1
- package/lib/src/ag-grid/index.vue.js +1 -1
- package/lib/src/ag-grid/interface.d.ts +4 -0
- package/lib/src/ag-grid/style/index.js +1 -1
- package/lib/src/ap-drawer/interface.d.ts +13 -2
- package/lib/src/ap-drawer/utils/createDrawer.js +1 -1
- package/lib/src/ap-field/select/index.vue.d.ts +1 -2
- package/lib/src/ap-field/select/index.vue.js +1 -1
- package/lib/src/ap-field/style/index.js +1 -1
- package/lib/src/ap-field/style/select.d.ts +2 -0
- package/lib/src/ap-field/style/select.js +1 -0
- package/lib/src/ap-form/items/select/index.vue.d.ts +4 -8
- package/lib/src/ap-grid/utils/table.js +1 -1
- package/lib/src/ap-table/ap-table.vue2.js +1 -1
- package/lib/src/ap-table/components/setting/context.d.ts +17 -0
- package/lib/src/ap-table/components/setting/context.js +1 -0
- package/lib/src/ap-table/components/setting/modal/index.vue.d.ts +1 -1
- package/lib/src/ap-table/components/setting/modal/index.vue2.js +1 -1
- package/lib/src/ap-table/components/setting/sorter/index.vue2.js +1 -1
- package/lib/src/ap-table/components/setting/template/edit-form.vue.d.ts +844 -0
- package/lib/src/ap-table/components/setting/template/edit-form.vue.js +1 -0
- package/lib/src/ap-table/components/setting/template/edit-form.vue2.js +1 -0
- package/lib/src/ap-table/components/setting/template/index.vue.d.ts +11 -0
- package/lib/src/ap-table/components/setting/template/index.vue.js +1 -0
- package/lib/src/ap-table/components/setting/template/index.vue2.js +1 -0
- package/lib/src/ap-table/components/setting/template/item.vue.d.ts +13 -0
- package/lib/src/ap-table/components/setting/template/item.vue.js +1 -0
- package/lib/src/ap-table/components/setting/template/item.vue2.js +1 -0
- package/lib/src/ap-table/components/setting/tree-select/index.vue.d.ts +1 -1
- package/lib/src/ap-table/components/setting/tree-select/index.vue2.js +1 -1
- package/lib/src/ap-table/components/setting/utils.d.ts +1 -0
- package/lib/src/ap-table/components/setting/utils.js +1 -1
- package/lib/src/ap-table/constants.d.ts +2 -4
- package/lib/src/ap-table/hooks/use-table-column-state.d.ts +4 -23
- package/lib/src/ap-table/hooks/use-table-column-state.js +1 -1
- package/lib/src/ap-table/hooks/use-table-template-storage.d.ts +49 -0
- package/lib/src/ap-table/hooks/use-table-template-storage.js +1 -0
- package/lib/src/ap-table/interface.d.ts +26 -3
- package/lib/src/ap-table/style/index.d.ts +1 -0
- package/lib/src/ap-table/style/index.js +1 -1
- package/lib/src/ap-table/style/setting.d.ts +2 -0
- package/lib/src/ap-table/style/setting.js +1 -1
- package/lib/src/business/ag-grid-modal/style/index.js +1 -1
- package/lib/src/business/ap-attachment/ApAttachment.js +1 -1
- package/lib/src/business/ap-attachment/style/index.js +1 -1
- package/lib/src/business/ap-batch-action-group/ApBatchActionGroup.vue2.js +1 -1
- package/lib/src/business/ap-batch-action-group/MenuItemGroup.vue.d.ts +1 -1
- package/lib/src/business/ap-batch-action-group/MenuItemGroup.vue2.js +1 -1
- package/lib/src/business/ap-batch-action-group/index.d.ts +3 -3
- package/lib/src/business/ap-batch-action-group/interface.d.ts +1 -1
- package/lib/src/business/ap-draggable-grid/ApDraggableGrid.vue2.js +1 -1
- package/lib/src/business/ap-upload/components/MultipleFile.vue2.js +1 -1
- package/lib/src/business/ap-upload/components/Picture.vue2.js +1 -1
- package/lib/src/business/ap-value-select-card/style/index.js +1 -1
- package/lib/src/business/ap-view/components/menu-list-content.vue2.js +1 -1
- package/lib/src/business/ap-view/style/index.js +1 -1
- package/lib/src/design-token/index.js +1 -1
- package/lib/src/locale/lang/en.js +1 -1
- package/lib/src/locale/lang/zh-cn.js +1 -1
- package/lib/src/time-ago/useTimeAgo.js +1 -1
- package/lib/src/utils/data-range-persets.d.ts +13 -1
- package/lib/src/utils/data-range-persets.js +1 -1
- package/lib/src/utils/index.d.ts +1 -0
- package/lib/src/utils/index.js +1 -1
- package/lib/src/utils/retry.d.ts +12 -0
- package/lib/src/utils/retry.js +1 -0
- package/lib/src/version.d.ts +1 -1
- package/lib/src/version.js +1 -1
- package/package.json +2 -2
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { client as a } from "@aplus-frontend/oss";
|
|
2
|
-
const s = /* @__PURE__ */ new Map(), n = Symbol("ossInstance");
|
|
2
|
+
const s = /* @__PURE__ */ new Map(), n = /* @__PURE__ */ Symbol("ossInstance");
|
|
3
3
|
async function c(t, r) {
|
|
4
4
|
if (!t)
|
|
5
5
|
throw new Error("请传入getOssAccess");
|
|
@@ -225,9 +225,7 @@ const Ee = ["data-span", "data-index", "data-row", "data-col", "data-height", "d
|
|
|
225
225
|
},
|
|
226
226
|
getGridItems: () => JSON.parse(JSON.stringify(S.value)),
|
|
227
227
|
refreshGrid: () => {
|
|
228
|
-
(async () =>
|
|
229
|
-
await J();
|
|
230
|
-
})();
|
|
228
|
+
(async () => await J())();
|
|
231
229
|
}
|
|
232
230
|
}), (e, a) => (R(), ge(D(ye), { spinning: G.value }, {
|
|
233
231
|
default: me(() => [
|
|
@@ -4,7 +4,7 @@ const o = (r) => {
|
|
|
4
4
|
if (typeof e == "string") return;
|
|
5
5
|
const n = Array.isArray(e) ? e : null;
|
|
6
6
|
if (n)
|
|
7
|
-
return n.filter((t) => !["string", "number", "boolean"].includes(typeof t)).filter((t) => t && typeof t == "object" && "type" in t ? t.type != Symbol.for("v-cmt") : !1);
|
|
7
|
+
return n.filter((t) => !["string", "number", "boolean"].includes(typeof t)).filter((t) => t && typeof t == "object" && "type" in t ? t.type != /* @__PURE__ */ Symbol.for("v-cmt") : !1);
|
|
8
8
|
}, l = (r) => {
|
|
9
9
|
if (r) {
|
|
10
10
|
if (r.length > 1)
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { defineComponent as oe, inject as s, ref as te, watch as se, nextTick as ae, createElementBlock as
|
|
1
|
+
import { defineComponent as oe, inject as s, ref as te, watch as se, nextTick as ae, createElementBlock as U, openBlock as y, normalizeClass as ne, unref as a, createVNode as k, withCtx as N, createElementVNode as M, createTextVNode as re, toDisplayString as L, withModifiers as ie, createCommentVNode as le, createBlock as ce, resolveDynamicComponent as ue } from "vue";
|
|
2
2
|
import { UploadOutlined as pe } from "@ant-design/icons-vue";
|
|
3
3
|
import { message as p, Upload as de, Button as me } from "@aplus-frontend/antdv";
|
|
4
4
|
import { IconApAdLineDownload as fe } from "@aplus-frontend/icon";
|
|
@@ -10,33 +10,33 @@ import { fileMatchesAccept as ve, getAcceptText as xe } from "../utils/accept.mj
|
|
|
10
10
|
import { getPath as ye, getName as ke, getReturnData as z } from "../utils/returnData.mjs";
|
|
11
11
|
import { useGlobalConfig as be } from "../../../config-provider/hooks/use-global-config.mjs";
|
|
12
12
|
import { useLocale as Ce } from "../../../config-provider/hooks/use-locale.mjs";
|
|
13
|
-
import { useNamespace as
|
|
14
|
-
const
|
|
13
|
+
import { useNamespace as Ue } from "../../../config-provider/hooks/use-namespace.mjs";
|
|
14
|
+
const Ne = { class: "multiple-file-context" }, Ee = { key: 0 }, _e = { key: 1 }, qe = /* @__PURE__ */ oe({
|
|
15
15
|
__name: "MultipleFile",
|
|
16
16
|
setup(Fe, { expose: B }) {
|
|
17
17
|
const E = be(
|
|
18
18
|
"downloadCenterTriggerConfig"
|
|
19
|
-
), { t: i } = Ce(), { b: O } =
|
|
19
|
+
), { t: i } = Ce(), { b: O } = Ue("ap-upload-multiple-file"), V = he("ap-upload"), { put: q } = we(), j = s("dirName"), $ = s("baseDirName"), b = s("accept") || "*", _ = s("maxSize") ?? 500, G = s("title") || i("ap.apUpload.uploadFile"), f = s("subTitle"), l = s("maxCount") ?? 10, d = s("uploadingCount"), F = s("beforeUpload"), A = s("customRequest"), g = s("getOssAccess"), W = s("maxSizeErrorMsg"), H = s("maxCountErrorMsg"), J = s("acceptErrorMsg"), I = s("onRemove"), C = s("showUploadErrorMsg"), P = s("bucket"), K = s("showDownload") ?? !0, w = s("showPreview") ?? !0, r = s("value"), c = [], h = s("needName"), m = te(null);
|
|
20
20
|
se(
|
|
21
21
|
() => r?.value,
|
|
22
22
|
function(e) {
|
|
23
|
-
!m?.value?.fileList?.length && e &&
|
|
23
|
+
!m?.value?.fileList?.length && e && T(e);
|
|
24
24
|
},
|
|
25
25
|
{ immediate: !0 }
|
|
26
26
|
);
|
|
27
|
-
function
|
|
27
|
+
function T(e) {
|
|
28
28
|
if (!e) {
|
|
29
29
|
u = [], m.value.fileList = [], r.value = void 0, c.splice(0, c.length);
|
|
30
30
|
return;
|
|
31
31
|
}
|
|
32
32
|
ae(() => {
|
|
33
33
|
const o = e.map((t) => {
|
|
34
|
-
const n = ye(h, t),
|
|
34
|
+
const n = ye(h, t), D = ke(h, t), x = new File(
|
|
35
35
|
[t],
|
|
36
|
-
|
|
36
|
+
D,
|
|
37
37
|
{}
|
|
38
38
|
);
|
|
39
|
-
return x.response = n, x.uid =
|
|
39
|
+
return x.response = n, x.uid = crypto.randomUUID(), x.status = "done", x;
|
|
40
40
|
});
|
|
41
41
|
if (l && o.length > l) {
|
|
42
42
|
p.warning(
|
|
@@ -54,7 +54,7 @@ const Ue = { class: "multiple-file-context" }, Ee = { key: 0 }, _e = { key: 1 },
|
|
|
54
54
|
}), m.value.fileList = o, r.value = e;
|
|
55
55
|
});
|
|
56
56
|
}
|
|
57
|
-
B({ setValue:
|
|
57
|
+
B({ setValue: T });
|
|
58
58
|
let u = [], R;
|
|
59
59
|
function v(e) {
|
|
60
60
|
setTimeout(() => {
|
|
@@ -121,7 +121,7 @@ const Ue = { class: "multiple-file-context" }, Ee = { key: 0 }, _e = { key: 1 },
|
|
|
121
121
|
return;
|
|
122
122
|
}
|
|
123
123
|
try {
|
|
124
|
-
const o = await (
|
|
124
|
+
const o = await (P ? g(P) : g()), t = await S(async () => o);
|
|
125
125
|
e.file.oss = t, q({
|
|
126
126
|
file: e.file,
|
|
127
127
|
dirName: j,
|
|
@@ -159,7 +159,7 @@ const Ue = { class: "multiple-file-context" }, Ee = { key: 0 }, _e = { key: 1 },
|
|
|
159
159
|
}
|
|
160
160
|
}
|
|
161
161
|
function Y(e) {
|
|
162
|
-
if (
|
|
162
|
+
if (I && I?.(e), e.response) {
|
|
163
163
|
if (Array.isArray(r.value)) {
|
|
164
164
|
const t = c.findIndex((n) => n.uid === e.uid);
|
|
165
165
|
t >= 0 && (r?.value.splice(t, 1), c.splice(t, 1)), r.value.length === 0 && (r.value = void 0);
|
|
@@ -195,7 +195,7 @@ const Ue = { class: "multiple-file-context" }, Ee = { key: 0 }, _e = { key: 1 },
|
|
|
195
195
|
fileName: e.name
|
|
196
196
|
});
|
|
197
197
|
};
|
|
198
|
-
return (e, o) => (y(),
|
|
198
|
+
return (e, o) => (y(), U("div", {
|
|
199
199
|
class: ne({
|
|
200
200
|
[a(O)()]: !0,
|
|
201
201
|
[a(V) ?? ""]: !0
|
|
@@ -223,24 +223,24 @@ const Ue = { class: "multiple-file-context" }, Ee = { key: 0 }, _e = { key: 1 },
|
|
|
223
223
|
onRemove: Y,
|
|
224
224
|
onDownload: Z
|
|
225
225
|
}, {
|
|
226
|
-
downloadIcon:
|
|
226
|
+
downloadIcon: N(() => [
|
|
227
227
|
k(a(fe), { class: "anticon anticon-vertical-align-bottom" })
|
|
228
228
|
]),
|
|
229
|
-
default:
|
|
230
|
-
|
|
229
|
+
default: N(() => [
|
|
230
|
+
M("div", Ne, [
|
|
231
231
|
k(a(me), { class: "file-btn" }, {
|
|
232
|
-
default:
|
|
232
|
+
default: N(() => [
|
|
233
233
|
k(a(pe)),
|
|
234
234
|
re(" " + L(a(G)), 1)
|
|
235
235
|
]),
|
|
236
236
|
_: 1
|
|
237
237
|
}),
|
|
238
|
-
|
|
238
|
+
M("div", {
|
|
239
239
|
class: "sub-title",
|
|
240
240
|
onClick: o[0] || (o[0] = ie(() => {
|
|
241
241
|
}, ["stop"]))
|
|
242
242
|
}, [
|
|
243
|
-
typeof a(f) == "string" ? (y(),
|
|
243
|
+
typeof a(f) == "string" ? (y(), U("div", Ee, L(a(f) || `${a(i)("ap.apUpload.supportExtension")}:${a(xe)(a(b))}`), 1)) : a(f) ? (y(), U("div", _e, [
|
|
244
244
|
(y(), ce(ue(a(f))))
|
|
245
245
|
])) : le("", !0)
|
|
246
246
|
])
|
|
@@ -1,31 +1,31 @@
|
|
|
1
|
-
import { defineComponent as se, inject as i, ref as
|
|
1
|
+
import { defineComponent as se, inject as i, ref as V, watch as oe, nextTick as ne, createElementBlock as h, openBlock as v, normalizeClass as ie, unref as n, createElementVNode as m, renderSlot as ce, createCommentVNode as $, Fragment as re, renderList as ue, withDirectives as le, createVNode as b, vShow as pe, toDisplayString as E } from "vue";
|
|
2
2
|
import { CloseOutlined as de, PlusOutlined as me } from "@ant-design/icons-vue";
|
|
3
3
|
import { message as f, Progress as fe } from "@aplus-frontend/antdv";
|
|
4
4
|
import { omit as ge } from "lodash-unified";
|
|
5
5
|
import "../../../config-provider/index.mjs";
|
|
6
|
-
import { useOss as he, getOssInstance as
|
|
6
|
+
import { useOss as he, getOssInstance as L } from "../hooks/useOss.mjs";
|
|
7
7
|
import ve from "../style/index.mjs";
|
|
8
8
|
import { fileMatchesAccept as xe, getAcceptText as ye } from "../utils/accept.mjs";
|
|
9
|
-
import { getPath as we, getName as _e, getReturnData as
|
|
10
|
-
import { useLocale as
|
|
11
|
-
import { useNamespace as
|
|
12
|
-
const Ce = ["accept"], be = { class: "picture-context" }, Ee = { class: "picture-item-box" }, Ne = ["src"], Se = { class: "picture-item-shadow" }, Re = ["onClick"],
|
|
9
|
+
import { getPath as we, getName as _e, getReturnData as O } from "../utils/returnData.mjs";
|
|
10
|
+
import { useLocale as Ue } from "../../../config-provider/hooks/use-locale.mjs";
|
|
11
|
+
import { useNamespace as ke } from "../../../config-provider/hooks/use-namespace.mjs";
|
|
12
|
+
const Ce = ["accept"], be = { class: "picture-context" }, Ee = { class: "picture-item-box" }, Ne = ["src"], Se = { class: "picture-item-shadow" }, Re = ["onClick"], ze = {
|
|
13
13
|
key: 0,
|
|
14
14
|
class: "picture-item-uploading"
|
|
15
|
-
},
|
|
15
|
+
}, Ae = { class: "picture-title" }, Me = { key: 0 }, Pe = { key: 1 }, Je = /* @__PURE__ */ se({
|
|
16
16
|
__name: "Picture",
|
|
17
|
-
setup(
|
|
18
|
-
const { t: l } =
|
|
19
|
-
let o =
|
|
17
|
+
setup(Ie, { expose: T }) {
|
|
18
|
+
const { t: l } = Ue(), { b: B } = ke("ap-upload-picture"), q = ve("ap-upload"), { put: j } = he(), G = i("dirName"), H = i("baseDirName"), U = i("accept") || "image/*", k = i("maxSize") ?? 5, N = i("title"), p = i("maxCount") ?? 10, x = i("uploadingCount"), S = i("beforeUpload"), R = i("customRequest"), y = i("getOssAccess"), J = i("maxSizeErrorMsg"), K = i("maxCountErrorMsg"), Q = i("acceptErrorMsg"), w = V(null), r = i("value"), _ = i("needName"), z = i("onRemove"), C = i("showUploadErrorMsg"), A = i("bucket");
|
|
19
|
+
let o = V([]);
|
|
20
20
|
const g = [];
|
|
21
21
|
oe(
|
|
22
22
|
() => r?.value,
|
|
23
23
|
async function(t) {
|
|
24
|
-
!o?.value?.length && t &&
|
|
24
|
+
!o?.value?.length && t && M(t);
|
|
25
25
|
},
|
|
26
26
|
{ immediate: !0 }
|
|
27
27
|
);
|
|
28
|
-
function
|
|
28
|
+
function M(t) {
|
|
29
29
|
if (!t) {
|
|
30
30
|
r.value = void 0, g.splice(0, g.length), o.value = [];
|
|
31
31
|
return;
|
|
@@ -33,18 +33,18 @@ const Ce = ["accept"], be = { class: "picture-context" }, Ee = { class: "picture
|
|
|
33
33
|
ne(async () => {
|
|
34
34
|
const s = [];
|
|
35
35
|
for (let e of t) {
|
|
36
|
-
const a = we(_, e), c = _e(_, e), u = a?.match(/^([^:]+):(.*)$/), d = u?.[1], ee = u?.[2] ?? a,
|
|
36
|
+
const a = we(_, e), c = _e(_, e), u = a?.match(/^([^:]+):(.*)$/), d = u?.[1], ee = u?.[2] ?? a, D = await L(
|
|
37
37
|
() => d ? y?.(d) : y?.()
|
|
38
|
-
), te = await
|
|
38
|
+
), te = await D.getSignatureUrl(ee), ae = {
|
|
39
39
|
...typeof e == "string" ? {} : e,
|
|
40
40
|
...new File([e], c, {}),
|
|
41
|
-
uid:
|
|
41
|
+
uid: crypto.randomUUID(),
|
|
42
42
|
thumbUrl: te,
|
|
43
43
|
status: "success",
|
|
44
44
|
percent: 100,
|
|
45
45
|
path: a
|
|
46
46
|
};
|
|
47
|
-
s.push(ae),
|
|
47
|
+
s.push(ae), D.destroy();
|
|
48
48
|
}
|
|
49
49
|
if (p && s.length > p) {
|
|
50
50
|
f.warning(
|
|
@@ -62,7 +62,7 @@ const Ce = ["accept"], be = { class: "picture-context" }, Ee = { class: "picture
|
|
|
62
62
|
}), r.value = t;
|
|
63
63
|
});
|
|
64
64
|
}
|
|
65
|
-
|
|
65
|
+
T({ setValue: M });
|
|
66
66
|
function W() {
|
|
67
67
|
w.value?.click();
|
|
68
68
|
}
|
|
@@ -84,11 +84,11 @@ const Ce = ["accept"], be = { class: "picture-context" }, Ee = { class: "picture
|
|
|
84
84
|
K || l("ap.apUpload.maxUploadPicture", { maxCount: p })
|
|
85
85
|
);
|
|
86
86
|
}), !1;
|
|
87
|
-
if (t.size >
|
|
87
|
+
if (t.size > k * 1024 * 1024)
|
|
88
88
|
return f.warning(
|
|
89
|
-
J || l("ap.apUpload.maxUploadFileSize", { maxSize:
|
|
89
|
+
J || l("ap.apUpload.maxUploadFileSize", { maxSize: k })
|
|
90
90
|
), !1;
|
|
91
|
-
if (!/image\/\w+/.test(t.type) || !xe(t,
|
|
91
|
+
if (!/image\/\w+/.test(t.type) || !xe(t, U))
|
|
92
92
|
return f.warning(
|
|
93
93
|
Q || l("ap.apUpload.pictureFormatNotSupported")
|
|
94
94
|
), !1;
|
|
@@ -126,7 +126,7 @@ const Ce = ["accept"], be = { class: "picture-context" }, Ee = { class: "picture
|
|
|
126
126
|
const a = o.value.find((c) => c.uid === t.uid);
|
|
127
127
|
a && (a.status = "success", a.path = e), r.value = [
|
|
128
128
|
...r.value || [],
|
|
129
|
-
|
|
129
|
+
O(_, e, s.name)
|
|
130
130
|
], g.push({
|
|
131
131
|
uid: t.uid,
|
|
132
132
|
path: e
|
|
@@ -137,7 +137,7 @@ const Ce = ["accept"], be = { class: "picture-context" }, Ee = { class: "picture
|
|
|
137
137
|
return;
|
|
138
138
|
}
|
|
139
139
|
try {
|
|
140
|
-
const e = await (
|
|
140
|
+
const e = await (A ? y(A) : y()), a = await L(async () => e);
|
|
141
141
|
t.oss = a, o.value.push(t), j({
|
|
142
142
|
file: s,
|
|
143
143
|
dirName: G,
|
|
@@ -146,7 +146,7 @@ const Ce = ["accept"], be = { class: "picture-context" }, Ee = { class: "picture
|
|
|
146
146
|
const u = o.value.find((d) => d.uid === t.uid);
|
|
147
147
|
u && (u.status = "success", u.path = c), r.value = [
|
|
148
148
|
...r.value || [],
|
|
149
|
-
|
|
149
|
+
O(_, c, s.name)
|
|
150
150
|
], g.push({
|
|
151
151
|
uid: t.uid,
|
|
152
152
|
path: c
|
|
@@ -174,8 +174,8 @@ const Ce = ["accept"], be = { class: "picture-context" }, Ee = { class: "picture
|
|
|
174
174
|
a > -1 && o.value.splice(a, 1), x.value--;
|
|
175
175
|
}
|
|
176
176
|
}
|
|
177
|
-
function
|
|
178
|
-
if (
|
|
177
|
+
function I(t) {
|
|
178
|
+
if (z && z?.(t), t.path && r) {
|
|
179
179
|
if (Array.isArray(r.value)) {
|
|
180
180
|
const e = g.findIndex(
|
|
181
181
|
(a) => a.uid === t.uid
|
|
@@ -204,7 +204,7 @@ const Ce = ["accept"], be = { class: "picture-context" }, Ee = { class: "picture
|
|
|
204
204
|
ref: w,
|
|
205
205
|
style: { display: "none" },
|
|
206
206
|
type: "file",
|
|
207
|
-
accept: n(
|
|
207
|
+
accept: n(U),
|
|
208
208
|
onChange: X
|
|
209
209
|
}, null, 40, Ce),
|
|
210
210
|
m("div", be, [
|
|
@@ -215,7 +215,7 @@ const Ce = ["accept"], be = { class: "picture-context" }, Ee = { class: "picture
|
|
|
215
215
|
pauseUpload: e?.oss?.pauseUpload
|
|
216
216
|
}
|
|
217
217
|
})),
|
|
218
|
-
remove:
|
|
218
|
+
remove: I
|
|
219
219
|
}, () => [
|
|
220
220
|
(v(!0), h(re, null, ue(n(o), (e) => (v(), h("div", {
|
|
221
221
|
key: e.uid,
|
|
@@ -229,11 +229,11 @@ const Ce = ["accept"], be = { class: "picture-context" }, Ee = { class: "picture
|
|
|
229
229
|
le(m("div", Se, [
|
|
230
230
|
m("div", {
|
|
231
231
|
class: "picture-item-close",
|
|
232
|
-
onClick: (a) =>
|
|
232
|
+
onClick: (a) => I(e)
|
|
233
233
|
}, [
|
|
234
234
|
b(n(de))
|
|
235
235
|
], 8, Re),
|
|
236
|
-
e.status === "uploading" ? (v(), h("div",
|
|
236
|
+
e.status === "uploading" ? (v(), h("div", ze, [
|
|
237
237
|
b(n(fe), {
|
|
238
238
|
percent: e.percent,
|
|
239
239
|
"stroke-color": "#ffffff",
|
|
@@ -241,7 +241,7 @@ const Ce = ["accept"], be = { class: "picture-context" }, Ee = { class: "picture
|
|
|
241
241
|
size: 4,
|
|
242
242
|
"show-info": !1
|
|
243
243
|
}, null, 8, ["percent"])
|
|
244
|
-
])) :
|
|
244
|
+
])) : $("", !0)
|
|
245
245
|
], 512), [
|
|
246
246
|
[pe, e.status === "uploading"]
|
|
247
247
|
])
|
|
@@ -255,12 +255,12 @@ const Ce = ["accept"], be = { class: "picture-context" }, Ee = { class: "picture
|
|
|
255
255
|
}, [
|
|
256
256
|
b(n(me)),
|
|
257
257
|
m("div", null, E(n(l)("ap.apUpload.update")), 1)
|
|
258
|
-
])) :
|
|
258
|
+
])) : $("", !0)
|
|
259
259
|
]),
|
|
260
|
-
m("div",
|
|
261
|
-
n(N) ? (v(), h("div",
|
|
260
|
+
m("div", Ae, [
|
|
261
|
+
n(N) ? (v(), h("div", Me, E(n(N)), 1)) : (v(), h("div", Pe, E(`${n(l)("ap.apUpload.supportExtension")}:${n(ye)(n(U))},${n(l)(
|
|
262
262
|
"ap.apUpload.maxUploadPictureSize",
|
|
263
|
-
{ maxSize: n(
|
|
263
|
+
{ maxSize: n(k) }
|
|
264
264
|
)}`), 1))
|
|
265
265
|
])
|
|
266
266
|
], 2));
|
|
@@ -74,9 +74,10 @@ const l = (r) => {
|
|
|
74
74
|
border: `${r.lineWidth} ${r.lineType} ${r.borderColorBase}`
|
|
75
75
|
},
|
|
76
76
|
"&.select": {
|
|
77
|
-
backgroundColor: r.calc(r.colorPrimary).colorMix(
|
|
77
|
+
backgroundColor: r.calc(r.colorPrimary).colorMix(3, "#fff"),
|
|
78
78
|
borderColor: r.colorPrimary,
|
|
79
|
-
cursor: "pointer"
|
|
79
|
+
cursor: "pointer",
|
|
80
|
+
color: r.textColor2
|
|
80
81
|
}
|
|
81
82
|
},
|
|
82
83
|
"&.choose": {
|
|
@@ -1,17 +1,17 @@
|
|
|
1
|
-
import { defineComponent as T, ref as y, watch as $, createElementBlock as
|
|
2
|
-
import { Space as C, Popconfirm as
|
|
3
|
-
import { ApField as
|
|
1
|
+
import { defineComponent as T, ref as y, watch as $, createElementBlock as c, openBlock as m, normalizeClass as V, unref as e, createElementVNode as o, createCommentVNode as f, toDisplayString as r, createVNode as i, withModifiers as L, withCtx as v } from "vue";
|
|
2
|
+
import { Space as C, Popconfirm as b } from "@aplus-frontend/antdv";
|
|
3
|
+
import { ApField as B } from "../../../ap-field/index.mjs";
|
|
4
4
|
import "../../../ap-form/ap-form.vue.mjs";
|
|
5
5
|
import "../../../config-provider/index.mjs";
|
|
6
|
-
import { useToken as
|
|
6
|
+
import { useToken as F } from "../../../config-provider/hooks/use-token.mjs";
|
|
7
7
|
import "../../ap-tag/index.mjs";
|
|
8
8
|
import { useViewInject as M } from "../hooks/use-view-provide.mjs";
|
|
9
|
-
import
|
|
10
|
-
import
|
|
9
|
+
import Y from "../icons/line-delete.vue.mjs";
|
|
10
|
+
import j from "../style/index.mjs";
|
|
11
11
|
import { SYSTEM_VIEW_KEY as h } from "../utils/enum.mjs";
|
|
12
|
-
import { useNamespace as
|
|
13
|
-
import { useLocale as
|
|
14
|
-
import
|
|
12
|
+
import { useNamespace as A } from "../../../config-provider/hooks/use-namespace.mjs";
|
|
13
|
+
import { useLocale as O } from "../../../config-provider/hooks/use-locale.mjs";
|
|
14
|
+
import P from "../../ap-tag/ap-tag.vue.mjs";
|
|
15
15
|
import x from "../../../ap-form/ap-form.vue2.mjs";
|
|
16
16
|
const U = { class: "menu-list-content-name" }, W = ["title"], q = {
|
|
17
17
|
key: 0,
|
|
@@ -22,7 +22,7 @@ const U = { class: "menu-list-content-name" }, W = ["title"], q = {
|
|
|
22
22
|
view: {}
|
|
23
23
|
},
|
|
24
24
|
setup(N) {
|
|
25
|
-
const { b: s } =
|
|
25
|
+
const { b: s } = A("ap-view"), d = j("ap-view"), { token: K } = F(), { t: n } = O(), t = N, {
|
|
26
26
|
currentViewKey: D,
|
|
27
27
|
changeCurrentViewKey: S,
|
|
28
28
|
viewListCRUD: p,
|
|
@@ -54,7 +54,7 @@ const U = { class: "menu-list-content-name" }, W = ["title"], q = {
|
|
|
54
54
|
(u) => {
|
|
55
55
|
u && (l.value = !1);
|
|
56
56
|
}
|
|
57
|
-
), (u, a) => l.value === !1 ? (
|
|
57
|
+
), (u, a) => l.value === !1 ? (m(), c("div", {
|
|
58
58
|
key: 0,
|
|
59
59
|
class: V({
|
|
60
60
|
[e(s)()]: !0,
|
|
@@ -69,17 +69,17 @@ const U = { class: "menu-list-content-name" }, W = ["title"], q = {
|
|
|
69
69
|
title: t.view?.viewName
|
|
70
70
|
}, r(t.view?.viewName), 9, W)
|
|
71
71
|
]),
|
|
72
|
-
t.view?.viewKey !== e(h) && t.view?.isDefault ? (
|
|
73
|
-
i(e(
|
|
72
|
+
t.view?.viewKey !== e(h) && t.view?.isDefault ? (m(), c("div", q, [
|
|
73
|
+
i(e(P), {
|
|
74
74
|
text: e(n)("ap.apView.default"),
|
|
75
75
|
size: "small",
|
|
76
|
-
color: e(K).
|
|
76
|
+
color: e(K).colorLink
|
|
77
77
|
}, null, 8, ["text", "color"])
|
|
78
78
|
])) : f("", !0),
|
|
79
|
-
t.view?.viewKey !== e(h) ? (
|
|
79
|
+
t.view?.viewKey !== e(h) ? (m(), c("div", {
|
|
80
80
|
key: 1,
|
|
81
81
|
class: "menu-list-content-action",
|
|
82
|
-
onClick: a[1] || (a[1] =
|
|
82
|
+
onClick: a[1] || (a[1] = L(() => {
|
|
83
83
|
}, ["stop"]))
|
|
84
84
|
}, [
|
|
85
85
|
i(e(C), { size: 8 }, {
|
|
@@ -88,19 +88,19 @@ const U = { class: "menu-list-content-name" }, W = ["title"], q = {
|
|
|
88
88
|
class: "menu-list-content-action-text",
|
|
89
89
|
onClick: a[0] || (a[0] = (R) => l.value = !0)
|
|
90
90
|
}, r(e(n)("ap.apView.rename")), 1),
|
|
91
|
-
t.view?.isDefault ? f("", !0) : (
|
|
91
|
+
t.view?.isDefault ? f("", !0) : (m(), c("div", {
|
|
92
92
|
key: 0,
|
|
93
93
|
class: "menu-list-content-action-text",
|
|
94
94
|
onClick: E
|
|
95
95
|
}, r(e(n)("ap.apView.setDefault")), 1)),
|
|
96
96
|
o("div", G, [
|
|
97
|
-
i(e(
|
|
97
|
+
i(e(b), {
|
|
98
98
|
title: e(n)("ap.apView.deleteTip"),
|
|
99
99
|
"ok-text": e(n)("ap.apView.ok"),
|
|
100
100
|
onConfirm: z
|
|
101
101
|
}, {
|
|
102
102
|
default: v(() => [
|
|
103
|
-
i(
|
|
103
|
+
i(Y)
|
|
104
104
|
]),
|
|
105
105
|
_: 1
|
|
106
106
|
}, 8, ["title", "ok-text"])
|
|
@@ -109,7 +109,7 @@ const U = { class: "menu-list-content-name" }, W = ["title"], q = {
|
|
|
109
109
|
_: 1
|
|
110
110
|
})
|
|
111
111
|
])) : f("", !0)
|
|
112
|
-
], 2)) : (
|
|
112
|
+
], 2)) : (m(), c("div", {
|
|
113
113
|
key: 1,
|
|
114
114
|
class: V([e(s)("menu-list-content"), e(s)("menu-list-content-edit"), e(d)])
|
|
115
115
|
}, [
|
|
@@ -126,7 +126,7 @@ const U = { class: "menu-list-content-name" }, W = ["title"], q = {
|
|
|
126
126
|
default: v(() => [
|
|
127
127
|
i(x.FormItem, { name: "viewName" }, {
|
|
128
128
|
default: v(() => [
|
|
129
|
-
i(e(
|
|
129
|
+
i(e(B).Text, { maxlength: 20 })
|
|
130
130
|
]),
|
|
131
131
|
_: 1
|
|
132
132
|
}),
|
|
@@ -93,7 +93,7 @@ const i = (e) => {
|
|
|
93
93
|
fontSize: e.fontSize,
|
|
94
94
|
display: "flex",
|
|
95
95
|
alignItems: "center",
|
|
96
|
-
color: e.
|
|
96
|
+
color: e.colorLink
|
|
97
97
|
},
|
|
98
98
|
"&-delete": {
|
|
99
99
|
cursor: "pointer",
|
|
@@ -131,7 +131,7 @@ const i = (e) => {
|
|
|
131
131
|
},
|
|
132
132
|
[`${t}-menu-list-content-active`]: {
|
|
133
133
|
".menu-list-content-name": {
|
|
134
|
-
color: e.
|
|
134
|
+
color: e.colorLink
|
|
135
135
|
}
|
|
136
136
|
}
|
|
137
137
|
}
|
|
@@ -12,7 +12,7 @@ const u = (t) => (e, o) => f(e, o, r(t)), f = (t, e, o) => l(o, t, t).replace(
|
|
|
12
12
|
locale: o,
|
|
13
13
|
t: u(t)
|
|
14
14
|
};
|
|
15
|
-
}, x = Symbol("localeContextKey"), K = (t) => {
|
|
15
|
+
}, x = /* @__PURE__ */ Symbol("localeContextKey"), K = (t) => {
|
|
16
16
|
const e = t || m(x, s());
|
|
17
17
|
return p(c(() => e?.value || i));
|
|
18
18
|
};
|
|
@@ -2,7 +2,7 @@ import { getCurrentInstance as N, inject as V, ref as v, computed as y, unref as
|
|
|
2
2
|
const p = "aplus", B = "is-", c = (a, r, t, $, o) => {
|
|
3
3
|
let u = `${a}-${r}`;
|
|
4
4
|
return t && (u += `-${t}`), $ && (u += `__${$}`), o && (u += `--${o}`), u;
|
|
5
|
-
}, C = Symbol("namespaceContextKey"), _ = (a) => {
|
|
5
|
+
}, C = /* @__PURE__ */ Symbol("namespaceContextKey"), _ = (a) => {
|
|
6
6
|
const r = a || (N() ? V(C, v(p)) : v(p));
|
|
7
7
|
return y(() => l(r) || p);
|
|
8
8
|
}, w = (a, r) => {
|
|
@@ -6,7 +6,9 @@ const o = {
|
|
|
6
6
|
lineHeight: 1.5,
|
|
7
7
|
lineHeightSM: 1.6,
|
|
8
8
|
wireframe: !1,
|
|
9
|
-
sizeUnit: 3
|
|
9
|
+
sizeUnit: 3,
|
|
10
|
+
controlHeight: 30,
|
|
11
|
+
controlInteractiveSize: 16
|
|
10
12
|
}, e = {
|
|
11
13
|
...o,
|
|
12
14
|
// 主色
|
|
@@ -39,8 +41,7 @@ const o = {
|
|
|
39
41
|
colorBgSpotlight: "#000000cc",
|
|
40
42
|
controlItemBgActive: "#F5F9FF",
|
|
41
43
|
controlItemBgActiveHover: "#EAF2FF",
|
|
42
|
-
colorBorderSecondary: "#E9EDF3"
|
|
43
|
-
controlHeight: 30
|
|
44
|
+
colorBorderSecondary: "#E9EDF3"
|
|
44
45
|
}, c = {
|
|
45
46
|
...o,
|
|
46
47
|
// 主色
|
|
@@ -74,8 +75,7 @@ const o = {
|
|
|
74
75
|
colorBgSpotlight: "#000000cc",
|
|
75
76
|
controlItemBgActive: "#f3fbf7",
|
|
76
77
|
controlItemBgActiveHover: "#e6f6ef",
|
|
77
|
-
colorBorderSecondary: "#E9E9E9"
|
|
78
|
-
controlHeight: 30
|
|
78
|
+
colorBorderSecondary: "#E9E9E9"
|
|
79
79
|
};
|
|
80
80
|
export {
|
|
81
81
|
c as adminToken,
|
|
@@ -83,7 +83,7 @@ function re(e, t, r, i, f) {
|
|
|
83
83
|
const n = i?.({
|
|
84
84
|
title: e.title,
|
|
85
85
|
column: e
|
|
86
|
-
}), s = n?.filter((T) => T.type !== Symbol.for("v-cmt")) || [];
|
|
86
|
+
}), s = n?.filter((T) => T.type !== /* @__PURE__ */ Symbol.for("v-cmt")) || [];
|
|
87
87
|
if (n && s.length > 0)
|
|
88
88
|
return n;
|
|
89
89
|
const d = k(e), m = w(e.title) ? {
|
|
@@ -14,7 +14,8 @@ const a = {
|
|
|
14
14
|
redo: "Refresh",
|
|
15
15
|
back: "Back",
|
|
16
16
|
more: "More",
|
|
17
|
-
all: "All"
|
|
17
|
+
all: "All",
|
|
18
|
+
save: "Save"
|
|
18
19
|
},
|
|
19
20
|
field: {
|
|
20
21
|
startDateText: "Start date",
|
|
@@ -25,9 +26,12 @@ const a = {
|
|
|
25
26
|
lastWeek: "Last week",
|
|
26
27
|
thisMonth: "This month",
|
|
27
28
|
lastMonth: "Last month",
|
|
29
|
+
thisQuarter: "This quarter",
|
|
30
|
+
lastQuarter: "Last quarter",
|
|
28
31
|
thisYear: "This year",
|
|
29
32
|
lastYear: "Last year",
|
|
30
|
-
lastXDays: "Last {day} days"
|
|
33
|
+
lastXDays: "Last {day} days",
|
|
34
|
+
chooseOnly: "Select only"
|
|
31
35
|
},
|
|
32
36
|
apForm: {
|
|
33
37
|
search: {
|
|
@@ -59,7 +63,13 @@ const a = {
|
|
|
59
63
|
fixToLeft: "Fixed on the left",
|
|
60
64
|
fixToRight: "Fixed on the right",
|
|
61
65
|
unFixed: "Not fixed",
|
|
62
|
-
delete: "Delete"
|
|
66
|
+
delete: "Delete",
|
|
67
|
+
saveAsTemplate: "Save as New Template",
|
|
68
|
+
saveAndApply: "Save and Apply",
|
|
69
|
+
modifyNotification: "The current template has been modified. You can save it as a new template.",
|
|
70
|
+
templateSetting: "Column Configuration Template",
|
|
71
|
+
templateName: "New Template Name",
|
|
72
|
+
templateNamePlaceholder: "Please enter a template name"
|
|
63
73
|
},
|
|
64
74
|
paragraphEllipsis: {
|
|
65
75
|
copy: "Copy",
|
|
@@ -131,7 +141,8 @@ const a = {
|
|
|
131
141
|
},
|
|
132
142
|
apAttachment: {
|
|
133
143
|
downloadall: "Download All",
|
|
134
|
-
more: "More"
|
|
144
|
+
more: "More",
|
|
145
|
+
all: "All"
|
|
135
146
|
},
|
|
136
147
|
apSizeInput: {
|
|
137
148
|
length: "Length",
|