efront 4.36.2 → 4.36.3
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/#/345/233/275/351/231/205/345/214/226.yml +24 -0
- package/apps/pivot/menu.yml +1 -0
- package/apps/pivot/todo/edit.xht +38 -0
- package/apps/pivot/todo/list.xht +136 -0
- package/apps/pivot/token/list.js +1 -0
- package/coms/basic/$split.js +4 -5
- package/coms/basic/Table.js +1 -1
- package/coms/basic/cross_.js +2 -0
- package/coms/basic/data.js +280 -266
- package/coms/basic/enrich.js +2 -1
- package/coms/basic/i18n.js +6 -2
- package/coms/basic/math.js +177 -60
- package/coms/basic/math.md +26 -12
- package/coms/basic/str2array.js +1 -1
- package/coms/basic_/Promise.js +1 -1
- package/coms/compile/Html.js +1 -0
- package/coms/compile/Html_test.js +9 -1
- package/coms/compile/Program.js +1 -1
- package/coms/compile/common.js +1 -0
- package/coms/compile/polyfill.js +23 -6
- package/coms/compile//347/256/227/345/274/217.js +17 -1
- package/coms/docs/helps.js +1 -1
- package/coms/frame/top.html +1 -1
- package/coms/pivot/DB.js +51 -0
- package/coms/pivot/todo.xht +69 -0
- package/coms/reptile/cross.js +8 -9
- package/coms/reptile/window.js +0 -1
- package/coms/zimoli/autodragchildren.js +20 -12
- package/package.json +1 -1
- package/public/efront.js +1 -1
- package/public//346/226/207/344/273/266/347/263/273/347/273/237//344/270/273/351/241/265.jsp +2 -2
|
@@ -40,6 +40,30 @@
|
|
|
40
40
|
- zh-CN: 禁用
|
|
41
41
|
en: Disable
|
|
42
42
|
|
|
43
|
+
- zh-CN: 加载$1失败,引用队列为
|
|
44
|
+
en: "Loading $1 failed, reference queue is"
|
|
45
|
+
|
|
46
|
+
- zh-CN: 未授权
|
|
47
|
+
en: unauthorized
|
|
48
|
+
|
|
49
|
+
- zh-CN: 校验域名
|
|
50
|
+
en: Verify domain name
|
|
51
|
+
|
|
52
|
+
- zh-CN: 编辑
|
|
53
|
+
en: edit
|
|
54
|
+
|
|
55
|
+
- zh-CN: 任务概要
|
|
56
|
+
en: Task Overview
|
|
57
|
+
|
|
58
|
+
- zh-CN: 未处理
|
|
59
|
+
en: unprocessed
|
|
60
|
+
|
|
61
|
+
- zh-CN: 进行中
|
|
62
|
+
en: in progress
|
|
63
|
+
|
|
64
|
+
- zh-CN: 已办结
|
|
65
|
+
en: Completed
|
|
66
|
+
|
|
43
67
|
- zh-CN: "不要在后端代码中使用相对路径\r\n 文件:$1"
|
|
44
68
|
en: "Do not use relative paths in backend code\nFile: $1"
|
|
45
69
|
|
package/apps/pivot/menu.yml
CHANGED
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
<style>
|
|
2
|
+
</style>
|
|
3
|
+
<div head><span -if="data1.id">${i18n`编辑`}</span><span -else>${i18n`添加`}</span><span>${i18n`任务`}</span></div>
|
|
4
|
+
<div body>
|
|
5
|
+
<field -repeat="f in fields" -src=[f,data1]></field>
|
|
6
|
+
</div>
|
|
7
|
+
<div foot>
|
|
8
|
+
<a @click="cancel()">取消</a>
|
|
9
|
+
<btn @click="submit()">确认</btn>
|
|
10
|
+
</div>
|
|
11
|
+
<script>
|
|
12
|
+
var [data] = arguments;
|
|
13
|
+
var btn = button;
|
|
14
|
+
var a = button;
|
|
15
|
+
var window = this;
|
|
16
|
+
var cancel = function () {
|
|
17
|
+
remove(window);
|
|
18
|
+
};
|
|
19
|
+
var submit = async function () {
|
|
20
|
+
await DB.save('待办', {
|
|
21
|
+
id: data1.id,
|
|
22
|
+
name: data1.name,
|
|
23
|
+
state: data1.state,
|
|
24
|
+
});
|
|
25
|
+
dispatch(window, 'changed');
|
|
26
|
+
remove(window);
|
|
27
|
+
};
|
|
28
|
+
view(this);
|
|
29
|
+
console.log(data);
|
|
30
|
+
var data1 = {
|
|
31
|
+
id: data?.id,
|
|
32
|
+
name: data?.name,
|
|
33
|
+
state: data?.state
|
|
34
|
+
};
|
|
35
|
+
var fields = refilm`
|
|
36
|
+
任务概要/name text
|
|
37
|
+
`;
|
|
38
|
+
</script>
|
|
@@ -0,0 +1,136 @@
|
|
|
1
|
+
<style>
|
|
2
|
+
& {
|
|
3
|
+
display: block;
|
|
4
|
+
height: 100%;
|
|
5
|
+
padding-bottom: 10px !important;
|
|
6
|
+
position: relative;
|
|
7
|
+
}
|
|
8
|
+
|
|
9
|
+
h3 {
|
|
10
|
+
margin: 0;
|
|
11
|
+
padding: 0;
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
>.dropping {
|
|
15
|
+
outline: 1px solid;
|
|
16
|
+
outline-offset: -6px;
|
|
17
|
+
|
|
18
|
+
&.created {
|
|
19
|
+
background: #62c2;
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
&.pending {
|
|
23
|
+
background: #2942;
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
&.done {
|
|
27
|
+
background: #26c2;
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
>list {
|
|
32
|
+
>[insert] {
|
|
33
|
+
display: block;
|
|
34
|
+
padding: 4px 16px;
|
|
35
|
+
background: #fff;
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
display: inline-block;
|
|
39
|
+
width: 33%;
|
|
40
|
+
min-width: 220px;
|
|
41
|
+
height: 100%;
|
|
42
|
+
background: #f2f2f2;
|
|
43
|
+
border: 6px solid #fff;
|
|
44
|
+
|
|
45
|
+
&.created {
|
|
46
|
+
color: #62c;
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
&.pending {
|
|
50
|
+
color: #263;
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
&.done {
|
|
54
|
+
color: #26c;
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
@media (max-width:680px) {
|
|
59
|
+
>list {
|
|
60
|
+
|
|
61
|
+
&:nth-child(2),
|
|
62
|
+
&:nth-child(1) {
|
|
63
|
+
width: 50%;
|
|
64
|
+
height: 50%;
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
&:nth-child(3) {
|
|
68
|
+
width: 100%;
|
|
69
|
+
height: 50%;
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
@media (max-width:460px) {
|
|
75
|
+
>list {
|
|
76
|
+
|
|
77
|
+
&:nth-child(1),
|
|
78
|
+
&:nth-child(2),
|
|
79
|
+
&:nth-child(3) {
|
|
80
|
+
width: 100%;
|
|
81
|
+
height: 33%;
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
</style>
|
|
86
|
+
<list -src="(m,i) in items" allowdrop .created _state="0">
|
|
87
|
+
<div insert>${i18n`未处理`}</div>
|
|
88
|
+
<todo @click="edit(m)" .new -if="!m.state" -src="[m,i]"></todo>
|
|
89
|
+
</list>
|
|
90
|
+
<list -src="(m,i) in items" allowdrop .pending _state="1">
|
|
91
|
+
<div insert>${i18n`进行中`}</div>
|
|
92
|
+
<todo @click="edit(m)" .ing -if="m.state==1" -src="[m,i]"></todo>
|
|
93
|
+
</list>
|
|
94
|
+
<list -src="(m,i) in items" allowdrop .done _state="2">
|
|
95
|
+
<div insert>${i18n`已办结`}</div>
|
|
96
|
+
<todo @click="edit(m)" .done -if="m.state==2" -src="[m,i]"></todo>
|
|
97
|
+
</list>
|
|
98
|
+
<script>
|
|
99
|
+
once('mounted')(this, function () {
|
|
100
|
+
data.setInstance('option-buttons', [
|
|
101
|
+
{
|
|
102
|
+
name: '添加',
|
|
103
|
+
icon: "fa-plus",
|
|
104
|
+
sign: "+",
|
|
105
|
+
do() {
|
|
106
|
+
var elem = popup('/todo/edit');
|
|
107
|
+
},
|
|
108
|
+
}
|
|
109
|
+
]);
|
|
110
|
+
})
|
|
111
|
+
on('mousedown')(this, function (event) {
|
|
112
|
+
var target = getTargetIn(a => a.tagName === 'TODO', event.target);
|
|
113
|
+
if (!target) return;
|
|
114
|
+
var obj = $scoped.get(target).m;
|
|
115
|
+
autodragchildren.hook(target, event, true, function (index, targetBox) {
|
|
116
|
+
var state = targetBox.state;
|
|
117
|
+
if (obj.state === state) return;
|
|
118
|
+
obj.state = state;
|
|
119
|
+
DB.update("待办", {
|
|
120
|
+
name: obj.name,
|
|
121
|
+
id: obj.id,
|
|
122
|
+
state: state
|
|
123
|
+
});
|
|
124
|
+
render.refresh();
|
|
125
|
+
});
|
|
126
|
+
})
|
|
127
|
+
var edit = function (m) {
|
|
128
|
+
var window = popup('/todo/edit', m);
|
|
129
|
+
on('changed')(window, function () {
|
|
130
|
+
items = DB.query("待办", null, 120);
|
|
131
|
+
})
|
|
132
|
+
};
|
|
133
|
+
var btn = button;
|
|
134
|
+
var list = zimoli$list;
|
|
135
|
+
var items = DB.query("待办", null, 120);
|
|
136
|
+
</script>
|
package/apps/pivot/token/list.js
CHANGED
package/coms/basic/$split.js
CHANGED
|
@@ -1,7 +1,9 @@
|
|
|
1
|
-
var split = function (
|
|
1
|
+
var split = function (p) {
|
|
2
2
|
var s = [];
|
|
3
|
+
var reg = /[\\\/\$]/g;
|
|
3
4
|
reg.lastIndex = 0;
|
|
4
5
|
var lastIndex = 0;
|
|
6
|
+
if (/^[\/\\]/.test(p)) lastIndex++;
|
|
5
7
|
while (p) {
|
|
6
8
|
reg.lastIndex++;
|
|
7
9
|
var m = reg.exec(p);
|
|
@@ -16,7 +18,4 @@ var split = function (reg, p) {
|
|
|
16
18
|
return s;
|
|
17
19
|
|
|
18
20
|
}
|
|
19
|
-
module.exports =
|
|
20
|
-
var s = split(/[\\\/\$]/g, p);
|
|
21
|
-
return s;
|
|
22
|
-
}
|
|
21
|
+
module.exports = split;
|
package/coms/basic/Table.js
CHANGED
package/coms/basic/cross_.js
CHANGED
|
@@ -326,6 +326,8 @@ function cross_(jsonp, digest = noop, method, url, headers) {
|
|
|
326
326
|
};
|
|
327
327
|
var fire = async function (code) {
|
|
328
328
|
if (!~requests.indexOf(xhr)) return;
|
|
329
|
+
headers = await headers;
|
|
330
|
+
cachedata = await Promise.all(cachedata);
|
|
329
331
|
prepareHeaders();
|
|
330
332
|
xhr.method = method;
|
|
331
333
|
xhr.url = url;
|