Skip to content

I
ibzdict
提交 f49bd8e5 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

ibiz4j 发布系统代码

上级 b1d45ed0
显示空白字符变更
内嵌 并排
正在显示 包含 2265 行增加 和 2243 行删除
app_web/public/assets/json/data-dictionary.json
浏览文件 @ f49bd8e5
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
"id": "1", "id": "1",
"label": "是", "label": "是",
"text": "是", "text": "是",
"class":"",
"data":"", "data":"",
"codename":"Item_1", "codename":"Item_1",
"value": "1", "value": "1",
...@@ -18,6 +19,7 @@ ...@@ -18,6 +19,7 @@
"id": "0", "id": "0",
"label": "否", "label": "否",
"text": "否", "text": "否",
"class":"",
"data":"", "data":"",
"codename":"Item_0", "codename":"Item_0",
"value": "0", "value": "0",
......
app_web/public/assets/json/view-config.json
浏览文件 @ f49bd8e5
{ {
"dictoptioneditview": {
"title": "字典项编辑视图",
"caption": "字典项",
"viewtype": "DEEDITVIEW",
"viewmodule": "dict",
"viewname": "DictOptionEditView",
"viewtag": "0986ae2314847b586b20edfbb40fc82b"
},
"dictoptiongridview": { "dictoptiongridview": {
"title": "字典项表格视图", "title": "字典项表格视图",
"caption": "字典项", "caption": "字典项",
"viewtype": "DEGRIDVIEW", "viewtype": "DEGRIDVIEW",
"viewmodule": "dict", "viewmodule": "dict",
"viewname": "DictOptionGridView", "viewname": "DictOptionGridView",
"viewtag": "56893daa82632caa84a6edeeb0acabaf" "viewtag": "22e202992971f634c00e022b2cae335e"
},
"dictcatalogpickupgridview": {
"title": "字典选择表格视图",
"caption": "字典",
"viewtype": "DEPICKUPGRIDVIEW",
"viewmodule": "dict",
"viewname": "DictCatalogPickupGridView",
"viewtag": "66f9c86e5a56857f977ef91461338255"
}, },
"dictoptiongrideditview": { "dictoptiongrideditview": {
"title": "字典项表格视图", "title": "字典项表格视图",
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
"viewtype": "DEGRIDVIEW", "viewtype": "DEGRIDVIEW",
"viewmodule": "dict", "viewmodule": "dict",
"viewname": "DictOptionGridEditView", "viewname": "DictOptionGridEditView",
"viewtag": "6aa3306d5c50039f771e4617a8a5cd64" "viewtag": "44488f30cf90677019077ed9ad33628e"
}, },
"dictcataloggridview": { "dictcataloggridview": {
"title": "字典表格视图", "title": "字典表格视图",
...@@ -29,23 +29,23 @@ ...@@ -29,23 +29,23 @@
"viewtype": "DEGRIDVIEW", "viewtype": "DEGRIDVIEW",
"viewmodule": "dict", "viewmodule": "dict",
"viewname": "DictCatalogGridView", "viewname": "DictCatalogGridView",
"viewtag": "7395bd2cc14d34a67b772f13a50b2587" "viewtag": "74a6ce3ddf610ce7fb201662c6d4b8da"
}, },
"dictoptioneditview": { "dictcatalogpickupgridview": {
"title": "字典项编辑视图", "title": "字典选择表格视图",
"caption": "字典项", "caption": "字典",
"viewtype": "DEEDITVIEW", "viewtype": "DEPICKUPGRIDVIEW",
"viewmodule": "dict", "viewmodule": "dict",
"viewname": "DictOptionEditView", "viewname": "DictCatalogPickupGridView",
"viewtag": "8ad70084b5f98a26370b74da612d3f49" "viewtag": "842cfc03d5e93435fc52d317a55cdfd4"
}, },
"appindexview": { "dictcatalogpickupview": {
"title": "dictionary", "title": "字典数据选择视图",
"caption": "ibizlab", "caption": "字典",
"viewtype": "APPINDEXVIEW", "viewtype": "DEPICKUPVIEW",
"viewmodule": "dict", "viewmodule": "dict",
"viewname": "AppIndexView", "viewname": "DictCatalogPickupView",
"viewtag": "D394F269-6F97-4ED7-AFE8-F4A2E09BA602" "viewtag": "a9c82814d9bcd23dbf78c4c073759d7c"
}, },
"dictcatalogeditview": { "dictcatalogeditview": {
"title": "字典编辑视图", "title": "字典编辑视图",
...@@ -53,14 +53,14 @@ ...@@ -53,14 +53,14 @@
"viewtype": "DEEDITVIEW", "viewtype": "DEEDITVIEW",
"viewmodule": "dict", "viewmodule": "dict",
"viewname": "DictCatalogEditView", "viewname": "DictCatalogEditView",
"viewtag": "e294ce8c6557ca26a032efa08eeb5508" "viewtag": "aef11c4ae15f8255ee53623adf148f2a"
}, },
"dictcatalogpickupview": { "appindexview": {
"title": "字典数据选择视图", "title": "dictionary",
"caption": "字典", "caption": "ibizlab",
"viewtype": "DEPICKUPVIEW", "viewtype": "APPINDEXVIEW",
"viewmodule": "dict", "viewmodule": "dict",
"viewname": "DictCatalogPickupView", "viewname": "AppIndexView",
"viewtag": "eb4772f75066d6c9eb26d8b01d4e16b7" "viewtag": "d28e2613c581adb940ff8c3469365646"
} }
} }
app_web/public/environments/environment.js 0 → 100644
浏览文件 @ f49bd8e5
window.Environment = {
// 应用基础路径
BaseUrl: '',
// 是否为开发模式
devMode: true,
// 是否为pc端应用
isAppMode:true,
// 是否开启权限认证
enablePermissionValid:false,
// 打开目标工具，可选参数：sln、mos
debugOpenMode:'mos',
// 配置平台地址
StudioUrl: "http://172.16.170.145/mos/",
// 中心标识
SlnId: "B4BF5C84-D020-4D9A-A986-8FA4FD72816C",
// 系统标识
SysId: "B428B5BE-EA90-4101-A493-BA7085D89F0A",
// 前端应用标识
AppId: "6e0b7357169ef4eba84e1347ed94bd84",
}
\ No newline at end of file
app_web/src/components/app-actionbar/app-actionbar.vue
浏览文件 @ f49bd8e5
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
<script lang="ts"> <script lang="ts">
import { Vue, Component, Prop, Model, Emit,Inject, Watch } from "vue-property-decorator"; import { Vue, Component, Prop, Model, Emit,Inject, Watch } from "vue-property-decorator";
import { Subject,Subscription } from "rxjs"; import { Subject,Subscription } from "rxjs";
import { Environment } from '@/environments/environment';
@Component({}) @Component({})
export default class AppActionBar extends Vue { export default class AppActionBar extends Vue {
...@@ -99,6 +100,7 @@ export default class AppActionBar extends Vue { ...@@ -99,6 +100,7 @@ export default class AppActionBar extends Vue {
* @memberof AppActionBar * @memberof AppActionBar
*/ */
public calcActionItemAuthState(data:any,ActionModel:any,UIService:any){ public calcActionItemAuthState(data:any,ActionModel:any,UIService:any){
if(Environment.enablePermissionValid){
for (const key in ActionModel) { for (const key in ActionModel) {
if (!ActionModel.hasOwnProperty(key)) { if (!ActionModel.hasOwnProperty(key)) {
return; return;
...@@ -132,6 +134,7 @@ export default class AppActionBar extends Vue { ...@@ -132,6 +134,7 @@ export default class AppActionBar extends Vue {
} }
} }
} }
}
/** /**
* 组件销毁 * 组件销毁
......
app_web/src/components/app-embed-picker/app-embed-picker.vue
浏览文件 @ f49bd8e5
...@@ -222,7 +222,12 @@ export default class AppEmbedPicker extends Vue { ...@@ -222,7 +222,12 @@ export default class AppEmbedPicker extends Vue {
if(Object.is(newFormData[this.refreshitems], oldDormData[this.refreshitems])) { if(Object.is(newFormData[this.refreshitems], oldDormData[this.refreshitems])) {
return; return;
} }
this.setValue([{srfmajortext: null, srfkey: null}]); if (this.valueItem) {
this.$emit('formitemvaluechange', { name: this.valueItem, value: null });
}
if (this.name) {
this.$emit('formitemvaluechange', { name: this.name, value: null });
}
} }
/** /**
...@@ -231,6 +236,7 @@ export default class AppEmbedPicker extends Vue { ...@@ -231,6 +236,7 @@ export default class AppEmbedPicker extends Vue {
* @memberof AppEmbedPicker * @memberof AppEmbedPicker
*/ */
public created() { public created() {
this.setViewParam();
if(this.formState) { if(this.formState) {
this.formStateEvent = this.formState.subscribe(({ tag, action, data }) => { this.formStateEvent = this.formState.subscribe(({ tag, action, data }) => {
if (Object.is('load', action)) { if (Object.is('load', action)) {
......
app_web/src/components/app-form-group/app-form-group.vue
浏览文件 @ f49bd8e5
...@@ -108,6 +108,7 @@ ...@@ -108,6 +108,7 @@
<script lang="ts"> <script lang="ts">
import { Vue, Component, Prop, Watch } from 'vue-property-decorator'; import { Vue, Component, Prop, Watch } from 'vue-property-decorator';
import { Environment } from '@/environments/environment';
@Component({}) @Component({})
export default class AppFormGroup extends Vue { export default class AppFormGroup extends Vue {
...@@ -157,6 +158,7 @@ export default class AppFormGroup extends Vue { ...@@ -157,6 +158,7 @@ export default class AppFormGroup extends Vue {
* @memberof AppFormGroup * @memberof AppFormGroup
*/ */
public calcActionItemAuthState(data:any,ActionModel:any,UIService:any){ public calcActionItemAuthState(data:any,ActionModel:any,UIService:any){
if(Environment.enablePermissionValid){
for (const key in ActionModel) { for (const key in ActionModel) {
if (!ActionModel.hasOwnProperty(key)) { if (!ActionModel.hasOwnProperty(key)) {
return; return;
...@@ -190,6 +192,7 @@ export default class AppFormGroup extends Vue { ...@@ -190,6 +192,7 @@ export default class AppFormGroup extends Vue {
} }
} }
} }
}
/** /**
* 是否为管理容器 * 是否为管理容器
......
app_web/src/components/app-message-popover/app-message-popover.less
浏览文件 @ f49bd8e5
...@@ -19,10 +19,12 @@ ...@@ -19,10 +19,12 @@
padding-top: 2px; padding-top: 2px;
padding-right: 2px; padding-right: 2px;
color: #aaa; color: #aaa;
cursor: pointer;
} }
.Row { .Row {
height: 70px; min-height: 70px;
height: auto;
border-bottom: 1px solid lightgray; border-bottom: 1px solid lightgray;
display: flex; display: flex;
align-items: center; align-items: center;
...@@ -34,20 +36,24 @@ ...@@ -34,20 +36,24 @@
.column2 { .column2 {
border: 0px red solid; border: 0px red solid;
.process-definition-name { .process-definition-name {
font-size: 14px; font-size: 14px;
padding-top: 5px;
}
.description {
margin-top: 6px;
margin-bottom: 6px;
max-width: 95%;
}
.createtime {
padding-bottom: 5px;
} }
.el-row { .el-row {
display: flex; display: flex;
.el-col { .el-col {
flex-grow: 1; flex-grow: 1;
div {
margin-bottom: 5px;
}
div:first-child { div:first-child {
font-weight: 500; font-weight: 500;
overflow: hidden; overflow: hidden;
......
app_web/src/components/app-message-popover/app-message-popover.vue
浏览文件 @ f49bd8e5
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
<el-row :draggable="false"> <el-row :draggable="false">
<el-col :span="16" :draggable="false"> <el-col :span="16" :draggable="false">
<div class="process-definition-name" :draggable="false"><strong>{{myTask.processDefinitionName}}</strong></div> <div class="process-definition-name" :draggable="false"><strong>{{myTask.processDefinitionName}}</strong></div>
<div :draggable="false">{{myTask.description}}</div> <div class="description" :draggable="false">{{myTask.description}}</div>
<div :draggable="false">{{ formatDate(myTask.createTime, 'MM-DD hh:mm') }}</div> <div class="createtime" :draggable="false">{{ formatDate(myTask.createTime, 'MM-DD hh:mm') }}</div>
</el-col> </el-col>
<el-col :span="5" :draggable="false" style='display: flex; align-items: center'> <el-col :span="5" :draggable="false" style='display: flex; align-items: center'>
<el-tag :type="myTask.name.indexOf('驳回')!=-1?'danger':(myTask.name.indexOf('成功')!=-1?'success':(myTask.name.indexOf('取消')!=-1?'info':'-'))" <el-tag :type="myTask.name.indexOf('驳回')!=-1?'danger':(myTask.name.indexOf('成功')!=-1?'success':(myTask.name.indexOf('取消')!=-1?'info':'-'))"
...@@ -54,8 +54,8 @@ ...@@ -54,8 +54,8 @@
<el-row :draggable="false"> <el-row :draggable="false">
<el-col :span="16" :draggable="false"> <el-col :span="16" :draggable="false">
<div class="process-definition-name" :draggable="false"><strong>{{myMsg.processDefinitionName}}</strong></div> <div class="process-definition-name" :draggable="false"><strong>{{myMsg.processDefinitionName}}</strong></div>
<div :draggable="false">{{myMsg.description}}</div> <div class="description" :draggable="false">{{myMsg.description}}</div>
<div :draggable="false">{{ formatDate(myMsg.createTime, 'MM-DD hh:mm') }}</div> <div class="createtime" :draggable="false">{{ formatDate(myMsg.createTime, 'MM-DD hh:mm') }}</div>
</el-col> </el-col>
<el-col :span="5" :draggable="false" style='display: flex; align-items: center'> <el-col :span="5" :draggable="false" style='display: flex; align-items: center'>
<el-tag :type="myMsg.name.indexOf('驳回')!=-1?'danger':(myMsg.name.indexOf('成功')!=-1?'success':(myMsg.name.indexOf('取消')!=-1?'info':'-'))" <el-tag :type="myMsg.name.indexOf('驳回')!=-1?'danger':(myMsg.name.indexOf('成功')!=-1?'success':(myMsg.name.indexOf('取消')!=-1?'info':'-'))"
......
app_web/src/components/app-transfer/app-transfer.less
浏览文件 @ f49bd8e5
...@@ -5,11 +5,21 @@ ...@@ -5,11 +5,21 @@
display: none; display: none;
} }
.el-transfer{ .el-transfer{
max-height: 200px;
min-width: 100% !important; min-width: 100% !important;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
.el-transfer-panel{ .el-transfer-panel{
min-width: 25%; min-width: 25%;
.el-transfer-panel__body{
max-height: 160px;
.el-checkbox-group{
max-height: 160px;
.el-checkbox+.el-checkbox {
margin-left: 0px;
}
}
}
} }
.el-transfer__buttons{ .el-transfer__buttons{
align-self: center; align-self: center;
......
app_web/src/components/app-wf-approval/app-wf-approval.vue
浏览文件 @ f49bd8e5
...@@ -5,7 +5,9 @@ ...@@ -5,7 +5,9 @@
<span>{{data.startUserName}}{{$t('components.appWFApproval.commit')}}</span> <span>{{data.startUserName}}{{$t('components.appWFApproval.commit')}}</span>
</div> </div>
<div class="app-wf-approval-content" v-if="data.usertasks && data.usertasks.length >0"> <div class="app-wf-approval-content" v-if="data.usertasks && data.usertasks.length >0">
<div class="approval-content-item" v-for="(usertask,index) in data.usertasks" :key="index"> <template v-for="(usertask,index) in data.usertasks" >
<template v-if="usertask.identitylinks.length >0">
<div class="approval-content-item" :key="index">
<div class="approval-content-item-left"> <div class="approval-content-item-left">
{{usertask.userTaskName}} {{usertask.userTaskName}}
</div> </div>
...@@ -29,6 +31,9 @@ ...@@ -29,6 +31,9 @@
</div> </div>
</div> </div>
</div> </div>
</template>
</template>
</div> </div>
<div class="app-wf-approval-bottom"> <div class="app-wf-approval-bottom">
<span v-if="data.endTime">{{data.endTime}}{{$t('components.appWFApproval.end')}}</span> <span v-if="data.endTime">{{data.endTime}}{{$t('components.appWFApproval.end')}}</span>
......
app_web/src/components/dropdown-list-dynamic/dropdown-list-dynamic.vue
浏览文件 @ f49bd8e5
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
:filterable="filterable" :filterable="filterable"
@on-open-change="onClick" @on-open-change="onClick"
:placeholder="$t('components.dropDownListDynamic.placeholder')"> :placeholder="$t('components.dropDownListDynamic.placeholder')">
<i-option v-for="(item, index) in items" :key="index" :value="item.value">{{($t('userCustom.'+tag+'.'+item.value)!== ('userCustom.'+tag+'.'+item.value))?$t('userCustom.'+tag+'.'+item.value) : item.text}}</i-option> <i-option v-for="(item, index) in items" :key="index" :class="item.class" :value="item.value">{{($t('userCustom.'+tag+'.'+item.value)!== ('userCustom.'+tag+'.'+item.value))?$t('userCustom.'+tag+'.'+item.value) : item.text}}</i-option>
</i-select> </i-select>
</template> </template>
......
app_web/src/components/dropdown-list-mpicker/dropdown-list-mpicker.vue
浏览文件 @ f49bd8e5
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
:filterable="filterable" :filterable="filterable"
@on-open-change="onClick" @on-open-change="onClick"
:placeholder="$t('components.dropDownListMpicker.placeholder')"> :placeholder="$t('components.dropDownListMpicker.placeholder')">
<i-option v-for="(item, index) in items" :key="index" :value="item.value.toString()" :label="item.text"> <i-option v-for="(item, index) in items" :key="index" :class="item.class" :value="item.value.toString()" :label="item.text">
<Checkbox :value = "(currentVal.indexOf(item.value.toString()))==-1?false:true"> <Checkbox :value = "(currentVal.indexOf(item.value.toString()))==-1?false:true">
{{Object.is(codelistType,'STATIC') ? $t('codelist.'+tag+'.'+item.value) : item.text}} {{Object.is(codelistType,'STATIC') ? $t('codelist.'+tag+'.'+item.value) : item.text}}
</Checkbox> </Checkbox>
......
app_web/src/components/dropdown-list/dropdown-list.vue
浏览文件 @ f49bd8e5
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
:filterable="filterable" :filterable="filterable"
@on-open-change="onClick" @on-open-change="onClick"
:placeholder="$t('components.dropDownList.placeholder')"> :placeholder="$t('components.dropDownList.placeholder')">
<i-option v-for="(item, index) in items" :key="index" :value="item.value">{{($t('codelist.'+tag+'.'+item.value)!== ('codelist.'+tag+'.'+item.value))?$t('codelist.'+tag+'.'+item.value) : item.text}}</i-option> <i-option v-for="(item, index) in items" :key="index" :class="item.class" :value="item.value">{{($t('codelist.'+tag+'.'+item.value)!== ('codelist.'+tag+'.'+item.value))?$t('codelist.'+tag+'.'+item.value) : item.text}}</i-option>
</i-select> </i-select>
<ibiz-select-tree v-if="hasChildren" class="tree-dropdown-list" :disabled="disabled" :NodesData="items" v-model="currentVal" :multiple="false"></ibiz-select-tree> <ibiz-select-tree v-if="hasChildren" class="tree-dropdown-list" :disabled="disabled" :NodesData="items" v-model="currentVal" :multiple="false"></ibiz-select-tree>
</div> </div>
......
app_web/src/engine/view/view-engine.ts
浏览文件 @ f49bd8e5
import { Environment } from '@/environments/environment';
/** /**
* *
* *
...@@ -184,6 +186,7 @@ export default class ViewEngine { ...@@ -184,6 +186,7 @@ export default class ViewEngine {
* @memberof ViewEngine * @memberof ViewEngine
*/ */
public calcToolbarItemAuthState(data:any){ public calcToolbarItemAuthState(data:any){
if(Environment.enablePermissionValid){
const _this: any = this; const _this: any = this;
for (const key in _this.view.toolBarModels) { for (const key in _this.view.toolBarModels) {
if (!_this.view.toolBarModels.hasOwnProperty(key)) { if (!_this.view.toolBarModels.hasOwnProperty(key)) {
...@@ -218,5 +221,6 @@ export default class ViewEngine { ...@@ -218,5 +221,6 @@ export default class ViewEngine {
} }
} }
} }
}
} }
\ No newline at end of file
app_web/src/environments/environment.ts
浏览文件 @ f49bd8e5
...@@ -25,8 +25,10 @@ export const Environment = { ...@@ -25,8 +25,10 @@ export const Environment = {
enablePermissionValid:false, enablePermissionValid:false,
// 项目模板地址 // 项目模板地址
ProjectUrl: "http://demo.ibizlab.cn/ibizr7pfstdtempl/ibizvuer7", ProjectUrl: "http://demo.ibizlab.cn/ibizr7pfstdtempl/ibizvuer7",
// 打开目标工具，可选参数：sln、mos
debugOpenMode:'mos',
// 配置平台地址 // 配置平台地址
StudioUrl: "http://172.16.170.145/slnstudio/", StudioUrl: "http://172.16.170.145/mos/",
// 中心标识 // 中心标识
SlnId: "B4BF5C84-D020-4D9A-A986-8FA4FD72816C", SlnId: "B4BF5C84-D020-4D9A-A986-8FA4FD72816C",
// 系统标识 // 系统标识
...@@ -34,9 +36,13 @@ export const Environment = { ...@@ -34,9 +36,13 @@ export const Environment = {
// 前端应用标识 // 前端应用标识
AppId: "6e0b7357169ef4eba84e1347ed94bd84", AppId: "6e0b7357169ef4eba84e1347ed94bd84",
// 项目发布文件地址 // 项目发布文件地址
PublishProjectUrl: 'http://oauth2:ymrzrgzh97axsgq_TjR3@labcs.ibizee.cn/ibiz4jteam/ibzdict.git', PublishProjectUrl: 'http://oauth2:cTux_e7Aoz1PrasP5dDq@demo.ibizlab.cn/ibiz4jteam/ibzdict.git',
// ibiz开放平台地址 // ibiz开放平台地址
ibizlabtUrl: 'https://www.ibizlab.cn', ibizlabtUrl: 'https://www.ibizlab.cn',
// ibiz论坛地址 // ibiz论坛地址
ibizbbstUrl: 'https://bbs.ibizlab.cn', ibizbbstUrl: 'https://bbs.ibizlab.cn',
}; };
// 挂载外部配置文件
if ((window as any).Environment) {
Object.assign(Environment, (window as any).Environment);
}
\ No newline at end of file
app_web/src/locale/lanres/entities/dict-catalog/dict-catalog_en_US.ts
浏览文件 @ f49bd8e5
...@@ -10,22 +10,22 @@ export default { ...@@ -10,22 +10,22 @@ export default {
updatedate: "最后修改时间", updatedate: "最后修改时间",
}, },
views: { views: {
pickupgridview: {
caption: "字典",
title: "字典选择表格视图",
},
gridview: { gridview: {
caption: "字典", caption: "字典",
title: "字典表格视图", title: "字典表格视图",
}, },
editview: { pickupgridview: {
caption: "字典", caption: "字典",
title: "字典编辑视图", title: "字典选择表格视图",
}, },
pickupview: { pickupview: {
caption: "字典", caption: "字典",
title: "字典数据选择视图", title: "字典数据选择视图",
}, },
editview: {
caption: "字典",
title: "字典编辑视图",
},
}, },
main_form: { main_form: {
details: { details: {
......
app_web/src/locale/lanres/entities/dict-catalog/dict-catalog_zh_CN.ts
浏览文件 @ f49bd8e5
...@@ -9,22 +9,22 @@ export default { ...@@ -9,22 +9,22 @@ export default {
updatedate: "最后修改时间", updatedate: "最后修改时间",
}, },
views: { views: {
pickupgridview: {
caption: "字典",
title: "字典选择表格视图",
},
gridview: { gridview: {
caption: "字典", caption: "字典",
title: "字典表格视图", title: "字典表格视图",
}, },
editview: { pickupgridview: {
caption: "字典", caption: "字典",
title: "字典编辑视图", title: "字典选择表格视图",
}, },
pickupview: { pickupview: {
caption: "字典", caption: "字典",
title: "字典数据选择视图", title: "字典数据选择视图",
}, },
editview: {
caption: "字典",
title: "字典编辑视图",
},
}, },
main_form: { main_form: {
details: { details: {
......
app_web/src/locale/lanres/entities/dict-option/dict-option_en_US.ts
浏览文件 @ f49bd8e5
...@@ -17,6 +17,10 @@ export default { ...@@ -17,6 +17,10 @@ export default {
updatedate: "最后修改时间", updatedate: "最后修改时间",
}, },
views: { views: {
editview: {
caption: "字典项",
title: "字典项编辑视图",
},
gridview: { gridview: {
caption: "字典项", caption: "字典项",
title: "字典项表格视图", title: "字典项表格视图",
...@@ -25,10 +29,6 @@ export default { ...@@ -25,10 +29,6 @@ export default {
caption: "字典项", caption: "字典项",
title: "字典项表格视图", title: "字典项表格视图",
}, },
editview: {
caption: "字典项",
title: "字典项编辑视图",
},
}, },
main_form: { main_form: {
details: { details: {
...@@ -106,6 +106,16 @@ export default { ...@@ -106,6 +106,16 @@ export default {
uiactions: { uiactions: {
}, },
}, },
editviewtoolbar_toolbar: {
tbitem1: {
caption: "Save And Close",
tip: "Save And Close Window",
},
tbitem2: {
caption: "关闭",
tip: "关闭",
},
},
gridviewtoolbar_toolbar: { gridviewtoolbar_toolbar: {
tbitem3: { tbitem3: {
caption: "New", caption: "New",
...@@ -160,16 +170,6 @@ export default { ...@@ -160,16 +170,6 @@ export default {
tip: "Filter", tip: "Filter",
}, },
}, },
editviewtoolbar_toolbar: {
tbitem1: {
caption: "Save And Close",
tip: "Save And Close Window",
},
tbitem2: {
caption: "关闭",
tip: "关闭",
},
},
grideditviewtoolbar_toolbar: { grideditviewtoolbar_toolbar: {
tbitem3: { tbitem3: {
caption: "New", caption: "New",
......
app_web/src/locale/lanres/entities/dict-option/dict-option_zh_CN.ts
浏览文件 @ f49bd8e5
...@@ -16,6 +16,10 @@ export default { ...@@ -16,6 +16,10 @@ export default {
updatedate: "最后修改时间", updatedate: "最后修改时间",
}, },
views: { views: {
editview: {
caption: "字典项",
title: "字典项编辑视图",
},
gridview: { gridview: {
caption: "字典项", caption: "字典项",
title: "字典项表格视图", title: "字典项表格视图",
...@@ -24,10 +28,6 @@ export default { ...@@ -24,10 +28,6 @@ export default {
caption: "字典项", caption: "字典项",
title: "字典项表格视图", title: "字典项表格视图",
}, },
editview: {
caption: "字典项",
title: "字典项编辑视图",
},
}, },
main_form: { main_form: {
details: { details: {
...@@ -105,6 +105,16 @@ export default { ...@@ -105,6 +105,16 @@ export default {
uiactions: { uiactions: {
}, },
}, },
editviewtoolbar_toolbar: {
tbitem1: {
caption: "保存并关闭",
tip: "保存并关闭",
},
tbitem2: {
caption: "关闭",
tip: "关闭",
},
},
gridviewtoolbar_toolbar: { gridviewtoolbar_toolbar: {
tbitem3: { tbitem3: {
caption: "新建", caption: "新建",
...@@ -159,16 +169,6 @@ export default { ...@@ -159,16 +169,6 @@ export default {
tip: "过滤", tip: "过滤",
}, },
}, },
editviewtoolbar_toolbar: {
tbitem1: {
caption: "保存并关闭",
tip: "保存并关闭",
},
tbitem2: {
caption: "关闭",
tip: "关闭",
},
},
grideditviewtoolbar_toolbar: { grideditviewtoolbar_toolbar: {
tbitem3: { tbitem3: {
caption: "新建", caption: "新建",
......
app_web/src/mock/app/app-index-view-appmenu/app-index-view-appmenu.ts
浏览文件 @ f49bd8e5
...@@ -11,7 +11,7 @@ mock.onGet('v7/app-index-viewappmenu').reply((config: any) => { ...@@ -11,7 +11,7 @@ mock.onGet('v7/app-index-viewappmenu').reply((config: any) => {
name: 'appmenu', name: 'appmenu',
items: [ items: [
{ {
id: '3F92DBA9-3532-49CD-A482-E9048A132684', id: '801bacb689744f3de00c39b84618cbf5',
name: 'menuitem1', name: 'menuitem1',
text: '目录', text: '目录',
type: 'MENUITEM', type: 'MENUITEM',
...@@ -29,7 +29,7 @@ mock.onGet('v7/app-index-viewappmenu').reply((config: any) => { ...@@ -29,7 +29,7 @@ mock.onGet('v7/app-index-viewappmenu').reply((config: any) => {
resourcetag: '', resourcetag: '',
}, },
{ {
id: '73B8AFA0-9EDB-4224-93B8-F8B7C4D01AE3', id: 'edcf745c76c1c398b5e5511586f4e4c8',
name: 'menuitem2', name: 'menuitem2',
text: '栏目', text: '栏目',
type: 'MENUITEM', type: 'MENUITEM',
......
app_web/src/mock/codelist/codelist.ts
浏览文件 @ f49bd8e5
...@@ -16,6 +16,7 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => { ...@@ -16,6 +16,7 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
id: "1", id: "1",
label: "是", label: "是",
text: "是", text: "是",
"class":"",
"data":"", "data":"",
"codename":"Item_1", "codename":"Item_1",
value: "1", value: "1",
...@@ -26,6 +27,7 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => { ...@@ -26,6 +27,7 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
id: "0", id: "0",
label: "否", label: "否",
text: "否", text: "否",
"class":"",
"data":"", "data":"",
"codename":"Item_0", "codename":"Item_0",
value: "0", value: "0",
......
app_web/src/mock/viewconfig/viewconfig.ts
浏览文件 @ f49bd8e5
...@@ -7,21 +7,21 @@ import Mock from 'mockjs' ...@@ -7,21 +7,21 @@ import Mock from 'mockjs'
mock.onGet('./assets/json/view-config.json').reply((config: any) => { mock.onGet('./assets/json/view-config.json').reply((config: any) => {
let status = MockAdapter.mockStatus(config); let status = MockAdapter.mockStatus(config);
return [status,{ return [status,{
"dictoptioneditview": {
"title": "字典项编辑视图",
"caption": "字典项",
"viewtype": "DEEDITVIEW",
"viewmodule": "dict",
"viewname": "DictOptionEditView",
"viewtag": "0986ae2314847b586b20edfbb40fc82b"
},
"dictoptiongridview": { "dictoptiongridview": {
"title": "字典项表格视图", "title": "字典项表格视图",
"caption": "字典项", "caption": "字典项",
"viewtype": "DEGRIDVIEW", "viewtype": "DEGRIDVIEW",
"viewmodule": "dict", "viewmodule": "dict",
"viewname": "DictOptionGridView", "viewname": "DictOptionGridView",
"viewtag": "56893daa82632caa84a6edeeb0acabaf" "viewtag": "22e202992971f634c00e022b2cae335e"
},
"dictcatalogpickupgridview": {
"title": "字典选择表格视图",
"caption": "字典",
"viewtype": "DEPICKUPGRIDVIEW",
"viewmodule": "dict",
"viewname": "DictCatalogPickupGridView",
"viewtag": "66f9c86e5a56857f977ef91461338255"
}, },
"dictoptiongrideditview": { "dictoptiongrideditview": {
"title": "字典项表格视图", "title": "字典项表格视图",
...@@ -29,7 +29,7 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => { ...@@ -29,7 +29,7 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewtype": "DEGRIDVIEW", "viewtype": "DEGRIDVIEW",
"viewmodule": "dict", "viewmodule": "dict",
"viewname": "DictOptionGridEditView", "viewname": "DictOptionGridEditView",
"viewtag": "6aa3306d5c50039f771e4617a8a5cd64" "viewtag": "44488f30cf90677019077ed9ad33628e"
}, },
"dictcataloggridview": { "dictcataloggridview": {
"title": "字典表格视图", "title": "字典表格视图",
...@@ -37,23 +37,23 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => { ...@@ -37,23 +37,23 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewtype": "DEGRIDVIEW", "viewtype": "DEGRIDVIEW",
"viewmodule": "dict", "viewmodule": "dict",
"viewname": "DictCatalogGridView", "viewname": "DictCatalogGridView",
"viewtag": "7395bd2cc14d34a67b772f13a50b2587" "viewtag": "74a6ce3ddf610ce7fb201662c6d4b8da"
}, },
"dictoptioneditview": { "dictcatalogpickupgridview": {
"title": "字典项编辑视图", "title": "字典选择表格视图",
"caption": "字典项", "caption": "字典",
"viewtype": "DEEDITVIEW", "viewtype": "DEPICKUPGRIDVIEW",
"viewmodule": "dict", "viewmodule": "dict",
"viewname": "DictOptionEditView", "viewname": "DictCatalogPickupGridView",
"viewtag": "8ad70084b5f98a26370b74da612d3f49" "viewtag": "842cfc03d5e93435fc52d317a55cdfd4"
}, },
"appindexview": { "dictcatalogpickupview": {
"title": "dictionary", "title": "字典数据选择视图",
"caption": "ibizlab", "caption": "字典",
"viewtype": "APPINDEXVIEW", "viewtype": "DEPICKUPVIEW",
"viewmodule": "dict", "viewmodule": "dict",
"viewname": "AppIndexView", "viewname": "DictCatalogPickupView",
"viewtag": "D394F269-6F97-4ED7-AFE8-F4A2E09BA602" "viewtag": "a9c82814d9bcd23dbf78c4c073759d7c"
}, },
"dictcatalogeditview": { "dictcatalogeditview": {
"title": "字典编辑视图", "title": "字典编辑视图",
...@@ -61,15 +61,15 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => { ...@@ -61,15 +61,15 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewtype": "DEEDITVIEW", "viewtype": "DEEDITVIEW",
"viewmodule": "dict", "viewmodule": "dict",
"viewname": "DictCatalogEditView", "viewname": "DictCatalogEditView",
"viewtag": "e294ce8c6557ca26a032efa08eeb5508" "viewtag": "aef11c4ae15f8255ee53623adf148f2a"
}, },
"dictcatalogpickupview": { "appindexview": {
"title": "字典数据选择视图", "title": "dictionary",
"caption": "字典", "caption": "ibizlab",
"viewtype": "DEPICKUPVIEW", "viewtype": "APPINDEXVIEW",
"viewmodule": "dict", "viewmodule": "dict",
"viewname": "DictCatalogPickupView", "viewname": "AppIndexView",
"viewtag": "eb4772f75066d6c9eb26d8b01d4e16b7" "viewtag": "d28e2613c581adb940ff8c3469365646"
} }
}]; }];
}); });
\ No newline at end of file
app_web/src/model/form-detail/form-button.ts
浏览文件 @ f49bd8e5
...@@ -11,7 +11,7 @@ export class FormButtonModel extends FormDetailModel { ...@@ -11,7 +11,7 @@ export class FormButtonModel extends FormDetailModel {
constructor(opts: any = {}) { constructor(opts: any = {}) {
super(opts); super(opts);
this.disabled = opts.disabled; this.$disabled = opts.disabled;
this.uiaction = opts.uiaction; this.uiaction = opts.uiaction;
} }
...@@ -21,7 +21,7 @@ export class FormButtonModel extends FormDetailModel { ...@@ -21,7 +21,7 @@ export class FormButtonModel extends FormDetailModel {
* @type {boolean} * @type {boolean}
* @memberof FormButtonModel * @memberof FormButtonModel
*/ */
public disabled:boolean = false; private $disabled:boolean = false;
/** /**
* 按钮对应的界面行为 * 按钮对应的界面行为
...@@ -31,4 +31,26 @@ export class FormButtonModel extends FormDetailModel { ...@@ -31,4 +31,26 @@ export class FormButtonModel extends FormDetailModel {
*/ */
public uiaction:any; public uiaction:any;
/**
* 是否启用
*
* @type {boolean}
* @memberof FormButtonModel
*/
public get disabled(): boolean {
return this.$disabled;
}
/**
* 设置是否启用
*
* @memberof FormButtonModel
*/
public set disabled(val: boolean) {
if(this.isPower) {
this.$disabled = val;
}
}
} }
\ No newline at end of file
app_web/src/model/form-detail/form-detail.ts
浏览文件 @ f49bd8e5
...@@ -6,6 +6,14 @@ ...@@ -6,6 +6,14 @@
*/ */
export class FormDetailModel { export class FormDetailModel {
/**
* 是否有权限
*
* @type {boolean}
* @memberof FormDetailModel
*/
public isPower: boolean = true;
/** /**
* 成员标题 * 成员标题
* *
...@@ -44,7 +52,7 @@ export class FormDetailModel { ...@@ -44,7 +52,7 @@ export class FormDetailModel {
* @type {boolean} * @type {boolean}
* @memberof FormDetailModel * @memberof FormDetailModel
*/ */
public visible: boolean = true; public $visible: boolean = true;
/** /**
* 成员是否显示(旧) * 成员是否显示(旧)
...@@ -83,12 +91,33 @@ export class FormDetailModel { ...@@ -83,12 +91,33 @@ export class FormDetailModel {
this.detailType = !Object.is(opts.detailType, '') ? opts.detailType : ''; this.detailType = !Object.is(opts.detailType, '') ? opts.detailType : '';
this.form = opts.form ? opts.form : {}; this.form = opts.form ? opts.form : {};
this.name = !Object.is(opts.name, '') ? opts.name : ''; this.name = !Object.is(opts.name, '') ? opts.name : '';
this.visible = opts.visible ? true : false; this.$visible = opts.visible ? true : false;
this.oldVisible = opts.visible ? true : false; this.oldVisible = opts.visible ? true : false;
this.isShowCaption = opts.isShowCaption ? true : false; this.isShowCaption = opts.isShowCaption ? true : false;
this.isControlledContent = opts.isControlledContent ? true : false; this.isControlledContent = opts.isControlledContent ? true : false;
} }
/**
* 设置成员是否隐藏
*
* @memberof FormDetailModel
*/
public set visible(val: boolean) {
if(this.isPower) {
this.$visible = val;
}
}
/**
* 获取成员是否隐藏
*
* @memberof FormDetailModel
*/
public get visible() {
return this.$visible;
}
/** /**
* 设置显示与隐藏 * 设置显示与隐藏
* *
...@@ -96,8 +125,10 @@ export class FormDetailModel { ...@@ -96,8 +125,10 @@ export class FormDetailModel {
* @memberof FormDetailModel * @memberof FormDetailModel
*/ */
public setVisible(state: boolean): void { public setVisible(state: boolean): void {
if(this.isPower) {
this.visible = state; this.visible = state;
} }
}
/** /**
* 设置显示标题栏 * 设置显示标题栏
......
app_web/src/pages/dict/app-index-view/app-index-view-base.vue
浏览文件 @ f49bd8e5
...@@ -130,7 +130,7 @@ export default class AppIndexViewBase extends Vue { ...@@ -130,7 +130,7 @@ export default class AppIndexViewBase extends Vue {
* @type {string} * @type {string}
* @memberof AppIndexViewBase * @memberof AppIndexViewBase
*/ */
public viewtag: string = 'D394F269-6F97-4ED7-AFE8-F4A2E09BA602'; public viewtag: string = 'd28e2613c581adb940ff8c3469365646';
/** /**
* 自定义视图导航上下文集合 * 自定义视图导航上下文集合
......
app_web/src/pages/dict/app-index-view/page-register.ts
浏览文件 @ f49bd8e5
export const PageComponents = { export const PageComponents = {
install(Vue: any, opt: any) { install(Vue: any, opt: any) {
Vue.component('dict-option-edit-view', () => import('@pages/dict/dict-option-edit-view/dict-option-edit-view.vue')); Vue.component('dict-option-grid-edit-view', () => import('@pages/dict/dict-option-grid-edit-view/dict-option-grid-edit-view.vue'));
Vue.component('dict-catalog-pickup-grid-view', () => import('@pages/dict/dict-catalog-pickup-grid-view/dict-catalog-pickup-grid-view.vue')); Vue.component('dict-catalog-pickup-grid-view', () => import('@pages/dict/dict-catalog-pickup-grid-view/dict-catalog-pickup-grid-view.vue'));
Vue.component('dict-option-edit-view', () => import('@pages/dict/dict-option-edit-view/dict-option-edit-view.vue'));
Vue.component('dict-option-grid-view', () => import('@pages/dict/dict-option-grid-view/dict-option-grid-view.vue')); Vue.component('dict-option-grid-view', () => import('@pages/dict/dict-option-grid-view/dict-option-grid-view.vue'));
Vue.component('dict-option-grid-edit-view', () => import('@pages/dict/dict-option-grid-edit-view/dict-option-grid-edit-view.vue')); Vue.component('dict-catalog-grid-view', () => import('@pages/dict/dict-catalog-grid-view/dict-catalog-grid-view.vue'));
Vue.component('dict-catalog-pickup-view', () => import('@pages/dict/dict-catalog-pickup-view/dict-catalog-pickup-view.vue')); Vue.component('dict-catalog-pickup-view', () => import('@pages/dict/dict-catalog-pickup-view/dict-catalog-pickup-view.vue'));
Vue.component('dict-catalog-edit-view', () => import('@pages/dict/dict-catalog-edit-view/dict-catalog-edit-view.vue')); Vue.component('dict-catalog-edit-view', () => import('@pages/dict/dict-catalog-edit-view/dict-catalog-edit-view.vue'));
Vue.component('dict-catalog-grid-view', () => import('@pages/dict/dict-catalog-grid-view/dict-catalog-grid-view.vue'));
} }
}; };
\ No newline at end of file
app_web/src/pages/dict/app-index-view/router.ts
浏览文件 @ f49bd8e5
...@@ -36,33 +36,33 @@ const router = new Router({ ...@@ -36,33 +36,33 @@ const router = new Router({
component: () => import('@pages/dict/app-index-view/app-index-view.vue'), component: () => import('@pages/dict/app-index-view/app-index-view.vue'),
children: [ children: [
{ {
path: 'dictcatalogs/:dictcatalog?/dictoptions/:dictoption?/editview/:editview?', path: 'dictcatalogs/:dictcatalog?/dictoptions/:dictoption?/grideditview/:grideditview?',
meta: { meta: {
caption: 'entities.dictoption.views.editview.caption', caption: 'entities.dictoption.views.grideditview.caption',
info:'', info:'',
parameters: [ parameters: [
{ pathName: 'appindexview', parameterName: 'appindexview' }, { pathName: 'appindexview', parameterName: 'appindexview' },
{ pathName: 'dictcatalogs', parameterName: 'dictcatalog' }, { pathName: 'dictcatalogs', parameterName: 'dictcatalog' },
{ pathName: 'dictoptions', parameterName: 'dictoption' }, { pathName: 'dictoptions', parameterName: 'dictoption' },
{ pathName: 'editview', parameterName: 'editview' }, { pathName: 'grideditview', parameterName: 'grideditview' },
], ],
requireAuth: true, requireAuth: true,
}, },
component: () => import('@pages/dict/dict-option-edit-view/dict-option-edit-view.vue'), component: () => import('@pages/dict/dict-option-grid-edit-view/dict-option-grid-edit-view.vue'),
}, },
{ {
path: 'dictoptions/:dictoption?/editview/:editview?', path: 'dictoptions/:dictoption?/grideditview/:grideditview?',
meta: { meta: {
caption: 'entities.dictoption.views.editview.caption', caption: 'entities.dictoption.views.grideditview.caption',
info:'', info:'',
parameters: [ parameters: [
{ pathName: 'appindexview', parameterName: 'appindexview' }, { pathName: 'appindexview', parameterName: 'appindexview' },
{ pathName: 'dictoptions', parameterName: 'dictoption' }, { pathName: 'dictoptions', parameterName: 'dictoption' },
{ pathName: 'editview', parameterName: 'editview' }, { pathName: 'grideditview', parameterName: 'grideditview' },
], ],
requireAuth: true, requireAuth: true,
}, },
component: () => import('@pages/dict/dict-option-edit-view/dict-option-edit-view.vue'), component: () => import('@pages/dict/dict-option-grid-edit-view/dict-option-grid-edit-view.vue'),
}, },
{ {
path: 'dictcatalogs/:dictcatalog?/pickupgridview/:pickupgridview?', path: 'dictcatalogs/:dictcatalog?/pickupgridview/:pickupgridview?',
...@@ -79,27 +79,42 @@ const router = new Router({ ...@@ -79,27 +79,42 @@ const router = new Router({
component: () => import('@pages/dict/dict-catalog-pickup-grid-view/dict-catalog-pickup-grid-view.vue'), component: () => import('@pages/dict/dict-catalog-pickup-grid-view/dict-catalog-pickup-grid-view.vue'),
}, },
{ {
path: 'dictcatalogs/:dictcatalog?/dictoptions/:dictoption?/gridview/:gridview?', path: 'dictcatalogs/:dictcatalog?/dictoptions/:dictoption?/editview/:editview?',
meta: { meta: {
caption: 'entities.dictoption.views.gridview.caption', caption: 'entities.dictoption.views.editview.caption',
info:'', info:'',
parameters: [ parameters: [
{ pathName: 'appindexview', parameterName: 'appindexview' }, { pathName: 'appindexview', parameterName: 'appindexview' },
{ pathName: 'dictcatalogs', parameterName: 'dictcatalog' }, { pathName: 'dictcatalogs', parameterName: 'dictcatalog' },
{ pathName: 'dictoptions', parameterName: 'dictoption' }, { pathName: 'dictoptions', parameterName: 'dictoption' },
{ pathName: 'gridview', parameterName: 'gridview' }, { pathName: 'editview', parameterName: 'editview' },
], ],
requireAuth: true, requireAuth: true,
}, },
component: () => import('@pages/dict/dict-option-grid-view/dict-option-grid-view.vue'), component: () => import('@pages/dict/dict-option-edit-view/dict-option-edit-view.vue'),
}, },
{ {
path: 'dictoptions/:dictoption?/gridview/:gridview?', path: 'dictoptions/:dictoption?/editview/:editview?',
meta: {
caption: 'entities.dictoption.views.editview.caption',
info:'',
parameters: [
{ pathName: 'appindexview', parameterName: 'appindexview' },
{ pathName: 'dictoptions', parameterName: 'dictoption' },
{ pathName: 'editview', parameterName: 'editview' },
],
requireAuth: true,
},
component: () => import('@pages/dict/dict-option-edit-view/dict-option-edit-view.vue'),
},
{
path: 'dictcatalogs/:dictcatalog?/dictoptions/:dictoption?/gridview/:gridview?',
meta: { meta: {
caption: 'entities.dictoption.views.gridview.caption', caption: 'entities.dictoption.views.gridview.caption',
info:'', info:'',
parameters: [ parameters: [
{ pathName: 'appindexview', parameterName: 'appindexview' }, { pathName: 'appindexview', parameterName: 'appindexview' },
{ pathName: 'dictcatalogs', parameterName: 'dictcatalog' },
{ pathName: 'dictoptions', parameterName: 'dictoption' }, { pathName: 'dictoptions', parameterName: 'dictoption' },
{ pathName: 'gridview', parameterName: 'gridview' }, { pathName: 'gridview', parameterName: 'gridview' },
], ],
...@@ -108,33 +123,32 @@ const router = new Router({ ...@@ -108,33 +123,32 @@ const router = new Router({
component: () => import('@pages/dict/dict-option-grid-view/dict-option-grid-view.vue'), component: () => import('@pages/dict/dict-option-grid-view/dict-option-grid-view.vue'),
}, },
{ {
path: 'dictcatalogs/:dictcatalog?/dictoptions/:dictoption?/grideditview/:grideditview?', path: 'dictoptions/:dictoption?/gridview/:gridview?',
meta: { meta: {
caption: 'entities.dictoption.views.grideditview.caption', caption: 'entities.dictoption.views.gridview.caption',
info:'', info:'',
parameters: [ parameters: [
{ pathName: 'appindexview', parameterName: 'appindexview' }, { pathName: 'appindexview', parameterName: 'appindexview' },
{ pathName: 'dictcatalogs', parameterName: 'dictcatalog' },
{ pathName: 'dictoptions', parameterName: 'dictoption' }, { pathName: 'dictoptions', parameterName: 'dictoption' },
{ pathName: 'grideditview', parameterName: 'grideditview' }, { pathName: 'gridview', parameterName: 'gridview' },
], ],
requireAuth: true, requireAuth: true,
}, },
component: () => import('@pages/dict/dict-option-grid-edit-view/dict-option-grid-edit-view.vue'), component: () => import('@pages/dict/dict-option-grid-view/dict-option-grid-view.vue'),
}, },
{ {
path: 'dictoptions/:dictoption?/grideditview/:grideditview?', path: 'dictcatalogs/:dictcatalog?/gridview/:gridview?',
meta: { meta: {
caption: 'entities.dictoption.views.grideditview.caption', caption: 'entities.dictcatalog.views.gridview.caption',
info:'', info:'',
parameters: [ parameters: [
{ pathName: 'appindexview', parameterName: 'appindexview' }, { pathName: 'appindexview', parameterName: 'appindexview' },
{ pathName: 'dictoptions', parameterName: 'dictoption' }, { pathName: 'dictcatalogs', parameterName: 'dictcatalog' },
{ pathName: 'grideditview', parameterName: 'grideditview' }, { pathName: 'gridview', parameterName: 'gridview' },
], ],
requireAuth: true, requireAuth: true,
}, },
component: () => import('@pages/dict/dict-option-grid-edit-view/dict-option-grid-edit-view.vue'), component: () => import('@pages/dict/dict-catalog-grid-view/dict-catalog-grid-view.vue'),
}, },
{ {
path: 'dictcatalogs/:dictcatalog?/pickupview/:pickupview?', path: 'dictcatalogs/:dictcatalog?/pickupview/:pickupview?',
...@@ -164,43 +178,43 @@ const router = new Router({ ...@@ -164,43 +178,43 @@ const router = new Router({
}, },
component: () => import('@pages/dict/dict-catalog-edit-view/dict-catalog-edit-view.vue'), component: () => import('@pages/dict/dict-catalog-edit-view/dict-catalog-edit-view.vue'),
}, },
...indexRoutes,
],
},
{ {
path: 'dictcatalogs/:dictcatalog?/gridview/:gridview?', path: '/dictcatalogs/:dictcatalog?/dictoptions/:dictoption?/editview/:editview?',
meta: { meta: {
caption: 'entities.dictcatalog.views.gridview.caption', caption: 'entities.dictoption.views.editview.caption',
info:'', info:'',
parameters: [ parameters: [
{ pathName: 'appindexview', parameterName: 'appindexview' },
{ pathName: 'dictcatalogs', parameterName: 'dictcatalog' }, { pathName: 'dictcatalogs', parameterName: 'dictcatalog' },
{ pathName: 'gridview', parameterName: 'gridview' }, { pathName: 'dictoptions', parameterName: 'dictoption' },
{ pathName: 'editview', parameterName: 'editview' },
], ],
requireAuth: true, requireAuth: true,
}, },
component: () => import('@pages/dict/dict-catalog-grid-view/dict-catalog-grid-view.vue'), component: () => import('@pages/dict/dict-option-edit-view/dict-option-edit-view.vue'),
},
...indexRoutes,
],
}, },
{ {
path: '/dictcatalogs/:dictcatalog?/dictoptions/:dictoption?/gridview/:gridview?', path: '/dictoptions/:dictoption?/editview/:editview?',
meta: { meta: {
caption: 'entities.dictoption.views.gridview.caption', caption: 'entities.dictoption.views.editview.caption',
info:'', info:'',
parameters: [ parameters: [
{ pathName: 'dictcatalogs', parameterName: 'dictcatalog' },
{ pathName: 'dictoptions', parameterName: 'dictoption' }, { pathName: 'dictoptions', parameterName: 'dictoption' },
{ pathName: 'gridview', parameterName: 'gridview' }, { pathName: 'editview', parameterName: 'editview' },
], ],
requireAuth: true, requireAuth: true,
}, },
component: () => import('@pages/dict/dict-option-grid-view/dict-option-grid-view.vue'), component: () => import('@pages/dict/dict-option-edit-view/dict-option-edit-view.vue'),
}, },
{ {
path: '/dictoptions/:dictoption?/gridview/:gridview?', path: '/dictcatalogs/:dictcatalog?/dictoptions/:dictoption?/gridview/:gridview?',
meta: { meta: {
caption: 'entities.dictoption.views.gridview.caption', caption: 'entities.dictoption.views.gridview.caption',
info:'', info:'',
parameters: [ parameters: [
{ pathName: 'dictcatalogs', parameterName: 'dictcatalog' },
{ pathName: 'dictoptions', parameterName: 'dictoption' }, { pathName: 'dictoptions', parameterName: 'dictoption' },
{ pathName: 'gridview', parameterName: 'gridview' }, { pathName: 'gridview', parameterName: 'gridview' },
], ],
...@@ -209,17 +223,17 @@ const router = new Router({ ...@@ -209,17 +223,17 @@ const router = new Router({
component: () => import('@pages/dict/dict-option-grid-view/dict-option-grid-view.vue'), component: () => import('@pages/dict/dict-option-grid-view/dict-option-grid-view.vue'),
}, },
{ {
path: '/dictcatalogs/:dictcatalog?/pickupgridview/:pickupgridview?', path: '/dictoptions/:dictoption?/gridview/:gridview?',
meta: { meta: {
caption: 'entities.dictcatalog.views.pickupgridview.caption', caption: 'entities.dictoption.views.gridview.caption',
info:'', info:'',
parameters: [ parameters: [
{ pathName: 'dictcatalogs', parameterName: 'dictcatalog' }, { pathName: 'dictoptions', parameterName: 'dictoption' },
{ pathName: 'pickupgridview', parameterName: 'pickupgridview' }, { pathName: 'gridview', parameterName: 'gridview' },
], ],
requireAuth: true, requireAuth: true,
}, },
component: () => import('@pages/dict/dict-catalog-pickup-grid-view/dict-catalog-pickup-grid-view.vue'), component: () => import('@pages/dict/dict-option-grid-view/dict-option-grid-view.vue'),
}, },
{ {
path: '/dictcatalogs/:dictcatalog?/dictoptions/:dictoption?/grideditview/:grideditview?', path: '/dictcatalogs/:dictcatalog?/dictoptions/:dictoption?/grideditview/:grideditview?',
...@@ -262,31 +276,30 @@ const router = new Router({ ...@@ -262,31 +276,30 @@ const router = new Router({
component: () => import('@pages/dict/dict-catalog-grid-view/dict-catalog-grid-view.vue'), component: () => import('@pages/dict/dict-catalog-grid-view/dict-catalog-grid-view.vue'),
}, },
{ {
path: '/dictcatalogs/:dictcatalog?/dictoptions/:dictoption?/editview/:editview?', path: '/dictcatalogs/:dictcatalog?/pickupgridview/:pickupgridview?',
meta: { meta: {
caption: 'entities.dictoption.views.editview.caption', caption: 'entities.dictcatalog.views.pickupgridview.caption',
info:'', info:'',
parameters: [ parameters: [
{ pathName: 'dictcatalogs', parameterName: 'dictcatalog' }, { pathName: 'dictcatalogs', parameterName: 'dictcatalog' },
{ pathName: 'dictoptions', parameterName: 'dictoption' }, { pathName: 'pickupgridview', parameterName: 'pickupgridview' },
{ pathName: 'editview', parameterName: 'editview' },
], ],
requireAuth: true, requireAuth: true,
}, },
component: () => import('@pages/dict/dict-option-edit-view/dict-option-edit-view.vue'), component: () => import('@pages/dict/dict-catalog-pickup-grid-view/dict-catalog-pickup-grid-view.vue'),
}, },
{ {
path: '/dictoptions/:dictoption?/editview/:editview?', path: '/dictcatalogs/:dictcatalog?/pickupview/:pickupview?',
meta: { meta: {
caption: 'entities.dictoption.views.editview.caption', caption: 'entities.dictcatalog.views.pickupview.caption',
info:'', info:'',
parameters: [ parameters: [
{ pathName: 'dictoptions', parameterName: 'dictoption' }, { pathName: 'dictcatalogs', parameterName: 'dictcatalog' },
{ pathName: 'editview', parameterName: 'editview' }, { pathName: 'pickupview', parameterName: 'pickupview' },
], ],
requireAuth: true, requireAuth: true,
}, },
component: () => import('@pages/dict/dict-option-edit-view/dict-option-edit-view.vue'), component: () => import('@pages/dict/dict-catalog-pickup-view/dict-catalog-pickup-view.vue'),
}, },
{ {
path: '/dictcatalogs/:dictcatalog?/editview/:editview?', path: '/dictcatalogs/:dictcatalog?/editview/:editview?',
...@@ -300,19 +313,6 @@ const router = new Router({ ...@@ -300,19 +313,6 @@ const router = new Router({
requireAuth: true, requireAuth: true,
}, },
component: () => import('@pages/dict/dict-catalog-edit-view/dict-catalog-edit-view.vue'), component: () => import('@pages/dict/dict-catalog-edit-view/dict-catalog-edit-view.vue'),
},
{
path: '/dictcatalogs/:dictcatalog?/pickupview/:pickupview?',
meta: {
caption: 'entities.dictcatalog.views.pickupview.caption',
info:'',
parameters: [
{ pathName: 'dictcatalogs', parameterName: 'dictcatalog' },
{ pathName: 'pickupview', parameterName: 'pickupview' },
],
requireAuth: true,
},
component: () => import('@pages/dict/dict-catalog-pickup-view/dict-catalog-pickup-view.vue'),
}, },
...globalRoutes, ...globalRoutes,
{ {
......
app_web/src/pages/dict/dict-catalog-edit-view/dict-catalog-edit-view-base.vue
浏览文件 @ f49bd8e5
...@@ -213,7 +213,7 @@ export default class DictCatalogEditViewBase extends Vue { ...@@ -213,7 +213,7 @@ export default class DictCatalogEditViewBase extends Vue {
* @type {string} * @type {string}
* @memberof DictCatalogEditViewBase * @memberof DictCatalogEditViewBase
*/ */
public viewtag: string = 'e294ce8c6557ca26a032efa08eeb5508'; public viewtag: string = 'aef11c4ae15f8255ee53623adf148f2a';
/** /**
* 自定义视图导航上下文集合 * 自定义视图导航上下文集合
......
app_web/src/pages/dict/dict-catalog-grid-view/dict-catalog-grid-view-base.vue
浏览文件 @ f49bd8e5
...@@ -236,7 +236,7 @@ export default class DictCatalogGridViewBase extends Vue { ...@@ -236,7 +236,7 @@ export default class DictCatalogGridViewBase extends Vue {
* @type {string} * @type {string}
* @memberof DictCatalogGridViewBase * @memberof DictCatalogGridViewBase
*/ */
public viewtag: string = '7395bd2cc14d34a67b772f13a50b2587'; public viewtag: string = '74a6ce3ddf610ce7fb201662c6d4b8da';
/** /**
* 自定义视图导航上下文集合 * 自定义视图导航上下文集合
......
app_web/src/pages/dict/dict-catalog-pickup-grid-view/dict-catalog-pickup-grid-view-base.vue
浏览文件 @ f49bd8e5
...@@ -140,7 +140,7 @@ export default class DictCatalogPickupGridViewBase extends Vue { ...@@ -140,7 +140,7 @@ export default class DictCatalogPickupGridViewBase extends Vue {
* @type {string} * @type {string}
* @memberof DictCatalogPickupGridViewBase * @memberof DictCatalogPickupGridViewBase
*/ */
public viewtag: string = '66f9c86e5a56857f977ef91461338255'; public viewtag: string = '842cfc03d5e93435fc52d317a55cdfd4';
/** /**
* 自定义视图导航上下文集合 * 自定义视图导航上下文集合
......
app_web/src/pages/dict/dict-catalog-pickup-view/dict-catalog-pickup-view-base.vue
浏览文件 @ f49bd8e5
...@@ -125,7 +125,7 @@ export default class DictCatalogPickupViewBase extends Vue { ...@@ -125,7 +125,7 @@ export default class DictCatalogPickupViewBase extends Vue {
* @type {string} * @type {string}
* @memberof DictCatalogPickupViewBase * @memberof DictCatalogPickupViewBase
*/ */
public viewtag: string = 'eb4772f75066d6c9eb26d8b01d4e16b7'; public viewtag: string = 'a9c82814d9bcd23dbf78c4c073759d7c';
/** /**
* 自定义视图导航上下文集合 * 自定义视图导航上下文集合
......
app_web/src/pages/dict/dict-option-edit-view/dict-option-edit-view-base.vue
浏览文件 @ f49bd8e5
...@@ -150,7 +150,7 @@ export default class DictOptionEditViewBase extends Vue { ...@@ -150,7 +150,7 @@ export default class DictOptionEditViewBase extends Vue {
* @type {string} * @type {string}
* @memberof DictOptionEditViewBase * @memberof DictOptionEditViewBase
*/ */
public viewtag: string = '8ad70084b5f98a26370b74da612d3f49'; public viewtag: string = '0986ae2314847b586b20edfbb40fc82b';
/** /**
* 自定义视图导航上下文集合 * 自定义视图导航上下文集合
......
app_web/src/pages/dict/dict-option-grid-edit-view/dict-option-grid-edit-view-base.vue
浏览文件 @ f49bd8e5
...@@ -223,7 +223,7 @@ export default class DictOptionGridEditViewBase extends Vue { ...@@ -223,7 +223,7 @@ export default class DictOptionGridEditViewBase extends Vue {
* @type {string} * @type {string}
* @memberof DictOptionGridEditViewBase * @memberof DictOptionGridEditViewBase
*/ */
public viewtag: string = '6aa3306d5c50039f771e4617a8a5cd64'; public viewtag: string = '44488f30cf90677019077ed9ad33628e';
/** /**
* 自定义视图导航上下文集合 * 自定义视图导航上下文集合
......
app_web/src/pages/dict/dict-option-grid-view/dict-option-grid-view-base.vue
浏览文件 @ f49bd8e5
...@@ -223,7 +223,7 @@ export default class DictOptionGridViewBase extends Vue { ...@@ -223,7 +223,7 @@ export default class DictOptionGridViewBase extends Vue {
* @type {string} * @type {string}
* @memberof DictOptionGridViewBase * @memberof DictOptionGridViewBase
*/ */
public viewtag: string = '56893daa82632caa84a6edeeb0acabaf'; public viewtag: string = '22e202992971f634c00e022b2cae335e';
/** /**
* 自定义视图导航上下文集合 * 自定义视图导航上下文集合
......
app_web/src/store/modules/view-action/state.ts
浏览文件 @ f49bd8e5
...@@ -4,85 +4,85 @@ ...@@ -4,85 +4,85 @@
export const viewstate: any = { export const viewstate: any = {
appviews: [ appviews: [
{ {
viewtag: '56893daa82632caa84a6edeeb0acabaf', viewtag: '0986ae2314847b586b20edfbb40fc82b',
viewmodule: 'dict', viewmodule: 'dict',
viewname: 'DictOptionGridView', viewname: 'DictOptionEditView',
viewaction: '', viewaction: '',
viewdatachange: false, viewdatachange: false,
refviews: [ refviews: [
'8ad70084b5f98a26370b74da612d3f49', 'a9c82814d9bcd23dbf78c4c073759d7c',
'eb4772f75066d6c9eb26d8b01d4e16b7',
], ],
}, },
{ {
viewtag: '66f9c86e5a56857f977ef91461338255', viewtag: '22e202992971f634c00e022b2cae335e',
viewmodule: 'dict', viewmodule: 'dict',
viewname: 'DictCatalogPickupGridView', viewname: 'DictOptionGridView',
viewaction: '', viewaction: '',
viewdatachange: false, viewdatachange: false,
refviews: [ refviews: [
'0986ae2314847b586b20edfbb40fc82b',
'a9c82814d9bcd23dbf78c4c073759d7c',
], ],
}, },
{ {
viewtag: '6aa3306d5c50039f771e4617a8a5cd64', viewtag: '44488f30cf90677019077ed9ad33628e',
viewmodule: 'dict', viewmodule: 'dict',
viewname: 'DictOptionGridEditView', viewname: 'DictOptionGridEditView',
viewaction: '', viewaction: '',
viewdatachange: false, viewdatachange: false,
refviews: [ refviews: [
'8ad70084b5f98a26370b74da612d3f49', '0986ae2314847b586b20edfbb40fc82b',
'eb4772f75066d6c9eb26d8b01d4e16b7', 'a9c82814d9bcd23dbf78c4c073759d7c',
], ],
}, },
{ {
viewtag: '7395bd2cc14d34a67b772f13a50b2587', viewtag: '74a6ce3ddf610ce7fb201662c6d4b8da',
viewmodule: 'dict', viewmodule: 'dict',
viewname: 'DictCatalogGridView', viewname: 'DictCatalogGridView',
viewaction: '', viewaction: '',
viewdatachange: false, viewdatachange: false,
refviews: [ refviews: [
'e294ce8c6557ca26a032efa08eeb5508', 'aef11c4ae15f8255ee53623adf148f2a',
], ],
}, },
{ {
viewtag: '8ad70084b5f98a26370b74da612d3f49', viewtag: '842cfc03d5e93435fc52d317a55cdfd4',
viewmodule: 'dict', viewmodule: 'dict',
viewname: 'DictOptionEditView', viewname: 'DictCatalogPickupGridView',
viewaction: '', viewaction: '',
viewdatachange: false, viewdatachange: false,
refviews: [ refviews: [
'eb4772f75066d6c9eb26d8b01d4e16b7',
], ],
}, },
{ {
viewtag: 'D394F269-6F97-4ED7-AFE8-F4A2E09BA602', viewtag: 'a9c82814d9bcd23dbf78c4c073759d7c',
viewmodule: 'dict', viewmodule: 'dict',
viewname: 'AppIndexView', viewname: 'DictCatalogPickupView',
viewaction: '', viewaction: '',
viewdatachange: false, viewdatachange: false,
refviews: [ refviews: [
'56893daa82632caa84a6edeeb0acabaf', '842cfc03d5e93435fc52d317a55cdfd4',
'7395bd2cc14d34a67b772f13a50b2587',
], ],
}, },
{ {
viewtag: 'e294ce8c6557ca26a032efa08eeb5508', viewtag: 'aef11c4ae15f8255ee53623adf148f2a',
viewmodule: 'dict', viewmodule: 'dict',
viewname: 'DictCatalogEditView', viewname: 'DictCatalogEditView',
viewaction: '', viewaction: '',
viewdatachange: false, viewdatachange: false,
refviews: [ refviews: [
'6aa3306d5c50039f771e4617a8a5cd64', '44488f30cf90677019077ed9ad33628e',
], ],
}, },
{ {
viewtag: 'eb4772f75066d6c9eb26d8b01d4e16b7', viewtag: 'd28e2613c581adb940ff8c3469365646',
viewmodule: 'dict', viewmodule: 'dict',
viewname: 'DictCatalogPickupView', viewname: 'AppIndexView',
viewaction: '', viewaction: '',
viewdatachange: false, viewdatachange: false,
refviews: [ refviews: [
'66f9c86e5a56857f977ef91461338255', '22e202992971f634c00e022b2cae335e',
'74a6ce3ddf610ce7fb201662c6d4b8da',
], ],
}, },
], ],
......
app_web/src/styles/default.less
浏览文件 @ f49bd8e5
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
@import '../theme/blue.theme.less'; @import '../theme/blue.theme.less';
@import '../theme/dark-blue.theme.less'; @import '../theme/dark-blue.theme.less';
@import '../theme/default.theme.less'; @import '../theme/default.theme.less';
@import './app-code-list.less';
@import './var.css'; @import './var.css';
.ibiz-page-tag .tags-body .tags-container .ivu-tag.tag-is-active .ivu-tag-text { .ibiz-page-tag .tags-body .tags-container .ivu-tag.tag-is-active .ivu-tag-text {
......
app_web/src/template.html
浏览文件 @ f49bd8e5
...@@ -12,8 +12,6 @@ ...@@ -12,8 +12,6 @@
<strong>We're sorry but app doesn't work properly without JavaScript enabled. Please enable it to continue.</strong> <strong>We're sorry but app doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
</noscript> </noscript>
<div id="app"></div> <div id="app"></div>
<!-- <link rel="stylesheet" href="<%= BASE_URL %>assets/styles/loader.css"> <script src="./environments/environment.js"></script>
<div class="loader" id="app-loader"></div> -->
<!-- built files will be auto injected -->
</body> </body>
</html> </html>
app_web/src/uiservice/dict-catalog/dict-catalog-ui-service-base.ts
浏览文件 @ f49bd8e5
...@@ -89,10 +89,10 @@ export default class DictCatalogUIServiceBase extends UIService { ...@@ -89,10 +89,10 @@ export default class DictCatalogUIServiceBase extends UIService {
* @memberof DictCatalogUIServiceBase * @memberof DictCatalogUIServiceBase
*/ */
public initViewMap(){ public initViewMap(){
this.allViewMap.set(':',{viewname:'pickupgridview',srfappde:'dictcatalogs'});
this.allViewMap.set('MDATAVIEW:',{viewname:'gridview',srfappde:'dictcatalogs'}); this.allViewMap.set('MDATAVIEW:',{viewname:'gridview',srfappde:'dictcatalogs'});
this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'dictcatalogs'}); this.allViewMap.set(':',{viewname:'pickupgridview',srfappde:'dictcatalogs'});
this.allViewMap.set('PICKUPVIEW:',{viewname:'pickupview',srfappde:'dictcatalogs'}); this.allViewMap.set('PICKUPVIEW:',{viewname:'pickupview',srfappde:'dictcatalogs'});
this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'dictcatalogs'});
} }
/** /**
......
app_web/src/uiservice/dict-option/dict-option-ui-service-base.ts
浏览文件 @ f49bd8e5
...@@ -89,9 +89,9 @@ export default class DictOptionUIServiceBase extends UIService { ...@@ -89,9 +89,9 @@ export default class DictOptionUIServiceBase extends UIService {
* @memberof DictOptionUIServiceBase * @memberof DictOptionUIServiceBase
*/ */
public initViewMap(){ public initViewMap(){
this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'dictoptions'});
this.allViewMap.set('MDATAVIEW:',{viewname:'gridview',srfappde:'dictoptions'}); this.allViewMap.set('MDATAVIEW:',{viewname:'gridview',srfappde:'dictoptions'});
this.allViewMap.set(':',{viewname:'grideditview',srfappde:'dictoptions'}); this.allViewMap.set(':',{viewname:'grideditview',srfappde:'dictoptions'});
this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'dictoptions'});
} }
/** /**
......
app_web/src/utils/studio-action/StudioActionUtil.ts
浏览文件 @ f49bd8e5
...@@ -119,8 +119,12 @@ export class StudioActionUtil { ...@@ -119,8 +119,12 @@ export class StudioActionUtil {
}, '*'); }, '*');
Vue.prototype.$message.warning('请在已打开的配置平台查看!'); Vue.prototype.$message.warning('请在已打开的配置平台查看!');
} else { } else {
console.log(`${Environment.StudioUrl}?ov=${JSON.stringify(params)}#/common_slnindex/srfkeys=${Environment.SlnId}/sysdesign_psdevslnsysmodeltreeexpview/srfkey=${Environment.SysId}`); if(Environment.debugOpenMode === 'sln'){
this.studioWin = window.open(`${Environment.StudioUrl}?ov=${encodeURIComponent(JSON.stringify(params))}#/common_slnindex/srfkeys=${Environment.SlnId}/sysdesign_psdevslnsysmodeltreeexpview/srfkey=${Environment.SysId}`, '_blank'); console.log("打开sln未支持");
// this.studioWin = window.open(`${Environment.StudioUrl}?ov=${encodeURIComponent(JSON.stringify(params))}#/common_slnindex/srfkeys=${Environment.SlnId}/sysdesign_psdevslnsysmodeltreeexpview/srfkey=${Environment.SysId}`, '_blank');
}else{
this.studioWin = window.open(`${Environment.StudioUrl}?ov=${encodeURIComponent(JSON.stringify(params))}#/common_mosindex/srfkeys=${Environment.SysId}`, '_blank');
}
} }
} }
} }
......
app_web/src/utils/view-tool/view-tool.ts
浏览文件 @ f49bd8e5
...@@ -252,9 +252,10 @@ export class ViewTool { ...@@ -252,9 +252,10 @@ export class ViewTool {
* @memberof ViewTool * @memberof ViewTool
*/ */
public static calcActionItemAuthState(data:any,ActionModel:any,UIService:any){ public static calcActionItemAuthState(data:any,ActionModel:any,UIService:any){
let result: any[] = [];
for (const key in ActionModel) { for (const key in ActionModel) {
if (!ActionModel.hasOwnProperty(key)) { if (!ActionModel.hasOwnProperty(key)) {
return; return result;
} }
const _item = ActionModel[key]; const _item = ActionModel[key];
if(_item && _item['dataaccaction'] && UIService){ if(_item && _item['dataaccaction'] && UIService){
...@@ -282,7 +283,9 @@ export class ViewTool { ...@@ -282,7 +283,9 @@ export class ViewTool {
_item.visabled = true; _item.visabled = true;
_item.disabled = false; _item.disabled = false;
} }
result.push(dataActionResult);
} }
} }
return result;
} }
} }
\ No newline at end of file
app_web/src/widgets/app/app-index-view-appmenu/app-index-view-appmenu-base.vue
浏览文件 @ f49bd8e5
...@@ -504,12 +504,12 @@ export default class AppIndexViewBase extends Vue implements ControlInterface { ...@@ -504,12 +504,12 @@ export default class AppIndexViewBase extends Vue implements ControlInterface {
navDataService.removeNavData(this.viewtag); navDataService.removeNavData(this.viewtag);
} }
switch (item.appfunctag) { switch (item.appfunctag) {
case 'Auto1':
this.clickAuto1(item);
return;
case 'Auto2': case 'Auto2':
this.clickAuto2(item); this.clickAuto2(item);
return; return;
case 'Auto1':
this.clickAuto1(item);
return;
default: default:
console.warn('未指定应用功能'); console.warn('未指定应用功能');
} }
...@@ -518,17 +518,17 @@ export default class AppIndexViewBase extends Vue implements ControlInterface { ...@@ -518,17 +518,17 @@ export default class AppIndexViewBase extends Vue implements ControlInterface {
/** /**
* 目录 * 栏目
* *
* @param {*} [item={}] * @param {*} [item={}]
* @memberof AppIndexView * @memberof AppIndexView
*/ */
public clickAuto1(item: any = {}) { public clickAuto2(item: any = {}) {
const viewparam: any = {}; const viewparam: any = {};
Object.assign(viewparam, {}); Object.assign(viewparam, {});
const deResParameters: any[] = []; const deResParameters: any[] = [];
const parameters: any[] = [ const parameters: any[] = [
{ pathName: 'dictcatalogs', parameterName: 'dictcatalog' }, { pathName: 'dictoptions', parameterName: 'dictoption' },
{ pathName: 'gridview', parameterName: 'gridview' }, { pathName: 'gridview', parameterName: 'gridview' },
]; ];
const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam); const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam);
...@@ -541,17 +541,17 @@ export default class AppIndexViewBase extends Vue implements ControlInterface { ...@@ -541,17 +541,17 @@ export default class AppIndexViewBase extends Vue implements ControlInterface {
} }
/** /**
* 栏目 * 目录
* *
* @param {*} [item={}] * @param {*} [item={}]
* @memberof AppIndexView * @memberof AppIndexView
*/ */
public clickAuto2(item: any = {}) { public clickAuto1(item: any = {}) {
const viewparam: any = {}; const viewparam: any = {};
Object.assign(viewparam, {}); Object.assign(viewparam, {});
const deResParameters: any[] = []; const deResParameters: any[] = [];
const parameters: any[] = [ const parameters: any[] = [
{ pathName: 'dictoptions', parameterName: 'dictoption' }, { pathName: 'dictcatalogs', parameterName: 'dictcatalog' },
{ pathName: 'gridview', parameterName: 'gridview' }, { pathName: 'gridview', parameterName: 'gridview' },
]; ];
const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam); const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam);
......
app_web/src/widgets/app/app-index-view-appmenu/app-index-view-appmenu-model.ts
浏览文件 @ f49bd8e5
...@@ -15,7 +15,7 @@ export default class AppIndexViewModel { ...@@ -15,7 +15,7 @@ export default class AppIndexViewModel {
*/ */
public items: any[] = [ public items: any[] = [
{ {
id: '3F92DBA9-3532-49CD-A482-E9048A132684', id: '801bacb689744f3de00c39b84618cbf5',
name: 'menuitem1', name: 'menuitem1',
text: '目录', text: '目录',
type: 'MENUITEM', type: 'MENUITEM',
...@@ -34,7 +34,7 @@ export default class AppIndexViewModel { ...@@ -34,7 +34,7 @@ export default class AppIndexViewModel {
authtag:'web-AppIndexView-menuitem1', authtag:'web-AppIndexView-menuitem1',
}, },
{ {
id: '73B8AFA0-9EDB-4224-93B8-F8B7C4D01AE3', id: 'edcf745c76c1c398b5e5511586f4e4c8',
name: 'menuitem2', name: 'menuitem2',
text: '栏目', text: '栏目',
type: 'MENUITEM', type: 'MENUITEM',
......
app_web/src/widgets/dict-catalog/default-searchform/default-searchform-base.vue
浏览文件 @ f49bd8e5
...@@ -697,7 +697,7 @@ export default class DefaultBase extends Vue implements ControlInterface { ...@@ -697,7 +697,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
*/ */
public load(opt: any = {}): void { public load(opt: any = {}): void {
if(!this.loadAction){ if(!this.loadAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DictCatalogGridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DictCatalogPickupGridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
return; return;
} }
const arg: any = { ...opt }; const arg: any = { ...opt };
...@@ -733,7 +733,7 @@ export default class DefaultBase extends Vue implements ControlInterface { ...@@ -733,7 +733,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
*/ */
public loadDraft(opt: any = {},mode?:string): void { public loadDraft(opt: any = {},mode?:string): void {
if(!this.loaddraftAction){ if(!this.loaddraftAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DictCatalogGridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DictCatalogPickupGridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
return; return;
} }
const arg: any = { ...opt } ; const arg: any = { ...opt } ;
......
app_web/src/widgets/dict-catalog/main-form/main-form-base.vue
浏览文件 @ f49bd8e5
...@@ -114,6 +114,7 @@ import DictCatalogUIService from '@/uiservice/dict-catalog/dict-catalog-ui-servi ...@@ -114,6 +114,7 @@ import DictCatalogUIService from '@/uiservice/dict-catalog/dict-catalog-ui-servi
import { FormButtonModel, FormPageModel, FormItemModel, FormDRUIPartModel, FormPartModel, FormGroupPanelModel, FormIFrameModel, FormRowItemModel, FormTabPageModel, FormTabPanelModel, FormUserControlModel } from '@/model/form-detail'; import { FormButtonModel, FormPageModel, FormItemModel, FormDRUIPartModel, FormPartModel, FormGroupPanelModel, FormIFrameModel, FormRowItemModel, FormTabPageModel, FormTabPanelModel, FormUserControlModel } from '@/model/form-detail';
import { debounceTime, distinctUntilChanged } from 'rxjs/operators'; import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
import schema from 'async-validator'; import schema from 'async-validator';
import { Environment } from '@/environments/environment';
@Component({ @Component({
...@@ -960,6 +961,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -960,6 +961,7 @@ export default class MainBase extends Vue implements ControlInterface {
Object.assign(this.context,{dictcatalog:data.dictcatalog}) Object.assign(this.context,{dictcatalog:data.dictcatalog})
} }
this.setFormEnableCond(data); this.setFormEnableCond(data);
this.computeButtonState(data);
this.fillForm(data,action); this.fillForm(data,action);
this.oldData = {}; this.oldData = {};
Object.assign(this.oldData, JSON.parse(JSON.stringify(this.data))); Object.assign(this.oldData, JSON.parse(JSON.stringify(this.data)));
...@@ -1133,18 +1135,22 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1133,18 +1135,22 @@ export default class MainBase extends Vue implements ControlInterface {
* @memberof MainBase * @memberof MainBase
*/ */
public computeButtonState(data:any){ public computeButtonState(data:any){
if(Environment.enablePermissionValid){
let targetData:any = this.transformData(data); let targetData:any = this.transformData(data);
if(this.detailsModel && Object.keys(this.detailsModel).length >0){ if(this.detailsModel && Object.keys(this.detailsModel).length >0){
Object.keys(this.detailsModel).forEach((name:any) =>{ Object.keys(this.detailsModel).forEach((name:any) =>{
if(this.detailsModel[name] && this.detailsModel[name].uiaction && this.detailsModel[name].uiaction.dataaccaction && Object.is(this.detailsModel[name].detailType,"BUTTON")){ if(this.detailsModel[name] && this.detailsModel[name].uiaction && this.detailsModel[name].uiaction.dataaccaction && Object.is(this.detailsModel[name].detailType,"BUTTON")){
this.detailsModel[name].isPower = true;
let tempUIAction:any = JSON.parse(JSON.stringify(this.detailsModel[name].uiaction)); let tempUIAction:any = JSON.parse(JSON.stringify(this.detailsModel[name].uiaction));
ViewTool.calcActionItemAuthState(targetData,[tempUIAction],this.appUIService); let result: any[] = ViewTool.calcActionItemAuthState(targetData,[tempUIAction],this.appUIService);
this.detailsModel[name].visible = tempUIAction.visabled; this.detailsModel[name].visible = tempUIAction.visabled;
this.detailsModel[name].disabled = tempUIAction.disabled; this.detailsModel[name].disabled = tempUIAction.disabled;
this.detailsModel[name].isPower = result[0] === 1 ? true : false;
} }
}) })
} }
} }
}
...@@ -1209,7 +1215,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1209,7 +1215,7 @@ export default class MainBase extends Vue implements ControlInterface {
this.refresh(data); this.refresh(data);
} }
if (Object.is('panelaction', action)) { if (Object.is('panelaction', action)) {
this.panelAction(data.action,data.emitAction,data); this.panelAction(data.action,data.emitAction,data.data);
} }
}); });
} }
...@@ -1320,7 +1326,6 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1320,7 +1326,6 @@ export default class MainBase extends Vue implements ControlInterface {
const data = response.data; const data = response.data;
this.onFormLoad(data,'load'); this.onFormLoad(data,'load');
this.$emit('load', data); this.$emit('load', data);
this.computeButtonState(data);
this.$nextTick(() => { this.$nextTick(() => {
this.formState.next({ type: 'load', data: data }); this.formState.next({ type: 'load', data: data });
}); });
...@@ -1364,7 +1369,6 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1364,7 +1369,6 @@ export default class MainBase extends Vue implements ControlInterface {
this.onFormLoad(data,'loadDraft'); this.onFormLoad(data,'loadDraft');
data.dictcatalog = null; data.dictcatalog = null;
this.$emit('load', data); this.$emit('load', data);
this.computeButtonState(data);
this.$nextTick(() => { this.$nextTick(() => {
this.formState.next({ type: 'load', data: data }); this.formState.next({ type: 'load', data: data });
}); });
...@@ -1422,7 +1426,6 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1422,7 +1426,6 @@ export default class MainBase extends Vue implements ControlInterface {
const data = response.data; const data = response.data;
this.onFormLoad(data,'autoSave'); this.onFormLoad(data,'autoSave');
this.$emit('save', data); this.$emit('save', data);
this.computeButtonState(data);
AppCenterService.notifyMessage({name:"DictCatalog",action:'appRefresh',data:data}); AppCenterService.notifyMessage({name:"DictCatalog",action:'appRefresh',data:data});
this.$nextTick(() => { this.$nextTick(() => {
this.formState.next({ type: 'save', data: data }); this.formState.next({ type: 'save', data: data });
...@@ -1501,7 +1504,6 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1501,7 +1504,6 @@ export default class MainBase extends Vue implements ControlInterface {
const data = response.data; const data = response.data;
this.onFormLoad(data,'save'); this.onFormLoad(data,'save');
this.$emit('save', data); this.$emit('save', data);
this.computeButtonState(data);
AppCenterService.notifyMessage({name:"DictCatalog",action:'appRefresh',data:data}); AppCenterService.notifyMessage({name:"DictCatalog",action:'appRefresh',data:data});
this.$nextTick(() => { this.$nextTick(() => {
this.formState.next({ type: 'save', data: data }); this.formState.next({ type: 'save', data: data });
......
app_web/src/widgets/dict-catalog/main-form/main-form.less
浏览文件 @ f49bd8e5
...@@ -40,10 +40,14 @@ ...@@ -40,10 +40,14 @@
} }
} }
} }
// 表单行间距
.app-form{ .app-form{
// 表单行间距
.app-form-item{ .app-form-item{
margin-bottom: 20px; margin-bottom: 20px;
} }
// 表单按钮margin
.app-form-button{
margin:0 6px;
}
} }
// this is less // this is less
app_web/src/widgets/dict-catalog/main-grid/main-grid-base.vue
浏览文件 @ f49bd8e5
...@@ -135,6 +135,7 @@ import MainService from './main-grid-service'; ...@@ -135,6 +135,7 @@ import MainService from './main-grid-service';
import DictCatalogUIService from '@/uiservice/dict-catalog/dict-catalog-ui-service'; import DictCatalogUIService from '@/uiservice/dict-catalog/dict-catalog-ui-service';
import CodeListService from "@service/app/codelist-service"; import CodeListService from "@service/app/codelist-service";
import { FormItemModel } from '@/model/form-detail'; import { FormItemModel } from '@/model/form-detail';
import { Environment } from '@/environments/environment';
@Component({ @Component({
...@@ -318,20 +319,6 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -318,20 +319,6 @@ export default class MainBase extends Vue implements ControlInterface {
return this.selections[0]; return this.selections[0];
} }
/**
* 打开新建数据视图
*
* @type {any}
* @memberof MainBase
*/
@Prop() public newdata: any;
/**
* 打开编辑数据视图
*
* @type {any}
* @memberof MainBase
*/
@Prop() public opendata: any;
/** /**
* 是否嵌入关系界面 * 是否嵌入关系界面
...@@ -677,9 +664,11 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -677,9 +664,11 @@ export default class MainBase extends Vue implements ControlInterface {
* @memberof MainBase * @memberof MainBase
*/ */
public getActionState(data:any){ public getActionState(data:any){
let targetData:any = this.transformData(data);
let tempActionModel:any = JSON.parse(JSON.stringify(this.ActionModel)); let tempActionModel:any = JSON.parse(JSON.stringify(this.ActionModel));
if(Environment.enablePermissionValid){
let targetData:any = this.transformData(data);
ViewTool.calcActionItemAuthState(targetData,tempActionModel,this.appUIService); ViewTool.calcActionItemAuthState(targetData,tempActionModel,this.appUIService);
}
return tempActionModel; return tempActionModel;
} }
...@@ -769,7 +758,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -769,7 +758,7 @@ export default class MainBase extends Vue implements ControlInterface {
*/ */
public load(opt: any = {}, pageReset: boolean = false): void { public load(opt: any = {}, pageReset: boolean = false): void {
if(!this.fetchAction){ if(!this.fetchAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DictCatalogGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DictCatalogPickupGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
return; return;
} }
if(pageReset){ if(pageReset){
...@@ -849,7 +838,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -849,7 +838,7 @@ export default class MainBase extends Vue implements ControlInterface {
*/ */
public async remove(datas: any[]): Promise<any> { public async remove(datas: any[]): Promise<any> {
if(!this.removeAction){ if(!this.removeAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DictCatalogGridView'+(this.$t('app.gridpage.notConfig.removeAction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DictCatalogPickupGridView'+(this.$t('app.gridpage.notConfig.removeAction') as string) });
return; return;
} }
let _datas:any[] = []; let _datas:any[] = [];
...@@ -955,7 +944,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -955,7 +944,7 @@ export default class MainBase extends Vue implements ControlInterface {
*/ */
public addBatch(arg: any = {}): void { public addBatch(arg: any = {}): void {
if(!this.fetchAction){ if(!this.fetchAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DictCatalogGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DictCatalogPickupGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
return; return;
} }
if(!arg){ if(!arg){
...@@ -1517,7 +1506,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1517,7 +1506,7 @@ export default class MainBase extends Vue implements ControlInterface {
try { try {
if(Object.is(item.rowDataState, 'create')){ if(Object.is(item.rowDataState, 'create')){
if(!this.createAction){ if(!this.createAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DictCatalogGridView'+(this.$t('app.gridpage.notConfig.createAction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DictCatalogPickupGridView'+(this.$t('app.gridpage.notConfig.createAction') as string) });
}else{ }else{
Object.assign(item,{viewparams:this.viewparams}); Object.assign(item,{viewparams:this.viewparams});
let response = await this.service.add(this.createAction, JSON.parse(JSON.stringify(this.context)),item, this.showBusyIndicator); let response = await this.service.add(this.createAction, JSON.parse(JSON.stringify(this.context)),item, this.showBusyIndicator);
...@@ -1525,7 +1514,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1525,7 +1514,7 @@ export default class MainBase extends Vue implements ControlInterface {
} }
}else if(Object.is(item.rowDataState, 'update')){ }else if(Object.is(item.rowDataState, 'update')){
if(!this.updateAction){ if(!this.updateAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DictCatalogGridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DictCatalogPickupGridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
}else{ }else{
Object.assign(item,{viewparams:this.viewparams}); Object.assign(item,{viewparams:this.viewparams});
if(item.dictcatalog){ if(item.dictcatalog){
...@@ -1562,7 +1551,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1562,7 +1551,7 @@ export default class MainBase extends Vue implements ControlInterface {
*/ */
public newRow(args: any[], params?: any, $event?: any, xData?: any): void { public newRow(args: any[], params?: any, $event?: any, xData?: any): void {
if(!this.loaddraftAction){ if(!this.loaddraftAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DictCatalogGridView'+(this.$t('app.gridpage.notConfig.loaddraftAction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DictCatalogPickupGridView'+(this.$t('app.gridpage.notConfig.loaddraftAction') as string) });
return; return;
} }
let _this = this; let _this = this;
......
app_web/src/widgets/dict-option/main-form/main-form-base.vue
浏览文件 @ f49bd8e5
...@@ -205,6 +205,7 @@ import DictOptionUIService from '@/uiservice/dict-option/dict-option-ui-service' ...@@ -205,6 +205,7 @@ import DictOptionUIService from '@/uiservice/dict-option/dict-option-ui-service'
import { FormButtonModel, FormPageModel, FormItemModel, FormDRUIPartModel, FormPartModel, FormGroupPanelModel, FormIFrameModel, FormRowItemModel, FormTabPageModel, FormTabPanelModel, FormUserControlModel } from '@/model/form-detail'; import { FormButtonModel, FormPageModel, FormItemModel, FormDRUIPartModel, FormPartModel, FormGroupPanelModel, FormIFrameModel, FormRowItemModel, FormTabPageModel, FormTabPanelModel, FormUserControlModel } from '@/model/form-detail';
import { debounceTime, distinctUntilChanged } from 'rxjs/operators'; import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
import schema from 'async-validator'; import schema from 'async-validator';
import { Environment } from '@/environments/environment';
@Component({ @Component({
...@@ -1224,6 +1225,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1224,6 +1225,7 @@ export default class MainBase extends Vue implements ControlInterface {
Object.assign(this.context,{dictoption:data.dictoption}) Object.assign(this.context,{dictoption:data.dictoption})
} }
this.setFormEnableCond(data); this.setFormEnableCond(data);
this.computeButtonState(data);
this.fillForm(data,action); this.fillForm(data,action);
this.oldData = {}; this.oldData = {};
Object.assign(this.oldData, JSON.parse(JSON.stringify(this.data))); Object.assign(this.oldData, JSON.parse(JSON.stringify(this.data)));
...@@ -1397,18 +1399,22 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1397,18 +1399,22 @@ export default class MainBase extends Vue implements ControlInterface {
* @memberof MainBase * @memberof MainBase
*/ */
public computeButtonState(data:any){ public computeButtonState(data:any){
if(Environment.enablePermissionValid){
let targetData:any = this.transformData(data); let targetData:any = this.transformData(data);
if(this.detailsModel && Object.keys(this.detailsModel).length >0){ if(this.detailsModel && Object.keys(this.detailsModel).length >0){
Object.keys(this.detailsModel).forEach((name:any) =>{ Object.keys(this.detailsModel).forEach((name:any) =>{
if(this.detailsModel[name] && this.detailsModel[name].uiaction && this.detailsModel[name].uiaction.dataaccaction && Object.is(this.detailsModel[name].detailType,"BUTTON")){ if(this.detailsModel[name] && this.detailsModel[name].uiaction && this.detailsModel[name].uiaction.dataaccaction && Object.is(this.detailsModel[name].detailType,"BUTTON")){
this.detailsModel[name].isPower = true;
let tempUIAction:any = JSON.parse(JSON.stringify(this.detailsModel[name].uiaction)); let tempUIAction:any = JSON.parse(JSON.stringify(this.detailsModel[name].uiaction));
ViewTool.calcActionItemAuthState(targetData,[tempUIAction],this.appUIService); let result: any[] = ViewTool.calcActionItemAuthState(targetData,[tempUIAction],this.appUIService);
this.detailsModel[name].visible = tempUIAction.visabled; this.detailsModel[name].visible = tempUIAction.visabled;
this.detailsModel[name].disabled = tempUIAction.disabled; this.detailsModel[name].disabled = tempUIAction.disabled;
this.detailsModel[name].isPower = result[0] === 1 ? true : false;
} }
}) })
} }
} }
}
...@@ -1473,7 +1479,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1473,7 +1479,7 @@ export default class MainBase extends Vue implements ControlInterface {
this.refresh(data); this.refresh(data);
} }
if (Object.is('panelaction', action)) { if (Object.is('panelaction', action)) {
this.panelAction(data.action,data.emitAction,data); this.panelAction(data.action,data.emitAction,data.data);
} }
}); });
} }
...@@ -1584,7 +1590,6 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1584,7 +1590,6 @@ export default class MainBase extends Vue implements ControlInterface {
const data = response.data; const data = response.data;
this.onFormLoad(data,'load'); this.onFormLoad(data,'load');
this.$emit('load', data); this.$emit('load', data);
this.computeButtonState(data);
this.$nextTick(() => { this.$nextTick(() => {
this.formState.next({ type: 'load', data: data }); this.formState.next({ type: 'load', data: data });
}); });
...@@ -1628,7 +1633,6 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1628,7 +1633,6 @@ export default class MainBase extends Vue implements ControlInterface {
this.onFormLoad(data,'loadDraft'); this.onFormLoad(data,'loadDraft');
data.dictoption = null; data.dictoption = null;
this.$emit('load', data); this.$emit('load', data);
this.computeButtonState(data);
this.$nextTick(() => { this.$nextTick(() => {
this.formState.next({ type: 'load', data: data }); this.formState.next({ type: 'load', data: data });
}); });
...@@ -1686,7 +1690,6 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1686,7 +1690,6 @@ export default class MainBase extends Vue implements ControlInterface {
const data = response.data; const data = response.data;
this.onFormLoad(data,'autoSave'); this.onFormLoad(data,'autoSave');
this.$emit('save', data); this.$emit('save', data);
this.computeButtonState(data);
AppCenterService.notifyMessage({name:"DictOption",action:'appRefresh',data:data}); AppCenterService.notifyMessage({name:"DictOption",action:'appRefresh',data:data});
this.$nextTick(() => { this.$nextTick(() => {
this.formState.next({ type: 'save', data: data }); this.formState.next({ type: 'save', data: data });
...@@ -1765,7 +1768,6 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1765,7 +1768,6 @@ export default class MainBase extends Vue implements ControlInterface {
const data = response.data; const data = response.data;
this.onFormLoad(data,'save'); this.onFormLoad(data,'save');
this.$emit('save', data); this.$emit('save', data);
this.computeButtonState(data);
AppCenterService.notifyMessage({name:"DictOption",action:'appRefresh',data:data}); AppCenterService.notifyMessage({name:"DictOption",action:'appRefresh',data:data});
this.$nextTick(() => { this.$nextTick(() => {
this.formState.next({ type: 'save', data: data }); this.formState.next({ type: 'save', data: data });
......
app_web/src/widgets/dict-option/main-form/main-form.less
浏览文件 @ f49bd8e5
...@@ -40,10 +40,14 @@ ...@@ -40,10 +40,14 @@
} }
} }
} }
// 表单行间距
.app-form{ .app-form{
// 表单行间距
.app-form-item{ .app-form-item{
margin-bottom: 20px; margin-bottom: 20px;
} }
// 表单按钮margin
.app-form-button{
margin:0 6px;
}
} }
// this is less // this is less
app_web/src/widgets/dict-option/main-grid/main-grid-base.vue
浏览文件 @ f49bd8e5
...@@ -447,6 +447,7 @@ import MainService from './main-grid-service'; ...@@ -447,6 +447,7 @@ import MainService from './main-grid-service';
import DictOptionUIService from '@/uiservice/dict-option/dict-option-ui-service'; import DictOptionUIService from '@/uiservice/dict-option/dict-option-ui-service';
import CodeListService from "@service/app/codelist-service"; import CodeListService from "@service/app/codelist-service";
import { FormItemModel } from '@/model/form-detail'; import { FormItemModel } from '@/model/form-detail';
import { Environment } from '@/environments/environment';
@Component({ @Component({
...@@ -1053,9 +1054,11 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1053,9 +1054,11 @@ export default class MainBase extends Vue implements ControlInterface {
* @memberof MainBase * @memberof MainBase
*/ */
public getActionState(data:any){ public getActionState(data:any){
let targetData:any = this.transformData(data);
let tempActionModel:any = JSON.parse(JSON.stringify(this.ActionModel)); let tempActionModel:any = JSON.parse(JSON.stringify(this.ActionModel));
if(Environment.enablePermissionValid){
let targetData:any = this.transformData(data);
ViewTool.calcActionItemAuthState(targetData,tempActionModel,this.appUIService); ViewTool.calcActionItemAuthState(targetData,tempActionModel,this.appUIService);
}
return tempActionModel; return tempActionModel;
} }
......
app_web/src/widgets/dict-option/options-grid/options-grid-base.vue
浏览文件 @ f49bd8e5
...@@ -435,6 +435,7 @@ import OptionsService from './options-grid-service'; ...@@ -435,6 +435,7 @@ import OptionsService from './options-grid-service';
import DictOptionUIService from '@/uiservice/dict-option/dict-option-ui-service'; import DictOptionUIService from '@/uiservice/dict-option/dict-option-ui-service';
import CodeListService from "@service/app/codelist-service"; import CodeListService from "@service/app/codelist-service";
import { FormItemModel } from '@/model/form-detail'; import { FormItemModel } from '@/model/form-detail';
import { Environment } from '@/environments/environment';
@Component({ @Component({
...@@ -1033,9 +1034,11 @@ export default class OptionsBase extends Vue implements ControlInterface { ...@@ -1033,9 +1034,11 @@ export default class OptionsBase extends Vue implements ControlInterface {
* @memberof OptionsBase * @memberof OptionsBase
*/ */
public getActionState(data:any){ public getActionState(data:any){
let targetData:any = this.transformData(data);
let tempActionModel:any = JSON.parse(JSON.stringify(this.ActionModel)); let tempActionModel:any = JSON.parse(JSON.stringify(this.ActionModel));
if(Environment.enablePermissionValid){
let targetData:any = this.transformData(data);
ViewTool.calcActionItemAuthState(targetData,tempActionModel,this.appUIService); ViewTool.calcActionItemAuthState(targetData,tempActionModel,this.appUIService);
}
return tempActionModel; return tempActionModel;
} }
......
ibzdict-app/ibzdict-app-web/pom.xml
浏览文件 @ f49bd8e5
...@@ -21,9 +21,6 @@ ...@@ -21,9 +21,6 @@
</dependency> </dependency>
</dependencies> </dependencies>
<properties>
<docker.image.prefix>registry.cn-shanghai.aliyuncs.com/ibizsys</docker.image.prefix>
</properties>
<profiles> <profiles>
...@@ -98,23 +95,6 @@ ...@@ -98,23 +95,6 @@
</executions> </executions>
</plugin> </plugin>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>0.4.13</version>
<configuration>
<serverId>ibiz-dev</serverId>
<imageName>${docker.image.prefix}/${project.artifactId}:latest</imageName>
<dockerDirectory>${project.basedir}/src/main/docker</dockerDirectory>
<resources>
<resource>
<targetPath>/</targetPath>
<directory>../../</directory>
<include>${project.artifactId}.jar</include>
</resource>
</resources>
</configuration>
</plugin>
</plugins> </plugins>
</build> </build>
</profile> </profile>
......
ibzdict-app/ibzdict-app-web/src/main/resources/application-web-prod.yml
浏览文件 @ f49bd8e5
server: server:
port: 30004 port: 8080
#Log配置 #Log配置
logging: logging:
level: level:
...@@ -39,6 +39,10 @@ zuul: ...@@ -39,6 +39,10 @@ zuul:
path: /dictionarys/**/Ibzou** path: /dictionarys/**/Ibzou**
serviceId: ${ibiz.ref.service.ou:ibzou-api} serviceId: ${ibiz.ref.service.ou:ibzou-api}
stripPrefix: false stripPrefix: false
ou:
path: /ibzdepartments/**
serviceId: ${ibiz.ref.service.ou:ibzou-api}
stripPrefix: false
uaadict: uaadict:
path: /dictionarys/**/SysOperator path: /dictionarys/**/SysOperator
serviceId: ${ibiz.ref.service.uaa:ibzuaa-api} serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
......
ibzdict-boot/src/main/resources/application-dev.yml
浏览文件 @ f49bd8e5
...@@ -28,6 +28,10 @@ zuul: ...@@ -28,6 +28,10 @@ zuul:
path: /dictionarys/**/Ibzou** path: /dictionarys/**/Ibzou**
serviceId: ${ibiz.ref.service.ou:ibzou-api} serviceId: ${ibiz.ref.service.ou:ibzou-api}
stripPrefix: false stripPrefix: false
ou:
path: /ibzdepartments/**
serviceId: ${ibiz.ref.service.ou:ibzou-api}
stripPrefix: false
uaadict: uaadict:
path: /dictionarys/**/SysOperator path: /dictionarys/**/SysOperator
serviceId: ${ibiz.ref.service.uaa:ibzuaa-api} serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
......
ibzdict-core/src/main/java/cn/ibizlab/core/dict/service/IDictCatalogService.java
浏览文件 @ f49bd8e5
...@@ -11,6 +11,7 @@ import java.math.BigInteger; ...@@ -11,6 +11,7 @@ import java.math.BigInteger;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import org.springframework.scheduling.annotation.Async;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.CacheEvict;
......
ibzdict-core/src/main/java/cn/ibizlab/core/dict/service/IDictOptionService.java
浏览文件 @ f49bd8e5
...@@ -11,6 +11,7 @@ import java.math.BigInteger; ...@@ -11,6 +11,7 @@ import java.math.BigInteger;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import org.springframework.scheduling.annotation.Async;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.CacheEvict;
......
ibzdict-core/src/main/java/cn/ibizlab/core/dict/service/impl/DictCatalogServiceImpl.java
浏览文件 @ f49bd8e5
...@@ -21,6 +21,7 @@ import org.springframework.data.domain.Page; ...@@ -21,6 +21,7 @@ import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.context.annotation.Lazy; import org.springframework.context.annotation.Lazy;
import cn.ibizlab.core.dict.domain.DictCatalog; import cn.ibizlab.core.dict.domain.DictCatalog;
......
ibzdict-core/src/main/java/cn/ibizlab/core/dict/service/impl/DictOptionServiceImpl.java
浏览文件 @ f49bd8e5
...@@ -21,6 +21,7 @@ import org.springframework.data.domain.Page; ...@@ -21,6 +21,7 @@ import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.context.annotation.Lazy; import org.springframework.context.annotation.Lazy;
import cn.ibizlab.core.dict.domain.DictOption; import cn.ibizlab.core.dict.domain.DictOption;
......
ibzdict-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ f49bd8e5
<?xml version="1.1" encoding="UTF-8" standalone="no"?> !!!!模版产生代码错误:----
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd"> Tip: If the failing expression is known to be legally refer to something that's sometimes null or missing, either specify a default value like myOptionalVar!myDefault, or use <#if myOptionalVar??>when-present<#else>when-missing</#if>. (These only cover the last step of the expression; to cover the whole expression, use parenthesis: (myOptionalVar.foo)!myDefault, (myOptionalVar.foo)??
----
----
<!--输出实体[DICT_CATALOG]数据结构 --> FTL stack trace ("~" means nesting-related):
<changeSet author="a_A_5d9d78509" id="tab-dict_catalog-69-1"> - Failed at: ${dbinst.getUserName()} [in template "CODETEMPL_en_US" at line 28, column 24]
<createTable tableName="IBZDICTCATALOG"> ----
<column name="CID" remarks="" type="VARCHAR(100)"> \ No newline at end of file
<constraints primaryKey="true" primaryKeyName="PK_DICT_CATALOG_CID"/>
</column>
<column name="CCODE" remarks="" type="VARCHAR(100)">
</column>
<column name="CNAME" remarks="" type="VARCHAR(100)">
</column>
<column name="CGROUP" remarks="" type="VARCHAR(100)">
</column>
<column name="MEMO" remarks="" type="VARCHAR(255)">
</column>
<column name="ENABLE" remarks="" type="INT">
</column>
<column name="UPDATEDATE" remarks="" type="DATETIME">
</column>
</createTable>
</changeSet>
<!--输出实体[DICT_OPTION]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-dict_option-95-2">
<createTable tableName="IBZDICTOPTION">
<column name="VKEY" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DICT_OPTION_VKEY"/>
</column>
<column name="CID" remarks="" type="VARCHAR(100)">
</column>
<column name="CNAME" remarks="" type="VARCHAR(100)">
</column>
<column name="VAL" remarks="" type="VARCHAR(40)">
</column>
<column name="LABEL" remarks="" type="VARCHAR(100)">
</column>
<column name="PVAL" remarks="" type="VARCHAR(40)">
</column>
<column name="VFILTER" remarks="" type="VARCHAR(500)">
</column>
<column name="CLS" remarks="" type="VARCHAR(500)">
</column>
<column name="ICONCLS" remarks="" type="VARCHAR(255)">
</column>
<column name="DISABLED" remarks="" type="INT">
</column>
<column name="EXPIRED" remarks="" type="INT">
</column>
<column name="SHOWORDER" remarks="" type="INT">
</column>
<column name="EXTENSION" remarks="" type="VARCHAR(1000)">
</column>
<column name="UPDATEDATE" remarks="" type="DATETIME">
</column>
</createTable>
</changeSet>
<!--输出实体[DICT_CATALOG]外键关系 -->
<!--输出实体[DICT_OPTION]外键关系 -->
<changeSet author="a_A_5d9d78509" id="fk-dict_option-95-3">
<addForeignKeyConstraint baseColumnNames="CID" baseTableName="IBZDICTOPTION" constraintName="DER1N_DICT_OPTION_DICT_CATALOG" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="CID" referencedTableName="IBZDICTCATALOG" validate="true"/>
</changeSet>
</databaseChangeLog>
ibzdict-dependencies/pom.xml
浏览文件 @ f49bd8e5
...@@ -86,8 +86,6 @@ ...@@ -86,8 +86,6 @@
<!-- 阿里seata分布式事务 --> <!-- 阿里seata分布式事务 -->
<alibaba-seata.version>1.3.0</alibaba-seata.version> <alibaba-seata.version>1.3.0</alibaba-seata.version>
<oracle.version>11.2.0.3</oracle.version>
<postgresql.version>42.2.6</postgresql.version>
</properties> </properties>
...@@ -332,18 +330,6 @@ ...@@ -332,18 +330,6 @@
<version>${eureka-client.version}</version> <version>${eureka-client.version}</version>
</dependency> </dependency>
<!-- Oracle驱动包 -->
<dependency>
<groupId>com.oracle</groupId>
<artifactId>ojdbc6</artifactId>
<version>${oracle.version}</version>
</dependency>
<!-- PostgreSQL驱动包 -->
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>${postgresql.version}</version>
</dependency>
<!-- MySQL驱动包 --> <!-- MySQL驱动包 -->
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>mysql</groupId>
......
ibzdict-provider/ibzdict-provider-api/pom.xml
浏览文件 @ f49bd8e5
...@@ -21,9 +21,6 @@ ...@@ -21,9 +21,6 @@
</dependency> </dependency>
</dependencies> </dependencies>
<properties>
<docker.image.prefix>registry.cn-shanghai.aliyuncs.com/ibizsys</docker.image.prefix>
</properties>
<profiles> <profiles>
<profile> <profile>
...@@ -57,23 +54,6 @@ ...@@ -57,23 +54,6 @@
</executions> </executions>
</plugin> </plugin>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>0.4.13</version>
<configuration>
<serverId>ibiz-dev</serverId>
<imageName>${docker.image.prefix}/${project.artifactId}:latest</imageName>
<dockerDirectory>${project.basedir}/src/main/docker</dockerDirectory>
<resources>
<resource>
<targetPath>/</targetPath>
<directory>../../</directory>
<include>${project.artifactId}.jar</include>
</resource>
</resources>
</configuration>
</plugin>
</plugins> </plugins>
</build> </build>
</profile> </profile>
......
ibzdict-provider/ibzdict-provider-api/src/main/java/cn/ibizlab/api/rest/DictCatalogResource.java
浏览文件 @ f49bd8e5
...@@ -11,7 +11,6 @@ import com.alibaba.fastjson.JSONObject; ...@@ -11,7 +11,6 @@ import com.alibaba.fastjson.JSONObject;
import javax.servlet.ServletRequest; import javax.servlet.ServletRequest;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cglib.beans.BeanCopier; import org.springframework.cglib.beans.BeanCopier;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
...@@ -50,7 +49,6 @@ public class DictCatalogResource { ...@@ -50,7 +49,6 @@ public class DictCatalogResource {
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzdict-DictCatalog-Create-all')") @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzdict-DictCatalog-Create-all')")
@ApiOperation(value = "新建字典", tags = {"字典" }, notes = "新建字典") @ApiOperation(value = "新建字典", tags = {"字典" }, notes = "新建字典")
@RequestMapping(method = RequestMethod.POST, value = "/dictcatalogs") @RequestMapping(method = RequestMethod.POST, value = "/dictcatalogs")
@Transactional
public ResponseEntity<DictCatalogDTO> create(@RequestBody DictCatalogDTO dictcatalogdto) { public ResponseEntity<DictCatalogDTO> create(@RequestBody DictCatalogDTO dictcatalogdto) {
DictCatalog domain = dictcatalogMapping.toDomain(dictcatalogdto); DictCatalog domain = dictcatalogMapping.toDomain(dictcatalogdto);
dictcatalogService.create(domain); dictcatalogService.create(domain);
...@@ -70,7 +68,6 @@ public class DictCatalogResource { ...@@ -70,7 +68,6 @@ public class DictCatalogResource {
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzdict-DictCatalog-Update-all')") @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzdict-DictCatalog-Update-all')")
@ApiOperation(value = "更新字典", tags = {"字典" }, notes = "更新字典") @ApiOperation(value = "更新字典", tags = {"字典" }, notes = "更新字典")
@RequestMapping(method = RequestMethod.PUT, value = "/dictcatalogs/{dictcatalog_id}") @RequestMapping(method = RequestMethod.PUT, value = "/dictcatalogs/{dictcatalog_id}")
@Transactional
public ResponseEntity<DictCatalogDTO> update(@PathVariable("dictcatalog_id") String dictcatalog_id, @RequestBody DictCatalogDTO dictcatalogdto) { public ResponseEntity<DictCatalogDTO> update(@PathVariable("dictcatalog_id") String dictcatalog_id, @RequestBody DictCatalogDTO dictcatalogdto) {
DictCatalog domain = dictcatalogMapping.toDomain(dictcatalogdto); DictCatalog domain = dictcatalogMapping.toDomain(dictcatalogdto);
domain .setId(dictcatalog_id); domain .setId(dictcatalog_id);
...@@ -90,7 +87,6 @@ public class DictCatalogResource { ...@@ -90,7 +87,6 @@ public class DictCatalogResource {
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzdict-DictCatalog-Remove-all')") @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzdict-DictCatalog-Remove-all')")
@ApiOperation(value = "删除字典", tags = {"字典" }, notes = "删除字典") @ApiOperation(value = "删除字典", tags = {"字典" }, notes = "删除字典")
@RequestMapping(method = RequestMethod.DELETE, value = "/dictcatalogs/{dictcatalog_id}") @RequestMapping(method = RequestMethod.DELETE, value = "/dictcatalogs/{dictcatalog_id}")
@Transactional
public ResponseEntity<Boolean> remove(@PathVariable("dictcatalog_id") String dictcatalog_id) { public ResponseEntity<Boolean> remove(@PathVariable("dictcatalog_id") String dictcatalog_id) {
return ResponseEntity.status(HttpStatus.OK).body(dictcatalogService.remove(dictcatalog_id)); return ResponseEntity.status(HttpStatus.OK).body(dictcatalogService.remove(dictcatalog_id));
} }
......
ibzdict-provider/ibzdict-provider-api/src/main/java/cn/ibizlab/api/rest/DictOptionResource.java
浏览文件 @ f49bd8e5
...@@ -11,7 +11,6 @@ import com.alibaba.fastjson.JSONObject; ...@@ -11,7 +11,6 @@ import com.alibaba.fastjson.JSONObject;
import javax.servlet.ServletRequest; import javax.servlet.ServletRequest;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cglib.beans.BeanCopier; import org.springframework.cglib.beans.BeanCopier;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
...@@ -50,7 +49,6 @@ public class DictOptionResource { ...@@ -50,7 +49,6 @@ public class DictOptionResource {
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzdict-DictOption-Create-all')") @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzdict-DictOption-Create-all')")
@ApiOperation(value = "新建字典项", tags = {"字典项" }, notes = "新建字典项") @ApiOperation(value = "新建字典项", tags = {"字典项" }, notes = "新建字典项")
@RequestMapping(method = RequestMethod.POST, value = "/dictoptions") @RequestMapping(method = RequestMethod.POST, value = "/dictoptions")
@Transactional
public ResponseEntity<DictOptionDTO> create(@RequestBody DictOptionDTO dictoptiondto) { public ResponseEntity<DictOptionDTO> create(@RequestBody DictOptionDTO dictoptiondto) {
DictOption domain = dictoptionMapping.toDomain(dictoptiondto); DictOption domain = dictoptionMapping.toDomain(dictoptiondto);
dictoptionService.create(domain); dictoptionService.create(domain);
...@@ -70,7 +68,6 @@ public class DictOptionResource { ...@@ -70,7 +68,6 @@ public class DictOptionResource {
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzdict-DictOption-Update-all')") @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzdict-DictOption-Update-all')")
@ApiOperation(value = "更新字典项", tags = {"字典项" }, notes = "更新字典项") @ApiOperation(value = "更新字典项", tags = {"字典项" }, notes = "更新字典项")
@RequestMapping(method = RequestMethod.PUT, value = "/dictoptions/{dictoption_id}") @RequestMapping(method = RequestMethod.PUT, value = "/dictoptions/{dictoption_id}")
@Transactional
public ResponseEntity<DictOptionDTO> update(@PathVariable("dictoption_id") String dictoption_id, @RequestBody DictOptionDTO dictoptiondto) { public ResponseEntity<DictOptionDTO> update(@PathVariable("dictoption_id") String dictoption_id, @RequestBody DictOptionDTO dictoptiondto) {
DictOption domain = dictoptionMapping.toDomain(dictoptiondto); DictOption domain = dictoptionMapping.toDomain(dictoptiondto);
domain .setValueKey(dictoption_id); domain .setValueKey(dictoption_id);
...@@ -90,7 +87,6 @@ public class DictOptionResource { ...@@ -90,7 +87,6 @@ public class DictOptionResource {
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzdict-DictOption-Remove-all')") @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzdict-DictOption-Remove-all')")
@ApiOperation(value = "删除字典项", tags = {"字典项" }, notes = "删除字典项") @ApiOperation(value = "删除字典项", tags = {"字典项" }, notes = "删除字典项")
@RequestMapping(method = RequestMethod.DELETE, value = "/dictoptions/{dictoption_id}") @RequestMapping(method = RequestMethod.DELETE, value = "/dictoptions/{dictoption_id}")
@Transactional
public ResponseEntity<Boolean> remove(@PathVariable("dictoption_id") String dictoption_id) { public ResponseEntity<Boolean> remove(@PathVariable("dictoption_id") String dictoption_id) {
return ResponseEntity.status(HttpStatus.OK).body(dictoptionService.remove(dictoption_id)); return ResponseEntity.status(HttpStatus.OK).body(dictoptionService.remove(dictoption_id));
} }
...@@ -163,7 +159,6 @@ public class DictOptionResource { ...@@ -163,7 +159,6 @@ public class DictOptionResource {
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzdict-DictOption-Create-all')") @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzdict-DictOption-Create-all')")
@ApiOperation(value = "根据字典建立字典项", tags = {"字典项" }, notes = "根据字典建立字典项") @ApiOperation(value = "根据字典建立字典项", tags = {"字典项" }, notes = "根据字典建立字典项")
@RequestMapping(method = RequestMethod.POST, value = "/dictcatalogs/{dictcatalog_id}/dictoptions") @RequestMapping(method = RequestMethod.POST, value = "/dictcatalogs/{dictcatalog_id}/dictoptions")
@Transactional
public ResponseEntity<DictOptionDTO> createByDictCatalog(@PathVariable("dictcatalog_id") String dictcatalog_id, @RequestBody DictOptionDTO dictoptiondto) { public ResponseEntity<DictOptionDTO> createByDictCatalog(@PathVariable("dictcatalog_id") String dictcatalog_id, @RequestBody DictOptionDTO dictoptiondto) {
DictOption domain = dictoptionMapping.toDomain(dictoptiondto); DictOption domain = dictoptionMapping.toDomain(dictoptiondto);
domain.setCatalogId(dictcatalog_id); domain.setCatalogId(dictcatalog_id);
...@@ -188,7 +183,6 @@ public class DictOptionResource { ...@@ -188,7 +183,6 @@ public class DictOptionResource {
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzdict-DictOption-Update-all')") @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzdict-DictOption-Update-all')")
@ApiOperation(value = "根据字典更新字典项", tags = {"字典项" }, notes = "根据字典更新字典项") @ApiOperation(value = "根据字典更新字典项", tags = {"字典项" }, notes = "根据字典更新字典项")
@RequestMapping(method = RequestMethod.PUT, value = "/dictcatalogs/{dictcatalog_id}/dictoptions/{dictoption_id}") @RequestMapping(method = RequestMethod.PUT, value = "/dictcatalogs/{dictcatalog_id}/dictoptions/{dictoption_id}")
@Transactional
public ResponseEntity<DictOptionDTO> updateByDictCatalog(@PathVariable("dictcatalog_id") String dictcatalog_id, @PathVariable("dictoption_id") String dictoption_id, @RequestBody DictOptionDTO dictoptiondto) { public ResponseEntity<DictOptionDTO> updateByDictCatalog(@PathVariable("dictcatalog_id") String dictcatalog_id, @PathVariable("dictoption_id") String dictoption_id, @RequestBody DictOptionDTO dictoptiondto) {
DictOption domain = dictoptionMapping.toDomain(dictoptiondto); DictOption domain = dictoptionMapping.toDomain(dictoptiondto);
domain.setCatalogId(dictcatalog_id); domain.setCatalogId(dictcatalog_id);
...@@ -213,7 +207,6 @@ public class DictOptionResource { ...@@ -213,7 +207,6 @@ public class DictOptionResource {
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzdict-DictOption-Remove-all')") @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzdict-DictOption-Remove-all')")
@ApiOperation(value = "根据字典删除字典项", tags = {"字典项" }, notes = "根据字典删除字典项") @ApiOperation(value = "根据字典删除字典项", tags = {"字典项" }, notes = "根据字典删除字典项")
@RequestMapping(method = RequestMethod.DELETE, value = "/dictcatalogs/{dictcatalog_id}/dictoptions/{dictoption_id}") @RequestMapping(method = RequestMethod.DELETE, value = "/dictcatalogs/{dictcatalog_id}/dictoptions/{dictoption_id}")
@Transactional
public ResponseEntity<Boolean> removeByDictCatalog(@PathVariable("dictcatalog_id") String dictcatalog_id, @PathVariable("dictoption_id") String dictoption_id) { public ResponseEntity<Boolean> removeByDictCatalog(@PathVariable("dictcatalog_id") String dictcatalog_id, @PathVariable("dictoption_id") String dictoption_id) {
return ResponseEntity.status(HttpStatus.OK).body(dictoptionService.remove(dictoption_id)); return ResponseEntity.status(HttpStatus.OK).body(dictoptionService.remove(dictoption_id));
} }
......
ibzdict-provider/ibzdict-provider-api/src/main/resources/application-api-prod.yml
浏览文件 @ f49bd8e5
server: server:
port: 40004 port: 8081
#Log配置 #Log配置
logging: logging:
level: level:
......
ibzdict-util/src/main/java/cn/ibizlab/util/security/AuthorizationTokenFilter.java
浏览文件 @ f49bd8e5
...@@ -60,7 +60,7 @@ public class AuthorizationTokenFilter extends OncePerRequestFilter { ...@@ -60,7 +60,7 @@ public class AuthorizationTokenFilter extends OncePerRequestFilter {
if (authTokenUtil.validateToken(authToken, userDetails)) { if (authTokenUtil.validateToken(authToken, userDetails)) {
UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken(userDetails, null, userDetails.getAuthorities()); UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken(userDetails, null, userDetails.getAuthorities());
authentication.setDetails(new WebAuthenticationDetailsSource().buildDetails(request)); authentication.setDetails(new WebAuthenticationDetailsSource().buildDetails(request));
log.info("authorizated user '{}', setting security context", username); // log.info("authorizated user '{}', setting security context", username);
SecurityContextHolder.getContext().setAuthentication(authentication); SecurityContextHolder.getContext().setAuthentication(authentication);
} }
} }
......
ibzdict-util/src/main/resources/application-nacos.yml
浏览文件 @ f49bd8e5
...@@ -3,7 +3,7 @@ spring: ...@@ -3,7 +3,7 @@ spring:
cloud: cloud:
nacos: nacos:
discovery: discovery:
server-addr: 172.16.102.211:8848 server-addr: 127.0.0.1:8848
enabled: true enabled: true
eureka: eureka:
......
ibzdict-util/src/main/resources/application-sys.yml
浏览文件 @ f49bd8e5
...@@ -7,7 +7,7 @@ spring: ...@@ -7,7 +7,7 @@ spring:
caffeine: caffeine:
spec: initialCapacity=5,maximumSize=500,expireAfterWrite=3600s spec: initialCapacity=5,maximumSize=500,expireAfterWrite=3600s
redis: redis:
host: 172.16.100.243 host: 127.0.0.1
port: 6379 port: 6379
password: password:
database: 0 database: 0
...@@ -22,9 +22,9 @@ spring: ...@@ -22,9 +22,9 @@ spring:
max-file-size: 100MB max-file-size: 100MB
max-request-size: 100MB max-request-size: 100MB
datasource: datasource:
username: a_A_5d9d78509 username: root
password: '@6dEfb3@' password: 'root'
url: jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true url: jdbc:mysql://127.0.0.1:3306/ibzdict?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
driver-class-name: com.mysql.jdbc.Driver driver-class-name: com.mysql.jdbc.Driver
filters: stat,wall,log4j2 filters: stat,wall,log4j2
#配置初始化大小/最小/最大 #配置初始化大小/最小/最大
...@@ -45,7 +45,7 @@ spring: ...@@ -45,7 +45,7 @@ spring:
pool-prepared-statements: false pool-prepared-statements: false
max-pool-prepared-statement-per-connection-size: 20 max-pool-prepared-statement-per-connection-size: 20
isSyncDBSchema: false isSyncDBSchema: false
defaultSchema: a_A_5d9d78509 defaultSchema: root
conf: classpath:liquibase/master.xml conf: classpath:liquibase/master.xml
#Mybatis-plus配置 #Mybatis-plus配置
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或