owl-cli 6.42.0 → 6.44.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.
|
@@ -3,6 +3,7 @@
|
|
|
3
3
|
//#import $owlPermission:services/permissionService.jsx
|
|
4
4
|
//#import $owl_orgs:services/modelService.jsx
|
|
5
5
|
//#import $owl_permission:services/modelService.jsx
|
|
6
|
+
//#import $owl_mall_u:services/permissionService.jsx
|
|
6
7
|
|
|
7
8
|
function getParentOrgIds(orgId) {
|
|
8
9
|
if (orgId == '0') {
|
|
@@ -41,9 +42,11 @@ function checklogin() {
|
|
|
41
42
|
var orgId = session.orgId;
|
|
42
43
|
var orgIds = [orgId].concat(getParentOrgIds(orgId));
|
|
43
44
|
if (loginUserId) {
|
|
45
|
+
var loginUser = owl_mall_uService.get(loginUserId);
|
|
44
46
|
var env = {
|
|
45
47
|
now: new Date().getTime(),
|
|
46
48
|
loginId: loginUserId,
|
|
49
|
+
loginUser:loginUser,
|
|
47
50
|
shopId: m,
|
|
48
51
|
warehouseId: "",
|
|
49
52
|
roleId: roleId,
|
|
@@ -10,6 +10,8 @@
|
|
|
10
10
|
//#import moment.min.js
|
|
11
11
|
//#import kafkautil.js
|
|
12
12
|
//#import @services/dblayer.jsx
|
|
13
|
+
//#import @handlers/include/diff.jsx
|
|
14
|
+
//#import $owl_change_log:services/modelService.jsx
|
|
13
15
|
|
|
14
16
|
function trim(s){
|
|
15
17
|
if(s){
|
|
@@ -568,6 +570,23 @@ var @projectCodeService = (function (pigeon) {
|
|
|
568
570
|
f.saveUniqueFields(data, env)
|
|
569
571
|
f.index(obj)
|
|
570
572
|
|
|
573
|
+
if(spec && spec.meta && spec.meta.changeLogEnabled){
|
|
574
|
+
var diffresult = diff(oldObj,o2,[]);
|
|
575
|
+
var changeLog = {
|
|
576
|
+
nv : obj._v,
|
|
577
|
+
ov : oldObj._v,
|
|
578
|
+
oid : obj.id,
|
|
579
|
+
ot: spec['_t'],
|
|
580
|
+
ts: obj.owl_modifyTime,
|
|
581
|
+
uid: env.loginUserId,
|
|
582
|
+
cli: env.cli,
|
|
583
|
+
jobId:env.jobId,
|
|
584
|
+
diff:diffresult
|
|
585
|
+
}
|
|
586
|
+
owl_change_logService.add(changeLog);
|
|
587
|
+
|
|
588
|
+
}
|
|
589
|
+
|
|
571
590
|
var meta = spec['#meta'];
|
|
572
591
|
if(meta && meta.enableJDBC){
|
|
573
592
|
var sqls = updateObject(obj);
|