ts-glitter 16.4.8 → 16.4.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lowcode/Entry.js +1 -1
- package/lowcode/Entry.ts +1 -1
- package/lowcode/cms-plugin/pos-pages/pos-function.js +1 -1
- package/lowcode/cms-plugin/pos-pages/pos-function.ts +1 -1
- package/lowcode/jspage/function-page/setting_editor.js +1 -1
- package/lowcode/jspage/function-page/setting_editor.ts +1 -1
- package/package.json +1 -1
- package/src/api-public/utils/ut-permission.js +10 -1
- package/src/api-public/utils/ut-permission.js.map +1 -1
- package/src/api-public/utils/ut-permission.ts +10 -1
package/lowcode/Entry.js
CHANGED
|
@@ -79,7 +79,7 @@ export class Entry {
|
|
|
79
79
|
}
|
|
80
80
|
window.renderClock = (_a = window.renderClock) !== null && _a !== void 0 ? _a : clockF();
|
|
81
81
|
console.log(`Entry-time:`, window.renderClock.stop());
|
|
82
|
-
glitter.share.editerVersion = 'V_16.4.
|
|
82
|
+
glitter.share.editerVersion = 'V_16.4.9';
|
|
83
83
|
glitter.share.start = new Date();
|
|
84
84
|
const vm = {
|
|
85
85
|
appConfig: [],
|
package/lowcode/Entry.ts
CHANGED
|
@@ -78,7 +78,7 @@ export class Entry {
|
|
|
78
78
|
}
|
|
79
79
|
(window as any).renderClock = (window as any).renderClock ?? clockF();
|
|
80
80
|
console.log(`Entry-time:`, (window as any).renderClock.stop());
|
|
81
|
-
glitter.share.editerVersion = 'V_16.4.
|
|
81
|
+
glitter.share.editerVersion = 'V_16.4.9';
|
|
82
82
|
glitter.share.start = new Date();
|
|
83
83
|
const vm: {
|
|
84
84
|
appConfig: any;
|
|
@@ -39,7 +39,7 @@ export class PosFunction {
|
|
|
39
39
|
</div>
|
|
40
40
|
</div>
|
|
41
41
|
<div style="align-self: stretch; text-align: center; color: #393939; font-size: 24px; font-family: Noto Sans; font-weight: 700; line-height: 33.60px; letter-spacing: 2.40px; word-wrap: break-word">
|
|
42
|
-
|
|
42
|
+
請輸入員工密碼
|
|
43
43
|
</div>
|
|
44
44
|
</div>
|
|
45
45
|
<div style="align-self: stretch; justify-content: center; align-items: center; gap: 20px; display: inline-flex">
|
|
@@ -34,7 +34,7 @@ function refresh(){
|
|
|
34
34
|
</div>
|
|
35
35
|
</div>
|
|
36
36
|
<div style="align-self: stretch; text-align: center; color: #393939; font-size: 24px; font-family: Noto Sans; font-weight: 700; line-height: 33.60px; letter-spacing: 2.40px; word-wrap: break-word">
|
|
37
|
-
|
|
37
|
+
請輸入員工密碼
|
|
38
38
|
</div>
|
|
39
39
|
</div>
|
|
40
40
|
<div style="align-self: stretch; justify-content: center; align-items: center; gap: 20px; display: inline-flex">
|
|
@@ -44,7 +44,7 @@ export class Setting_editor {
|
|
|
44
44
|
}
|
|
45
45
|
});
|
|
46
46
|
ApiPageConfig.getPrivateConfigV2('backend_list').then((res) => {
|
|
47
|
-
if (res.response.result[0]) {
|
|
47
|
+
if (res.response.result && res.response.result[0]) {
|
|
48
48
|
items = res.response.result[0].value;
|
|
49
49
|
}
|
|
50
50
|
items = items.filter((dd) => dd);
|
|
@@ -770,7 +770,7 @@ export class Setting_editor {
|
|
|
770
770
|
});
|
|
771
771
|
|
|
772
772
|
ApiPageConfig.getPrivateConfigV2('backend_list').then((res) => {
|
|
773
|
-
if (res.response.result[0]) {
|
|
773
|
+
if (res.response.result && res.response.result[0]) {
|
|
774
774
|
items = res.response.result[0].value;
|
|
775
775
|
}
|
|
776
776
|
items = items.filter((dd: any) => dd);
|
package/package.json
CHANGED
|
@@ -11,6 +11,15 @@ class UtPermission {
|
|
|
11
11
|
return new Promise(async (resolve, reject) => {
|
|
12
12
|
try {
|
|
13
13
|
const appName = req.get('g-app') || req.query.appName || req.body.appName;
|
|
14
|
+
console.log(`SELECT count(1)
|
|
15
|
+
FROM ${config_js_1.saasConfig.SAAS_NAME}.app_config
|
|
16
|
+
WHERE
|
|
17
|
+
(user = ${req.body.token.userID} and appName = ${database_js_1.default.escape(appName)})
|
|
18
|
+
OR appName in (
|
|
19
|
+
(SELECT appName FROM \`${config_js_1.saasConfig.SAAS_NAME}\`.app_auth_config
|
|
20
|
+
WHERE user = ${req.body.token.userID} AND status = 1 AND invited = 1 AND appName = ${database_js_1.default.escape(appName)})
|
|
21
|
+
);
|
|
22
|
+
`);
|
|
14
23
|
const result = await database_js_1.default.query(`SELECT count(1)
|
|
15
24
|
FROM ${config_js_1.saasConfig.SAAS_NAME}.app_config
|
|
16
25
|
WHERE
|
|
@@ -20,7 +29,7 @@ class UtPermission {
|
|
|
20
29
|
WHERE user = ? AND status = 1 AND invited = 1 AND appName = ?)
|
|
21
30
|
);
|
|
22
31
|
`, [req.body.token.userID, appName, req.body.token.userID, appName]);
|
|
23
|
-
resolve(result[0]['count(1)']
|
|
32
|
+
resolve(result[0]['count(1)'] > 0);
|
|
24
33
|
}
|
|
25
34
|
catch (e) {
|
|
26
35
|
resolve(false);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ut-permission.js","sourceRoot":"","sources":["ut-permission.ts"],"names":[],"mappings":";;;;;;AACA,4EAA2C;AAC3C,+CAA6C;AAG7C,MAAa,YAAY;IACd,MAAM,CAAC,SAAS,CAAC,GAAoB;QACxC,OAAO,IAAI,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;YACzC,IAAI,CAAC;gBACD,MAAM,OAAO,GAAI,GAAG,CAAC,GAAG,CAAC,OAAO,CAAY,IAAI,GAAG,CAAC,KAAK,CAAC,OAAO,IAAI,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC;gBACtF,MAAM,MAAM,GAAG,MAAM,qBAAE,CAAC,KAAK,CACzB;2BACO,sBAAU,CAAC,SAAS;;;;qDAIM,sBAAU,CAAC,SAAS;;;qBAGpD,EACD,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC,CACnE,CAAC;gBACF,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,
|
|
1
|
+
{"version":3,"file":"ut-permission.js","sourceRoot":"","sources":["ut-permission.ts"],"names":[],"mappings":";;;;;;AACA,4EAA2C;AAC3C,+CAA6C;AAG7C,MAAa,YAAY;IACd,MAAM,CAAC,SAAS,CAAC,GAAoB;QACxC,OAAO,IAAI,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;YACzC,IAAI,CAAC;gBACD,MAAM,OAAO,GAAI,GAAG,CAAC,GAAG,CAAC,OAAO,CAAY,IAAI,GAAG,CAAC,KAAK,CAAC,OAAO,IAAI,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC;gBACtF,OAAO,CAAC,GAAG,CAAC;2BACD,sBAAU,CAAC,SAAS;;kCAEb,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,kBAAkB,qBAAE,CAAC,MAAM,CAAC,OAAO,CAAC;;qDAEtC,sBAAU,CAAC,SAAS;2CAC9B,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,iDAAiD,qBAAE,CAAC,MAAM,CAAC,OAAO,CAAC;;oBAE/G,CAAC,CAAA;gBACL,MAAM,MAAM,GAAG,MAAM,qBAAE,CAAC,KAAK,CACzB;2BACO,sBAAU,CAAC,SAAS;;;;qDAIM,sBAAU,CAAC,SAAS;;;qBAGpD,EACD,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC,CACnE,CAAC;gBACF,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;YACvC,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACT,OAAO,CAAC,KAAK,CAAC,CAAC;YACnB,CAAC;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IACM,MAAM,CAAC,mBAAmB,CAAC,QAAe,EAAC,OAAc;QAC5D,OAAO,IAAI,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;YACzC,IAAI,CAAC;gBACD,MAAM,MAAM,GAAG,MAAM,qBAAE,CAAC,KAAK,CACzB;2BACO,sBAAU,CAAC,SAAS;;;;qDAIM,sBAAU,CAAC,SAAS;;;qBAGpD,EACD,CAAC,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,CAAC,CACzC,CAAC;gBACF,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC;YACxC,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACT,OAAO,CAAC,KAAK,CAAC,CAAC;YACnB,CAAC;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IAEM,MAAM,CAAC,SAAS,CAAC,GAAoB;QACxC,OAAO,IAAI,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;YACzC,IAAI,CAAC;gBACD,OAAO,CACH,CACI,MAAM,qBAAE,CAAC,KAAK,CACV;sCACU,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC;8CACR,EAClB,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAC1B,CACJ,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CACxB,CAAC;YACN,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACT,OAAO,CAAC,KAAK,CAAC,CAAC;YACnB,CAAC;QACL,CAAC,CAAC,CAAC;IACP,CAAC;CACJ;AAxED,oCAwEC"}
|
|
@@ -8,6 +8,15 @@ export class UtPermission {
|
|
|
8
8
|
return new Promise(async (resolve, reject) => {
|
|
9
9
|
try {
|
|
10
10
|
const appName = (req.get('g-app') as string) || req.query.appName || req.body.appName;
|
|
11
|
+
console.log(`SELECT count(1)
|
|
12
|
+
FROM ${saasConfig.SAAS_NAME}.app_config
|
|
13
|
+
WHERE
|
|
14
|
+
(user = ${req.body.token.userID} and appName = ${db.escape(appName)})
|
|
15
|
+
OR appName in (
|
|
16
|
+
(SELECT appName FROM \`${saasConfig.SAAS_NAME}\`.app_auth_config
|
|
17
|
+
WHERE user = ${req.body.token.userID} AND status = 1 AND invited = 1 AND appName = ${db.escape(appName)})
|
|
18
|
+
);
|
|
19
|
+
`)
|
|
11
20
|
const result = await db.query(
|
|
12
21
|
`SELECT count(1)
|
|
13
22
|
FROM ${saasConfig.SAAS_NAME}.app_config
|
|
@@ -20,7 +29,7 @@ export class UtPermission {
|
|
|
20
29
|
`,
|
|
21
30
|
[req.body.token.userID, appName, req.body.token.userID, appName]
|
|
22
31
|
);
|
|
23
|
-
resolve(result[0]['count(1)']
|
|
32
|
+
resolve(result[0]['count(1)'] > 0);
|
|
24
33
|
} catch (e) {
|
|
25
34
|
resolve(false);
|
|
26
35
|
}
|