728/ismism
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

idl

Browse Source
This commit is contained in:
728
2023-05-23 15:10:12 +08:00
parent 96008c2db8
commit fe18eee2a4
7 changed files with 113 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ismism.ts/src/pra/que.ts
View File

@ -2,7 +2,7 @@ import type { Ret } from "./can.ts"
import { is_id, is_nbr } from "../eid/is.ts"
import { coll } from "../db.ts"
import { agd, aut, live, md, nid, ord, rec, soc, usr } from "./doc.ts"
import { id } from "../eid/id.ts"
import { id, idnam } from "../eid/id.ts"
import { nord_f } from "../eid/ord.ts"
export type NId = Ret<typeof nid>
@ -28,13 +28,11 @@ export async function que(
} case "soc": {
if (p.has("sid")) return await soc(parseInt(p.get("sid") ?? ""))
const [adm1, adm2] = [p.get("adm1"), p.get("adm2")]
const sid = await id(coll.soc, adm2 ? { adm2 } : adm1 ? { adm1 } : undefined)
return await Promise.all(sid.map(soc))
return await idnam(coll.soc, await id(coll.soc, adm2 ? { adm2 } : adm1 ? { adm1 } : undefined))
} case "agd": {
if (p.has("aid")) return await agd(parseInt(p.get("aid") ?? ""))
const [adm1, adm2] = [p.get("adm1"), p.get("adm2")]
const aid = await id(coll.agd, adm2 ? { adm2 } : adm1 ? { adm1 } : undefined)
return await Promise.all(aid.map(agd))
return await idnam(coll.agd, await id(coll.agd, adm2 ? { adm2 } : adm1 ? { adm1 } : undefined))
} case "nord": {
const [aid, utc] = ["aid", "utc"].map(t => parseInt(p.get(t) ?? ""))
return await nord_f({ aid, utc })

22
ismism.ts/tst/que.test.ts
View File

@ -71,21 +71,19 @@ Deno.test("usr", async () => {
})
Deno.test("soc", async () => {
const s = await que("soc", p({})) as Soc[]
assertEquals(s!.length, 3)
assertEquals(s[2]?.nrec, { work: 3, fund: 2 })
assertEquals(s[0]?.nrec, { work: 0, fund: 0 })
const s1 = await que("soc", p({ sid: s[2]?._id })) as Soc
assertEquals(s[2], s1)
const s = await que("soc", p({})) as [number, string][]
assertEquals(s, [[1, "小组一"], [2, "小组二"], [3, "小组三"]])
const s1 = await que("soc", p({ sid: s[0][0] })) as Soc
assertEquals(s1?.nam, s[0][1])
assertEquals(s1?.nrec, { work: 3, fund: 2 })
})
Deno.test("agd", async () => {
const a = await que("agd", p({})) as Agd[]
assertEquals(a!.length, 3)
assertEquals(a[1]?.nrec, { work: 1, fund: 1 })
assertEquals(a[2]?.nrec, { work: 2, fund: 1 })
const a1 = await que("agd", p({ aid: a[2]?._id })) as Agd
assertEquals(a[2], a1)
const a = await que("agd", p({})) as [number, string][]
assertEquals(a, [[1, "活动一"], [2, "活动二"], [3, "活动三"]])
const a1 = await que("agd", p({ aid: a[0][0] })) as Agd
assertEquals(a1?.nam, a[0][1])
assertEquals(a1?.nrec, { work: 2, fund: 1 })
})
Deno.test("ord", async () => {

119
ismism.ts/ui/bind/article.ts
View File

@ -65,6 +65,42 @@ export function pas(
}
function doc<T>(
q: "soc" | "agd",
adm: string,
) {
const [a1, a2] = (adm).split("-")
if (a2) {
navnid(q, a1, a2)
return que<T[]>(`${q}?adm2=${a2}`)
} else if (a1) {
navnid(q, a1)
return que<T[]>(`${q}?adm1=${a1}`)
} else {
navnid(q)
return que<T[]>(q)
}
}
export async function id(
h: "agd" | "soc",
adm?: string,
) {
const idl = await doc<[Id["_id"], Id["nam"]]>(h, adm ?? "")
main.innerHTML = ""
await live()
const t = bind("id")
const c = h === "agd" ? "活动公示" : "同城小组"
idnam(t, `${h}${adm ?? ""}`, c)
t.meta.innerText = "网站本月将开启\"以太假说\"杯评选活动的投票通道\n请参赛小组将图片、视频、介绍添加至小组的活动页面"
label(t.idl, `${adm ?? ""} 共 ${idl.length} 个（按注册时间排序）`)
ida(t.idl, idl.map(n => [`${h.substring(0, 1)}${n[0]}`, n[1]]), "id")
main.append(t.bind)
}
export type Usr = Omit<NonNullable<Q.Usr>, "unam" | "snam" | "anam"> & {
unam: Map<Id["_id"], Id["nam"]>,
snam: Map<Id["_id"], Id["nam"]>,
@ -133,38 +169,17 @@ export async function usr(
main.append(t.bind)
}
function doc<T>(
q: "soc" | "agd",
adm: string,
) {
const [a1, a2] = (adm).split("-")
if (a2) {
navnid(q, a1, a2)
return que<T[]>(`${q}?adm2=${a2}`)
} else if (a1) {
navnid(q, a1)
return que<T[]>(`${q}?adm1=${a1}`)
} else {
navnid(q)
return que<T[]>(q)
}
}
export type Soc = Omit<NonNullable<Q.Soc>, "unam"> & {
unam: Map<Id["_id"], Id["nam"]>,
}
export async function soc(
sidadm?: number | string
sid: number
) {
if (navhash(typeof sidadm === "number" ? `s${sidadm}` : `soc${sidadm ?? ""}`)) return
let ss: Q.Soc[]
if (typeof sidadm === "number") {
ss = [await que<Q.Soc>(`soc?sid=${sidadm}`)]
navnid()
} else ss = await doc<Q.Soc>("soc", sidadm ?? "")
if (navhash(`s${sid}`)) return
const ss: Q.Soc[] = [await que<Q.Soc>(`soc?sid=${sid}`)].filter(s => s)
navnid()
ss = ss.filter(s => s)
if (typeof sidadm === "number" && ss.length === 0) return idn(`s${sidadm}`, "小组")
if (ss.length === 0) return idn(`s${sid}`, "小组")
main.innerHTML = ""
for (const d of ss) {
@ -202,17 +217,13 @@ export type Agd = Omit<NonNullable<Q.Agd>, "unam"> & {
unam: Map<Id["_id"], Id["nam"]>,
}
export async function agd(
aidadm?: number | string
aid: number
) {
if (navhash(typeof aidadm === "number" ? `a${aidadm}` : `agd${aidadm ?? ""}`)) return
let aa: Q.Agd[]
if (typeof aidadm === "number") {
aa = [await que<Q.Agd>(`agd?aid=${aidadm}`)]
navnid()
} else aa = await doc<Q.Agd>("agd", aidadm ?? "")
if (navhash(`a${aid}`)) return
const aa: Q.Agd[] = [await que<Q.Agd>(`agd?aid=${aid}`)].filter(a => a)
navnid()
aa = aa.filter(a => a)
if (typeof aidadm === "number" && aa.length === 0) return idn(`a${aidadm}`, "活动")
if (aa.length === 0) return idn(`a${aid}`, "活动")
main.innerHTML = ""
await live()
@ -720,17 +731,17 @@ export function put(
function putid(
nam: "用户" | "小组" | "活动",
id: Usr | Soc | Agd,
d: Usr | Soc | Agd,
) {
if (!nav.pas) return
navnid()
main.innerHTML = ""
const t = bind("putid")
idnam(t, `${id._id}`, `编辑${nam}信息`)
t.pnam.value = id.nam
seladm(t, id.adm1, id.adm2)
txt(t.intro, "简介", id.intro)
idnam(t, `${d._id}`, `编辑${nam}信息`)
t.pnam.value = d.nam
seladm(t, d.adm1, d.adm2)
txt(t.intro, "简介", d.intro)
const pid = () => ({ nam: t.pnam.value, adm1: t.adm1.value, adm2: t.adm2.value, })
const paut = () => ({ uidlim: parseInt(t.uidlim.value) })
@ -745,48 +756,48 @@ function putid(
case "用户": {
[t.uidlim, t.reslim, t.account, t.budget, t.fund, t.expense].forEach(el => el.parentElement?.remove())
t.meta.remove()
p = () => [{ uid: id._id, ...pid(), intro: t.intro.value.trim() }]
r = () => usr(id._id)
p = () => [{ uid: d._id, ...pid(), intro: t.intro.value.trim() }]
r = () => usr(d._id)
break
} case "小组": {
[t.account, t.budget, t.fund, t.expense].forEach(el => el.parentElement?.remove())
const s = id as Soc
const s = d as Soc
t.uidlim.value = `${s.uidlim}`
t.reslim.value = `${s.reslim}`
const [isaut, issec] = [is_aut(nav.pas.aut, "aut"), is_sec(nav.pas, { sid: id._id })]
const [isaut, issec] = [is_aut(nav.pas.aut, "aut"), is_sec(nav.pas, { sid: d._id })]
t.pnam.readOnly = t.adm1.disabled = t.adm2.disabled = t.uidlim.readOnly = !isaut
t.intro.readOnly = t.reslim.readOnly = !issec
p = () => [
...isaut ? [{ sid: id._id, ...pid(), ...paut() }] : [],
...issec ? [{ sid: id._id, ...psoc() }] : [],
...isaut ? [{ sid: d._id, ...pid(), ...paut() }] : [],
...issec ? [{ sid: d._id, ...psoc() }] : [],
]
r = () => soc(id._id)
r = () => soc(d._id)
break
} case "活动": {
const a = id as Agd
const a = d as Agd
t.uidlim.value = `${a.uidlim}`
t.reslim.value = `${a.reslim}`
t.account.value = a.account
t.budget.value = `${a.budget}`
t.fund.value = `${a.fund}`
t.expense.value = `${a.expense}`
const [isaut, issec] = [is_aut(nav.pas.aut, "aut"), is_sec(nav.pas, { aid: id._id })]
const [isaut, issec] = [is_aut(nav.pas.aut, "aut"), is_sec(nav.pas, { aid: d._id })]
t.pnam.readOnly = t.adm1.disabled = t.adm2.disabled = t.uidlim.readOnly = !isaut;
[t.intro, t.reslim, t.account, t.budget, t.fund, t.expense].forEach(el => el.readOnly = !issec)
p = () => [
...isaut ? [{ aid: id._id, ...pid(), ...paut() }] : [],
...issec ? [{ aid: id._id, ...psoc(), ...pagd() }] : [],
...isaut ? [{ aid: d._id, ...pid(), ...paut() }] : [],
...issec ? [{ aid: d._id, ...psoc(), ...pagd() }] : [],
]
r = () => agd(id._id)
r = () => agd(d._id)
break
}
}
if (nam === "用户" || !is_aut(nav.pas.aut, "aut") || !is_re(nav.pas)) t.putn.remove()
else btn(t.putn, `删除${nam}`, {
confirm: `确认要删除${nam}?`,
pos: () => pos<DocD>("put", { [nam === "小组" ? "sid" : "aid"]: id._id }),
pos: () => pos<DocD>("put", { [nam === "小组" ? "sid" : "aid"]: d._id }),
alert: `${nam === "小组" ? "小组仍有志愿者" : "活动仍有工作日志或支持记录"}`,
refresh: () => nam === "小组" ? soc() : agd(),
refresh: () => nam === "小组" ? id("soc") : id("agd"),
})
btn(t.put, t.put.innerText, {
pos: async () => {

10
ismism.ts/ui/bind/nav.ts
View File

@ -2,7 +2,7 @@
import type { Pas } from "../../src/pra/pas.ts"
import type { NId } from "../../src/pra/que.ts"
import { adm } from "../../src/ont/adm.ts"
import { pas, aut, soc, usr, agd, ordl, md, idn } from "./article.ts"
import { pas, aut, soc, usr, agd, ordl, md, idn, id } from "./article.ts"
import { adm1, adm2, pas_a, pos, que } from "./template.ts"
export const nav: {
@ -111,11 +111,11 @@ window.addEventListener("hashchange", () => {
if (nav.hash === "pas") pas()
else if (nav.hash === "aut") aut()
else if (/^\d+$/.test(nav.hash)) usr(parseInt(nav.hash))
else if (nav.hash === "soc") soc()
else if (nav.hash.startsWith("soc")) soc(nav.hash.substring(3))
else if (nav.hash === "soc") id("soc")
else if (nav.hash.startsWith("soc")) id("soc", nav.hash.substring(3))
else if (/^s\d+$/.test(nav.hash)) soc(parseInt(nav.hash.substring(1)))
else if (nav.hash === "" || nav.hash === "agd") agd()
else if (nav.hash.startsWith("agd")) agd(nav.hash.substring(3))
else if (nav.hash === "" || nav.hash === "agd") id("agd")
else if (nav.hash.startsWith("agd")) id("agd", nav.hash.substring(3))
else if (/^a\d+$/.test(nav.hash)) agd(parseInt(nav.hash.substring(1)))
else if (nav.hash.startsWith("ord")) ordl(nav.hash.substring(3))
else if (nav.hash === "wsl") md("wsl", 0, "many")

7
ismism.ts/ui/bind/template.ts
View File

@ -105,6 +105,13 @@ const template = {
hint: t("section"),
},
id: {
tid: "id" as const,
...section.idnam,
meta: t("section"),
idl: t("p"),
},
usr: {
tid: "usr" as const,
...section.idnam,

8
ismism.ts/ui/index/style.css
View File

@ -710,6 +710,14 @@ button.putn {
background: var(--red) !important;
}
a.id {
display: block;
}
a.id:not(:first-child):before {
content: none;
}
a.idnam {
display: block;
font-size: var(--title);

15
ismism.ts/ui/index/template.html
View File

@ -34,6 +34,21 @@
</article>
</template>
<template id="id">
<article>
<section>
<a class="idnam"><code class="id"></code> <span class="nam"></span></a>
</section>
<hr>
<section class="meta"></section>
<hr>
<section>
<label></label>
<p class="idl"></p>
</section>
</article>
</template>
<template id="usr">
<article>
<section>