Oak-Team
/
oak-frontend-base
13
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases 37 Wiki Activity

Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-frontend-base into dev

This commit is contained in:
Xu Chang 2023-11-01 17:05:04 +08:00
parent f2186fa4db 26d4f0165a
commit 8d2b71c075
9 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
es/components/listPro/index.js
View File

@ -34,7 +34,10 @@ const ProList = (props) => {
newTableAttributes.unshift({
attribute: {
path: '#',
attribute: '',
attribute: {
label: '#',
path: '#',
},
attrType: 'number',
attr: '#',
entity: entity,

7
es/features/locales.js
View File

@ -113,8 +113,11 @@ export class Locales extends Feature {
this.i18n.store(dataset);
this.publish();
}
else {
// console.warn(`命名空间${ns}中的${key}缺失且可能请求不到更新的数据，请检查`);
if (!this.hasKey(key)) {
console.warn(`命名空间${ns}中的${key}缺失且可能请求不到更新的数据`);
if (process.env.NODE_ENV === 'development') {
console.warn('请增加好相应的键值后执行make:locale');
}
}
}
/**

2
es/features/relationAuth.js
View File

@ -192,7 +192,7 @@ export class RelationAuth extends Feature {
$entity: 'actionAuth',
data: {
id: 1,
paths: 1,
pathId: 1,
deActions: 1,
destEntity: 1,
},

5
lib/components/listPro/index.js
View File

@ -38,7 +38,10 @@ const ProList = (props) => {
newTableAttributes.unshift({
attribute: {
path: '#',
attribute: '',
attribute: {
label: '#',
path: '#',
},
attrType: 'number',
attr: '#',
entity: entity,

7
lib/features/locales.js
View File

@ -116,8 +116,11 @@ class Locales extends Feature_1.Feature {
this.i18n.store(dataset);
this.publish();
}
else {
// console.warn(`命名空间${ns}中的${key}缺失且可能请求不到更新的数据，请检查`);
if (!this.hasKey(key)) {
console.warn(`命名空间${ns}中的${key}缺失且可能请求不到更新的数据`);
if (process.env.NODE_ENV === 'development') {
console.warn('请增加好相应的键值后执行make:locale');
}
}
}
/**

2
lib/features/relationAuth.js
View File

@ -195,7 +195,7 @@ class RelationAuth extends Feature_1.Feature {
$entity: 'actionAuth',
data: {
id: 1,
paths: 1,
pathId: 1,
deActions: 1,
destEntity: 1,
},

5
src/components/listPro/index.tsx
View File

@ -112,7 +112,10 @@ const ProList = <ED2 extends ED, T extends keyof ED2>(props: Props<ED2, T>) => {
newTableAttributes.unshift({
attribute: {
path: '#',
attribute: '',
attribute: {
label: '#',
path: '#',
},
attrType: 'number',
attr: '#',
entity: entity as string,

8
src/features/locales.ts
View File

@ -141,8 +141,12 @@ export class Locales<ED extends EntityDict & BaseEntityDict, Cxt extends AsyncCo
this.i18n.store(dataset);
this.publish();
}
else {
// console.warn(`命名空间${ns}中的${key}缺失且可能请求不到更新的数据，请检查`);
if (!this.hasKey(key)) {
console.warn(`命名空间${ns}中的${key}缺失且可能请求不到更新的数据`);
if (process.env.NODE_ENV === 'development') {
console.warn('请增加好相应的键值后执行make:locale');
}
}
}

2
src/features/relationAuth.ts
View File

@ -254,7 +254,7 @@ export class RelationAuth<
$entity: 'actionAuth',
data: {
id: 1,
paths: 1,
pathId: 1,
deActions: 1,
destEntity: 1,
},