refs #5334 fix basic-data
gitea/salix/pipeline/head There was a failure building this commit Details

This commit is contained in:
Alex Moreno 2023-05-26 12:58:03 +02:00
parent 2b06c62876
commit 0789804352
5 changed files with 23 additions and 20 deletions

View File

@ -45,9 +45,7 @@ export default class LeftMenu {
if (acl && !this.aclService.hasAny(acl)) if (acl && !this.aclService.hasAny(acl))
continue; continue;
} }
console.log('MyItem:', item);
console.log('MyState:', state);
console.log(item.description, state.description);
let myItem = { let myItem = {
icon: item.icon, icon: item.icon,
description: item.description || state.description, description: item.description || state.description,

View File

@ -1,7 +1,7 @@
<vn-descriptor-content <vn-descriptor-content
module="department" module="worker"
description="$ctrl.department.name" description="$ctrl.department.name"
summary="$ctrl.$.summary"> base-state="worker.department">
<slot-menu> <slot-menu>
<vn-item <vn-item
ng-click="$ctrl.handleExcluded()" ng-click="$ctrl.handleExcluded()"

View File

@ -3,6 +3,6 @@ import './index/';
import './summary'; import './summary';
import './card'; import './card';
import './descriptor'; import './descriptor';
// import './create';
import './basic-data'; import './basic-data';
// import './create';
// import './search-panel'; // import './search-panel';

View File

@ -9,7 +9,8 @@
vn-focus vn-focus
panel="vn-worker-search-panel" panel="vn-worker-search-panel"
info="Search workers by id, firstName, lastName or user name" info="Search workers by id, firstName, lastName or user name"
model="model"> model="model"
base-state="worker.department">
</vn-searchbar> </vn-searchbar>
</vn-portal> </vn-portal>
<ui-view> <ui-view>

View File

@ -24,7 +24,8 @@
"description": "Wikipedia" "description": "Wikipedia"
}, },
{"state": "worker.card.workerLog", "icon": "history"} {"state": "worker.card.workerLog", "icon": "history"}
], "department": [ ],
"department": [
{"state": "worker.department.card.basicData", "icon": "settings"} {"state": "worker.department.card.basicData", "icon": "settings"}
] ]
}, },
@ -138,15 +139,18 @@
"params": { "params": {
"department": "$ctrl.department" "department": "$ctrl.department"
} }
}, { },
{
"url": "/basic-data", "url": "/basic-data",
"state": "worker.deparment.card.basicData", "state": "worker.department.card.basicData",
"component": "vn-worker-department-basic-data", "component": "vn-worker-department-basic-data",
"description": "Basic data", "description": "Basic data",
"params": { "params": {
"department": "$ctrl.department" "item-type": "$ctrl.itemType"
} },
}, { "acl": ["buyer"]
},
{
"url": "/dms", "url": "/dms",
"state": "worker.card.dms", "state": "worker.card.dms",
"abstract": true, "abstract": true,