Skip to content

I
ibzlite
提交 9fa650c5 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

zhouweidong 发布系统代码 [ibz-lite，应用]

上级 eb6dc02b
展开全部 隐藏空白字符变更
内嵌 并排
正在显示 包含 2054 行增加 和 221 行删除
app_web/public/assets/json/view-config.json
浏览文件 @ 9fa650c5
......@@ -143,12 +143,12 @@
"viewname": "MetaRelationshipEditView",
"viewtag": "3c4651b0fddbda6565cce70dbada576a"
},
"metadynamicmodelusr2gridview": {
"title": "动态模型表格视图",
"caption": "动态模型实体表格视图（副本）",
"metadynamicmodeldynainstgridview": {
"title": "副本",
"caption": "副本",
"viewtype": "DEGRIDVIEW",
"viewmodule": "lite",
"viewname": "MetaDynamicModelUsr2GridView",
"viewname": "MetaDynamicModelDynaInstGridView",
"viewtag": "409f7ea81d15d2e2f1ee295d189d965b"
},
"metarelationshippickupgridview": {
......
app_web/src/locale/lanres/entities/meta-dynamic-model/meta-dynamic-model_BO_CN_base.ts
浏览文件 @ 9fa650c5
......@@ -3,22 +3,22 @@ import commonLogic from '@/locale/logic/common/common-logic';
function getLocaleResourceBase(){
const data:any = {
fields: {
dynainstid: commonLogic.appcommonhandle("动态实例标识",null),
dynainstid: commonLogic.appcommonhandle("动态实例",null),
status: commonLogic.appcommonhandle("状态",null),
modelfile: commonLogic.appcommonhandle("文件",null),
configname: commonLogic.appcommonhandle("名称",null),
configid: commonLogic.appcommonhandle("ID",null),
system_id: commonLogic.appcommonhandle("系统标识",null),
pdynainstid: commonLogic.appcommonhandle("ID",null),
configname: commonLogic.appcommonhandle("配置名称",null),
configid: commonLogic.appcommonhandle("配置标识",null),
system_id: commonLogic.appcommonhandle("系统",null),
pdynainstid: commonLogic.appcommonhandle("父实例",null),
},
views: {
editview: {
caption: commonLogic.appcommonhandle("动态模型",null),
title: commonLogic.appcommonhandle("动态模型编辑视图",null),
},
usr2gridview: {
caption: commonLogic.appcommonhandle("动态模型实体表格视图（副本）",null),
title: commonLogic.appcommonhandle("动态模型表格视图",null),
dynainstgridview: {
caption: commonLogic.appcommonhandle("副本",null),
title: commonLogic.appcommonhandle("副本",null),
},
gridview: {
caption: commonLogic.appcommonhandle("动态模型",null),
......@@ -32,27 +32,25 @@ function getLocaleResourceBase(){
group1: commonLogic.appcommonhandle("动态模型基本信息",null),
formpage1: commonLogic.appcommonhandle("基本信息",null),
srforikey: commonLogic.appcommonhandle("",null),
srfkey: commonLogic.appcommonhandle("ID",null),
srfmajortext: commonLogic.appcommonhandle("名称",null),
srfkey: commonLogic.appcommonhandle("配置标识",null),
srfmajortext: commonLogic.appcommonhandle("配置名称",null),
srftempmode: commonLogic.appcommonhandle("",null),
srfuf: commonLogic.appcommonhandle("",null),
srfdeid: commonLogic.appcommonhandle("",null),
srfsourcekey: commonLogic.appcommonhandle("",null),
configname: commonLogic.appcommonhandle("名称",null),
configname: commonLogic.appcommonhandle("配置名称",null),
formitem: commonLogic.appcommonhandle("文件",null),
configid: commonLogic.appcommonhandle("ID",null),
configid: commonLogic.appcommonhandle("配置标识",null),
},
uiactions: {
},
},
main_grid: {
columns: {
configid: commonLogic.appcommonhandle("ID",null),
dynainstid: commonLogic.appcommonhandle("动态实例标识",null),
configname: commonLogic.appcommonhandle("名称",null),
systemid: commonLogic.appcommonhandle("系统标识",null),
configname: commonLogic.appcommonhandle("配置名称",null),
systemid: commonLogic.appcommonhandle("系统",null),
dynainstid: commonLogic.appcommonhandle("动态实例",null),
status: commonLogic.appcommonhandle("状态",null),
pdynainstid: commonLogic.appcommonhandle("父ID",null),
},
nodata:commonLogic.appcommonhandle("",null),
uiactions: {
......@@ -131,7 +129,7 @@ function getLocaleResourceBase(){
tip: commonLogic.appcommonhandle("帮助",null),
},
},
usr2gridviewtoolbar_toolbar: {
dynainstgridviewtoolbar_toolbar: {
tbitem3: {
caption: commonLogic.appcommonhandle("新建",null),
tip: commonLogic.appcommonhandle("新建",null),
......
app_web/src/locale/lanres/entities/meta-dynamic-model/meta-dynamic-model_en_US_base.ts
浏览文件 @ 9fa650c5
......@@ -3,22 +3,22 @@ import commonLogic from '@/locale/logic/common/common-logic';
function getLocaleResourceBase(){
const data:any = {
fields: {
dynainstid: commonLogic.appcommonhandle("动态实例标识",null),
dynainstid: commonLogic.appcommonhandle("动态实例",null),
status: commonLogic.appcommonhandle("状态",null),
modelfile: commonLogic.appcommonhandle("文件",null),
configname: commonLogic.appcommonhandle("名称",null),
configid: commonLogic.appcommonhandle("ID",null),
system_id: commonLogic.appcommonhandle("系统标识",null),
pdynainstid: commonLogic.appcommonhandle("ID",null),
configname: commonLogic.appcommonhandle("配置名称",null),
configid: commonLogic.appcommonhandle("配置标识",null),
system_id: commonLogic.appcommonhandle("系统",null),
pdynainstid: commonLogic.appcommonhandle("父实例",null),
},
views: {
editview: {
caption: commonLogic.appcommonhandle("动态模型",null),
title: commonLogic.appcommonhandle("动态模型编辑视图",null),
},
usr2gridview: {
caption: commonLogic.appcommonhandle("动态模型实体表格视图（副本）",null),
title: commonLogic.appcommonhandle("动态模型表格视图",null),
dynainstgridview: {
caption: commonLogic.appcommonhandle("副本",null),
title: commonLogic.appcommonhandle("副本",null),
},
gridview: {
caption: commonLogic.appcommonhandle("动态模型",null),
......@@ -32,27 +32,25 @@ function getLocaleResourceBase(){
group1: commonLogic.appcommonhandle("动态模型基本信息",null),
formpage1: commonLogic.appcommonhandle("基本信息",null),
srforikey: commonLogic.appcommonhandle("",null),
srfkey: commonLogic.appcommonhandle("ID",null),
srfmajortext: commonLogic.appcommonhandle("名称",null),
srfkey: commonLogic.appcommonhandle("配置标识",null),
srfmajortext: commonLogic.appcommonhandle("配置名称",null),
srftempmode: commonLogic.appcommonhandle("",null),
srfuf: commonLogic.appcommonhandle("",null),
srfdeid: commonLogic.appcommonhandle("",null),
srfsourcekey: commonLogic.appcommonhandle("",null),
configname: commonLogic.appcommonhandle("名称",null),
configname: commonLogic.appcommonhandle("配置名称",null),
formitem: commonLogic.appcommonhandle("文件",null),
configid: commonLogic.appcommonhandle("ID",null),
configid: commonLogic.appcommonhandle("配置标识",null),
},
uiactions: {
},
},
main_grid: {
columns: {
configid: commonLogic.appcommonhandle("ID",null),
dynainstid: commonLogic.appcommonhandle("动态实例标识",null),
configname: commonLogic.appcommonhandle("名称",null),
systemid: commonLogic.appcommonhandle("系统标识",null),
configname: commonLogic.appcommonhandle("配置名称",null),
systemid: commonLogic.appcommonhandle("系统",null),
dynainstid: commonLogic.appcommonhandle("动态实例",null),
status: commonLogic.appcommonhandle("状态",null),
pdynainstid: commonLogic.appcommonhandle("父ID",null),
},
nodata:commonLogic.appcommonhandle("",null),
uiactions: {
......@@ -131,7 +129,7 @@ function getLocaleResourceBase(){
tip: commonLogic.appcommonhandle("Help",null),
},
},
usr2gridviewtoolbar_toolbar: {
dynainstgridviewtoolbar_toolbar: {
tbitem3: {
caption: commonLogic.appcommonhandle("New",null),
tip: commonLogic.appcommonhandle("New",null),
......
app_web/src/locale/lanres/entities/meta-dynamic-model/meta-dynamic-model_zh_CN_base.ts
浏览文件 @ 9fa650c5
......@@ -3,22 +3,22 @@ import commonLogic from '@/locale/logic/common/common-logic';
function getLocaleResourceBase(){
const data:any = {
fields: {
dynainstid: commonLogic.appcommonhandle("动态实例标识",null),
dynainstid: commonLogic.appcommonhandle("动态实例",null),
status: commonLogic.appcommonhandle("状态",null),
modelfile: commonLogic.appcommonhandle("文件",null),
configname: commonLogic.appcommonhandle("名称",null),
configid: commonLogic.appcommonhandle("ID",null),
system_id: commonLogic.appcommonhandle("系统标识",null),
pdynainstid: commonLogic.appcommonhandle("ID",null),
configname: commonLogic.appcommonhandle("配置名称",null),
configid: commonLogic.appcommonhandle("配置标识",null),
system_id: commonLogic.appcommonhandle("系统",null),
pdynainstid: commonLogic.appcommonhandle("父实例",null),
},
views: {
editview: {
caption: commonLogic.appcommonhandle("动态模型",null),
title: commonLogic.appcommonhandle("动态模型编辑视图",null),
},
usr2gridview: {
caption: commonLogic.appcommonhandle("动态模型实体表格视图（副本）",null),
title: commonLogic.appcommonhandle("动态模型表格视图",null),
dynainstgridview: {
caption: commonLogic.appcommonhandle("副本",null),
title: commonLogic.appcommonhandle("副本",null),
},
gridview: {
caption: commonLogic.appcommonhandle("动态模型",null),
......@@ -32,27 +32,25 @@ function getLocaleResourceBase(){
group1: commonLogic.appcommonhandle("动态模型基本信息",null),
formpage1: commonLogic.appcommonhandle("基本信息",null),
srforikey: commonLogic.appcommonhandle("",null),
srfkey: commonLogic.appcommonhandle("ID",null),
srfmajortext: commonLogic.appcommonhandle("名称",null),
srfkey: commonLogic.appcommonhandle("配置标识",null),
srfmajortext: commonLogic.appcommonhandle("配置名称",null),
srftempmode: commonLogic.appcommonhandle("",null),
srfuf: commonLogic.appcommonhandle("",null),
srfdeid: commonLogic.appcommonhandle("",null),
srfsourcekey: commonLogic.appcommonhandle("",null),
configname: commonLogic.appcommonhandle("名称",null),
configname: commonLogic.appcommonhandle("配置名称",null),
formitem: commonLogic.appcommonhandle("文件",null),
configid: commonLogic.appcommonhandle("ID",null),
configid: commonLogic.appcommonhandle("配置标识",null),
},
uiactions: {
},
},
main_grid: {
columns: {
configid: commonLogic.appcommonhandle("ID",null),
dynainstid: commonLogic.appcommonhandle("动态实例标识",null),
configname: commonLogic.appcommonhandle("名称",null),
systemid: commonLogic.appcommonhandle("系统标识",null),
configname: commonLogic.appcommonhandle("配置名称",null),
systemid: commonLogic.appcommonhandle("系统",null),
dynainstid: commonLogic.appcommonhandle("动态实例",null),
status: commonLogic.appcommonhandle("状态",null),
pdynainstid: commonLogic.appcommonhandle("父ID",null),
},
nodata:commonLogic.appcommonhandle("",null),
uiactions: {
......@@ -131,7 +129,7 @@ function getLocaleResourceBase(){
tip: commonLogic.appcommonhandle("帮助",null),
},
},
usr2gridviewtoolbar_toolbar: {
dynainstgridviewtoolbar_toolbar: {
tbitem3: {
caption: commonLogic.appcommonhandle("新建",null),
tip: commonLogic.appcommonhandle("新建",null),
......
app_web/src/mock/viewconfig/viewconfig.ts
浏览文件 @ 9fa650c5
......@@ -151,12 +151,12 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewname": "MetaRelationshipEditView",
"viewtag": "3c4651b0fddbda6565cce70dbada576a"
},
"metadynamicmodelusr2gridview": {
"title": "动态模型表格视图",
"caption": "动态模型实体表格视图（副本）",
"metadynamicmodeldynainstgridview": {
"title": "副本",
"caption": "副本",
"viewtype": "DEGRIDVIEW",
"viewmodule": "lite",
"viewname": "MetaDynamicModelUsr2GridView",
"viewname": "MetaDynamicModelDynaInstGridView",
"viewtag": "409f7ea81d15d2e2f1ee295d189d965b"
},
"metarelationshippickupgridview": {
......
app_web/src/pages/lite/lite-index/page-register.ts
浏览文件 @ 9fa650c5
......@@ -15,7 +15,7 @@ export const PageComponents = {
Vue.component('dst-view-edit-view', () => import('@pages/lite/dst-view-edit-view/dst-view-edit-view.vue'));
Vue.component('meta-entity-pickup-view', () => import('@pages/lite/meta-entity-pickup-view/meta-entity-pickup-view.vue'));
Vue.component('dst-config-edit-view', () => import('@pages/lite/dst-config-edit-view/dst-config-edit-view.vue'));
Vue.component('meta-dynamic-model-usr2-grid-view', () => import('@pages/lite/meta-dynamic-model-usr2-grid-view/meta-dynamic-model-usr2-grid-view.vue'));
Vue.component('meta-dynamic-model-dyna-inst-grid-view', () => import('@pages/lite/meta-dynamic-model-dyna-inst-grid-view/meta-dynamic-model-dyna-inst-grid-view.vue'));
Vue.component('meta-data-set-edit-view', () => import('@pages/lite/meta-data-set-edit-view/meta-data-set-edit-view.vue'));
Vue.component('meta-model-grid-view', () => import('@pages/lite/meta-model-grid-view/meta-model-grid-view.vue'));
Vue.component('meta-module-pickup-view', () => import('@pages/lite/meta-module-pickup-view/meta-module-pickup-view.vue'));
......
app_web/src/pages/lite/lite-index/router.ts
浏览文件 @ 9fa650c5
......@@ -446,18 +446,18 @@ const router = new Router({
component: () => import('@pages/lite/dst-config-edit-view/dst-config-edit-view.vue'),
},
{
path: 'metadynamicmodels/:metadynamicmodel?/usr2gridview/:usr2gridview?',
path: 'metadynamicmodels/:metadynamicmodel?/dynainstgridview/:dynainstgridview?',
meta: {
caption: 'entities.metadynamicmodel.views.usr2gridview.caption',
caption: 'entities.metadynamicmodel.views.dynainstgridview.caption',
info:'',
parameters: [
{ pathName: 'liteindex', parameterName: 'liteindex' },
{ pathName: 'metadynamicmodels', parameterName: 'metadynamicmodel' },
{ pathName: 'usr2gridview', parameterName: 'usr2gridview' },
{ pathName: 'dynainstgridview', parameterName: 'dynainstgridview' },
],
requireAuth: true,
},
component: () => import('@pages/lite/meta-dynamic-model-usr2-grid-view/meta-dynamic-model-usr2-grid-view.vue'),
component: () => import('@pages/lite/meta-dynamic-model-dyna-inst-grid-view/meta-dynamic-model-dyna-inst-grid-view.vue'),
},
{
path: 'dstsystems/:dstsystem?/metaentities/:metaentity?/metadatasets/:metadataset?/editview/:editview?',
......@@ -1872,17 +1872,17 @@ const router = new Router({
component: () => import('@pages/lite/meta-relationship-edit-view/meta-relationship-edit-view.vue'),
},
{
path: '/metadynamicmodels/:metadynamicmodel?/usr2gridview/:usr2gridview?',
path: '/metadynamicmodels/:metadynamicmodel?/dynainstgridview/:dynainstgridview?',
meta: {
caption: 'entities.metadynamicmodel.views.usr2gridview.caption',
caption: 'entities.metadynamicmodel.views.dynainstgridview.caption',
info:'',
parameters: [
{ pathName: 'metadynamicmodels', parameterName: 'metadynamicmodel' },
{ pathName: 'usr2gridview', parameterName: 'usr2gridview' },
{ pathName: 'dynainstgridview', parameterName: 'dynainstgridview' },
],
requireAuth: true,
},
component: () => import('@pages/lite/meta-dynamic-model-usr2-grid-view/meta-dynamic-model-usr2-grid-view.vue'),
component: () => import('@pages/lite/meta-dynamic-model-dyna-inst-grid-view/meta-dynamic-model-dyna-inst-grid-view.vue'),
},
{
path: '/dstsystems/:dstsystem?/metaentities/:metaentity?/metarelationships/:metarelationship?/pickupgridview/:pickupgridview?',
......
app_web/src/pages/lite/meta-dynamic-model-dyna-inst-grid-view/meta-dynamic-model-dyna-inst-grid-view.less 0 → 100644
浏览文件 @ 9fa650c5
.meta-dynamic-model-dyna-inst-grid-view{
position: relative;
}
.toolbar-container {
button {
margin: 6px 0px 4px 4px;
.caption {
margin-left: 4px;
}
}
.seperator {
color: #dcdee2;
margin: 0 0px 0 4px;
}
}
// this is less
app_web/src/pages/lite/meta-dynamic-model-dyna-inst-grid-view/meta-dynamic-model-dyna-inst-grid-view.vue 0 → 100644
浏览文件 @ 9fa650c5
<script lang='tsx'>
import { Component } from 'vue-property-decorator';
import MetaDynamicModelDynaInstGridViewBase from './meta-dynamic-model-dyna-inst-grid-view-base.vue';
import view_grid from '@widgets/meta-dynamic-model/main-grid/main-grid.vue';
import view_searchform from '@widgets/meta-dynamic-model/default-searchform/default-searchform.vue';
@Component({
components: {
view_grid,
view_searchform,
},
beforeRouteEnter: (to: any, from: any, next: any) => {
next((vm: any) => {
if(!Object.is(vm.navModel,"route")){
vm.initNavDataWithTab(vm.viewCacheData);
}
vm.$store.commit('addCurPageViewtag', { fullPath: to.fullPath, viewtag: vm.viewtag });
});
},
})
export default class MetaDynamicModelDynaInstGridView extends MetaDynamicModelDynaInstGridViewBase {
}
</script>
\ No newline at end of file
app_web/src/pages/lite/meta-dynamic-model-grid-view/meta-dynamic-model-grid-view-base.vue
浏览文件 @ 9fa650c5
......@@ -9,7 +9,7 @@
</div>
<div class='content-container'>
<div style='margin-bottom: 6px;'>
<i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;padding-left: 24px' placeholder="名称" />
<i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;padding-left: 24px' placeholder="配置名称" />
<div class='pull-right'>
<div class='toolbar-container'>
<tooltip :transfer="true" :max-width="600">
......
app_web/src/store/modules/view-action/state.ts
浏览文件 @ 9fa650c5
......@@ -168,7 +168,7 @@ export const viewstate: any = {
{
viewtag: '409f7ea81d15d2e2f1ee295d189d965b',
viewmodule: 'lite',
viewname: 'MetaDynamicModelUsr2GridView',
viewname: 'MetaDynamicModelDynaInstGridView',
viewaction: '',
viewdatachange: false,
refviews: [
......
app_web/src/uiservice/meta-dynamic-model/meta-dynamic-model-ui-service-base.ts
浏览文件 @ 9fa650c5
......@@ -97,7 +97,7 @@ export default class MetaDynamicModelUIServiceBase extends UIService {
*/
public initViewMap(){
this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'metadynamicmodels',component:'meta-dynamic-model-edit-view'});
this.allViewMap.set(':',{viewname:'usr2gridview',srfappde:'metadynamicmodels',component:'meta-dynamic-model-usr2-grid-view'});
this.allViewMap.set(':',{viewname:'dynainstgridview',srfappde:'metadynamicmodels',component:'meta-dynamic-model-dyna-inst-grid-view'});
this.allViewMap.set('MDATAVIEW:',{viewname:'gridview',srfappde:'metadynamicmodels',component:'meta-dynamic-model-grid-view'});
}
......
app_web/src/widgets/meta-dynamic-model/main-form/main-form-base.vue
浏览文件 @ 9fa650c5
......@@ -44,7 +44,7 @@
refviewtype='DEGRIDVIEW'
refreshitems=''
:ignorefieldvaluechange="ignorefieldvaluechange"
viewname='meta-dynamic-model-usr2-grid-view'
viewname='meta-dynamic-model-dyna-inst-grid-view'
tempMode='0'
:data="JSON.stringify(this.data)"
@drdatasaved="drdatasaved($event)"
......@@ -520,8 +520,8 @@ export default class MainBase extends Vue implements ControlInterface {
public rules() :any {
return {
configname: [
{ required: this.detailsModel.configname.required, type: 'string', message: '名称 值不能为空', trigger: 'change' },
{ required: this.detailsModel.configname.required, type: 'string', message: '名称 值不能为空', trigger: 'blur' },
{ required: this.detailsModel.configname.required, type: 'string', message: '配置名称 值不能为空', trigger: 'change' },
{ required: this.detailsModel.configname.required, type: 'string', message: '配置名称 值不能为空', trigger: 'blur' },
],
formitem: [
{ required: this.detailsModel.formitem.required, type: 'string', message: '文件 值不能为空', trigger: 'change' },
......@@ -644,9 +644,9 @@ export default class MainBase extends Vue implements ControlInterface {
,
srforikey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srforikey', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
srfkey: new FormItemModel({ caption: 'ID', detailType: 'FORMITEM', name: 'srfkey', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
srfkey: new FormItemModel({ caption: '配置标识', detailType: 'FORMITEM', name: 'srfkey', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
srfmajortext: new FormItemModel({ caption: '名称', detailType: 'FORMITEM', name: 'srfmajortext', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
srfmajortext: new FormItemModel({ caption: '配置名称', detailType: 'FORMITEM', name: 'srfmajortext', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
srftempmode: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srftempmode', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
......@@ -656,11 +656,11 @@ export default class MainBase extends Vue implements ControlInterface {
,
srfsourcekey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfsourcekey', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
configname: new FormItemModel({ caption: '名称', detailType: 'FORMITEM', name: 'configname', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
configname: new FormItemModel({ caption: '配置名称', detailType: 'FORMITEM', name: 'configname', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
formitem: new FormItemModel({ caption: '文件', detailType: 'FORMITEM', name: 'formitem', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:true, disabled: false, enableCond: 3 })
,
configid: new FormItemModel({ caption: 'ID', detailType: 'FORMITEM', name: 'configid', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
configid: new FormItemModel({ caption: '配置标识', detailType: 'FORMITEM', name: 'configid', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
};
......
app_web/src/widgets/meta-dynamic-model/main-grid/main-grid-model.ts
浏览文件 @ 9fa650c5
......@@ -41,11 +41,6 @@ export default class MainModel {
prop: 'status',
dataType: 'SSCODELIST',
},
{
name: 'configid',
prop: 'configid',
dataType: 'TEXT',
},
{
name: 'configname',
prop: 'configname',
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/domain/MetaDynamicModel.java
浏览文件 @ 9fa650c5
......@@ -47,12 +47,12 @@ public class MetaDynamicModel extends EntityMP implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 动态实例标识
* 动态实例
*/
@TableField(value = "dynainstid")
@JSONField(name = "dynainstid")
@JsonProperty("dynainstid")
@ApiModelProperty("动态实例标识")
@ApiModelProperty("动态实例")
private String dynainstid;
/**
* 状态
......@@ -72,37 +72,37 @@ public class MetaDynamicModel extends EntityMP implements Serializable {
@ApiModelProperty("文件")
private String modelfile;
/**
* 名称
* 配置名称
*/
@TableField(value = "configname")
@JSONField(name = "configname")
@JsonProperty("configname")
@ApiModelProperty("名称")
@ApiModelProperty("配置名称")
private String configname;
/**
* ID
* 配置标识
*/
@DEField(isKeyField = true)
@TableId(value = "configid", type = IdType.ASSIGN_UUID)
@JSONField(name = "configid")
@JsonProperty("configid")
@ApiModelProperty("ID")
@ApiModelProperty("配置标识")
private String configid;
/**
* 系统标识
* 系统
*/
@TableField(value = "systemid")
@JSONField(name = "system_id")
@JsonProperty("system_id")
@ApiModelProperty("系统标识")
@ApiModelProperty("系统")
private String systemId;
/**
* ID
* 父实例
*/
@TableField(value = "pdynainstid")
@JSONField(name = "pdynainstid")
@JsonProperty("pdynainstid")
@ApiModelProperty("ID")
@ApiModelProperty("父实例")
private String pdynainstid;
/**
......@@ -124,7 +124,7 @@ public class MetaDynamicModel extends EntityMP implements Serializable {
/**
* 设置 [动态实例标识]
* 设置 [动态实例]
*/
public void setDynainstid(String dynainstid) {
this.dynainstid = dynainstid;
......@@ -148,7 +148,7 @@ public class MetaDynamicModel extends EntityMP implements Serializable {
}
/**
* 设置 [名称]
* 设置 [配置名称]
*/
public void setConfigname(String configname) {
this.configname = configname;
......@@ -156,7 +156,7 @@ public class MetaDynamicModel extends EntityMP implements Serializable {
}
/**
* 设置 [系统标识]
* 设置 [系统]
*/
public void setSystemId(String systemId) {
this.systemId = systemId;
......@@ -164,7 +164,7 @@ public class MetaDynamicModel extends EntityMP implements Serializable {
}
/**
* 设置 [ID]
* 设置 [父实例]
*/
public void setPdynainstid(String pdynainstid) {
this.pdynainstid = pdynainstid;
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/filter/MetaDynamicModelSearchContext.java
浏览文件 @ 9fa650c5
......@@ -34,21 +34,21 @@ public class MetaDynamicModelSearchContext extends QueryWrapperContext<MetaDynam
this.getSearchCond().eq("status", n_status_eq);
}
}
private String n_configname_like;//[名称]
private String n_configname_like;//[配置名称]
public void setN_configname_like(String n_configname_like) {
this.n_configname_like = n_configname_like;
if(!ObjectUtils.isEmpty(this.n_configname_like)){
this.getSearchCond().like("configname", n_configname_like);
}
}
private String n_systemid_eq;//[系统标识]
private String n_systemid_eq;//[系统]
public void setN_systemid_eq(String n_systemid_eq) {
this.n_systemid_eq = n_systemid_eq;
if(!ObjectUtils.isEmpty(this.n_systemid_eq)){
this.getSearchCond().eq("systemid", n_systemid_eq);
}
}
private String n_pdynainstid_eq;//[ID]
private String n_pdynainstid_eq;//[父实例]
public void setN_pdynainstid_eq(String n_pdynainstid_eq) {
this.n_pdynainstid_eq = n_pdynainstid_eq;
if(!ObjectUtils.isEmpty(this.n_pdynainstid_eq)){
......
ibzlite-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ 9fa650c5
......@@ -4,7 +4,7 @@
<!--输出实体[BLADE_VISUAL]数据结构 -->
<changeSet author="root" id="tab-blade_visual-55-1">
<changeSet author="a_A_5d9d78509" id="tab-blade_visual-55-1">
<createTable tableName="blade_visual">
<column name="ID" remarks="" type="BIGINT">
<constraints primaryKey="true" primaryKeyName="PK_BLADE_VISUAL_ID"/>
......@@ -36,7 +36,7 @@
<!--输出实体[BLADE_VISUAL_CATEGORY]数据结构 -->
<changeSet author="root" id="tab-blade_visual_category-23-2">
<changeSet author="a_A_5d9d78509" id="tab-blade_visual_category-23-2">
<createTable tableName="blade_visual_category">
<column name="ID" remarks="" type="BIGINT">
<constraints primaryKey="true" primaryKeyName="PK_BLADE_VISUAL_CATEGORY_ID"/>
......@@ -52,7 +52,7 @@
<!--输出实体[BLADE_VISUAL_CONFIG]数据结构 -->
<changeSet author="root" id="tab-blade_visual_config-18-3">
<changeSet author="a_A_5d9d78509" id="tab-blade_visual_config-18-3">
<createTable tableName="blade_visual_config">
<column name="ID" remarks="" type="BIGINT">
<constraints primaryKey="true" primaryKeyName="PK_BLADE_VISUAL_CONFIG_ID"/>
......@@ -68,7 +68,7 @@
<!--输出实体[BLADE_VISUAL_MAP]数据结构 -->
<changeSet author="root" id="tab-blade_visual_map-18-4">
<changeSet author="a_A_5d9d78509" id="tab-blade_visual_map-18-4">
<createTable tableName="blade_visual_map">
<column name="ID" remarks="" type="BIGINT">
<constraints primaryKey="true" primaryKeyName="PK_BLADE_VISUAL_MAP_ID"/>
......@@ -86,7 +86,7 @@
<!--输出实体[DST_COMPONENT]数据结构 -->
<changeSet author="root" id="tab-dst_component-59-5">
<changeSet author="a_A_5d9d78509" id="tab-dst_component-59-5">
<createTable tableName="IBZCOMPONENT">
<column name="CID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DST_COMPONENT_CID"/>
......@@ -112,7 +112,7 @@
<!--输出实体[DST_CONFIG]数据结构 -->
<changeSet author="root" id="tab-dst_config-32-6">
<changeSet author="a_A_5d9d78509" id="tab-dst_config-32-6">
<createTable tableName="IBZCFG">
<column name="CFGID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DST_CONFIG_CFGID"/>
......@@ -134,7 +134,7 @@
<!--输出实体[DST_DATASOURCE]数据结构 -->
<changeSet author="root" id="tab-dst_datasource-75-7">
<changeSet author="a_A_5d9d78509" id="tab-dst_datasource-75-7">
<createTable tableName="IBZDATASOURCE">
<column name="DSID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DST_DATASOURCE_DSID"/>
......@@ -152,7 +152,7 @@
<!--输出实体[DST_ROUTER]数据结构 -->
<changeSet author="root" id="tab-dst_router-37-8">
<changeSet author="a_A_5d9d78509" id="tab-dst_router-37-8">
<createTable tableName="IBZROUTER">
<column name="ROUTERID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DST_ROUTER_ROUTERID"/>
......@@ -178,7 +178,7 @@
<!--输出实体[DST_SYSTEM]数据结构 -->
<changeSet author="root" id="tab-dst_system-45-9">
<changeSet author="a_A_5d9d78509" id="tab-dst_system-45-9">
<createTable tableName="IBZPSSYSTEM">
<column name="PSSYSTEMID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DST_SYSTEM_PSSYSTEMID"/>
......@@ -198,7 +198,7 @@
<!--输出实体[DST_VIEW]数据结构 -->
<changeSet author="root" id="tab-dst_view-46-10">
<changeSet author="a_A_5d9d78509" id="tab-dst_view-46-10">
<createTable tableName="IBZVIEW">
<column name="VIEWID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DST_VIEW_VIEWID"/>
......@@ -222,7 +222,7 @@
<!--输出实体[META_DATASET]数据结构 -->
<changeSet author="root" id="tab-meta_dataset-33-11">
<changeSet author="a_A_5d9d78509" id="tab-meta_dataset-33-11">
<createTable tableName="IBZDATASET">
<column name="DATASETID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_META_DATASET_DATASETID"/>
......@@ -244,7 +244,7 @@
<!--输出实体[META_DYNAMICMODEL]数据结构 -->
<changeSet author="root" id="tab-meta_dynamicmodel-44-12">
<changeSet author="a_A_5d9d78509" id="tab-meta_dynamicmodel-68-12">
<createTable tableName="IBZDYNAMICMODEL">
<column name="DYNAINSTID" remarks="" type="VARCHAR(100)">
</column>
......@@ -266,7 +266,7 @@
<!--输出实体[META_ENTITY]数据结构 -->
<changeSet author="root" id="tab-meta_entity-105-13">
<changeSet author="a_A_5d9d78509" id="tab-meta_entity-105-13">
<createTable tableName="IBZENTITY">
<column name="ENTITYID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_META_ENTITY_ENTITYID"/>
......@@ -298,7 +298,7 @@
<!--输出实体[META_FIELD]数据结构 -->
<changeSet author="root" id="tab-meta_field-153-14">
<changeSet author="a_A_5d9d78509" id="tab-meta_field-153-14">
<createTable tableName="IBZFIELD">
<column name="FIELDID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_META_FIELD_FIELDID"/>
......@@ -362,7 +362,7 @@
<!--输出实体[META_MODEL]数据结构 -->
<changeSet author="root" id="tab-meta_model-44-15">
<changeSet author="a_A_5d9d78509" id="tab-meta_model-44-15">
<createTable tableName="IBZMODEL">
<column name="MODELID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_META_MODEL_MODELID"/>
......@@ -388,7 +388,7 @@
<!--输出实体[META_MODULE]数据结构 -->
<changeSet author="root" id="tab-meta_module-34-16">
<changeSet author="a_A_5d9d78509" id="tab-meta_module-34-16">
<createTable tableName="IBZMODULE">
<column name="MODULEID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_META_MODULE_MODULEID"/>
......@@ -406,7 +406,7 @@
<!--输出实体[META_RELATION]数据结构 -->
<changeSet author="root" id="tab-meta_relation-106-17">
<changeSet author="a_A_5d9d78509" id="tab-meta_relation-106-17">
<createTable tableName="IBZRELATION">
<column name="RELATIONID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_META_RELATION_RELATIONID"/>
......@@ -448,10 +448,10 @@
<!--输出实体[DST_VIEW]外键关系 -->
<!--输出实体[META_DATASET]外键关系 -->
<!--输出实体[META_DYNAMICMODEL]外键关系 -->
<changeSet author="root" id="fk-meta_dynamicmodel-44-18">
<changeSet author="a_A_5d9d78509" id="fk-meta_dynamicmodel-68-18">
<addForeignKeyConstraint baseColumnNames="SYSTEMID" baseTableName="IBZDYNAMICMODEL" constraintName="DER1N_META_DYNAMICMODEL_DST_SY" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="PSSYSTEMID" referencedTableName="IBZPSSYSTEM" validate="true"/>
</changeSet>
<changeSet author="root" id="fk-meta_dynamicmodel-44-19">
<changeSet author="a_A_5d9d78509" id="fk-meta_dynamicmodel-68-19">
<addForeignKeyConstraint baseColumnNames="PDYNAINSTID" baseTableName="IBZDYNAMICMODEL" constraintName="DER1N_META_DYNAMICMODEL_META_D" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="CONFIGID" referencedTableName="IBZDYNAMICMODEL" validate="true"/>
</changeSet>
<!--输出实体[META_ENTITY]外键关系 -->
......
ibzlite-core/src/main/resources/mapper/lite/metadynamicmodel/MetaDynamicModelMapper.xml
浏览文件 @ 9fa650c5
......@@ -70,7 +70,6 @@
<!--数据查询[FINDDYNAMICS]-->
<sql id="FINDDYNAMICS" databaseId="mysql">
<![CDATA[ SELECT t1.`CONFIGID`, t1.`CONFIGNAME`, t1.`DYNAINSTID`, t1.`MODELFILE`, t1.`PDYNAINSTID`, t1.`STATUS`, t1.`SYSTEMID` FROM `IBZDYNAMICMODEL` t1
WHERE t1.`PDYNAINSTID` = #{srf.datacontext.configid}
]]>
</sql>
<!--数据查询[FINDDYNAMICS]-->
......
ibzlite-core/src/main/resources/sysmodel/ibzlite.json
浏览文件 @ 9fa650c5
......@@ -1912,7 +1912,7 @@
{
"fieldname":"DYNAINSTID" ,
"codename":"Dynainstid",
"field_logic_name":"动态实例标识",
"field_logic_name":"动态实例",
"entity_name":"META_DYNAMICMODEL",
"field_type":"TEXT",
"nullable":1,
......@@ -1955,7 +1955,7 @@
{
"fieldname":"CONFIGNAME" ,
"codename":"Configname",
"field_logic_name":"名称",
"field_logic_name":"配置名称",
"entity_name":"META_DYNAMICMODEL",
"field_type":"TEXT",
"nullable":1,
......@@ -1969,7 +1969,7 @@
{
"fieldname":"CONFIGID" ,
"codename":"Configid",
"field_logic_name":"ID",
"field_logic_name":"配置标识",
"entity_name":"META_DYNAMICMODEL",
"field_type":"TEXT",
"nullable":1,
......@@ -1983,7 +1983,7 @@
{
"fieldname":"SYSTEMID" ,
"codename":"System_id",
"field_logic_name":"系统标识",
"field_logic_name":"系统",
"entity_name":"META_DYNAMICMODEL",
"ref_de":"DST_SYSTEM",
"ref_field_name":"PSSYSTEMID",
......@@ -2001,7 +2001,7 @@
{
"fieldname":"PDYNAINSTID" ,
"codename":"Pdynainstid",
"field_logic_name":"ID",
"field_logic_name":"父实例",
"entity_name":"META_DYNAMICMODEL",
"ref_de":"META_DYNAMICMODEL",
"ref_field_name":"CONFIGID",
......
ibzlite-core/src/main/resources/workflow/Workflowv1.bpmn 0 → 100644
浏览文件 @ 9fa650c5
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:flowable="http://flowable.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI" typeLanguage="http://www.w3.org/2001/XMLSchema" expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://www.flowable.org/processdef">
<process id="ibzlite-workflowv1" isClosed="false" isExecutable="true" name="1 v1" processType="None">
<extensionElements>
<flowable:eventListener delegateExpression="${processInstanceListener}" />
</extensionElements>
</process>
<bpmndi:BPMNDiagram id="BPMNDiagram_ibzlite-workflowv1">
<bpmndi:BPMNPlane id="BPMNPlane_ibzlite-workflowv1" bpmnElement="ibzlite-workflowv1">
</bpmndi:BPMNPlane>
</bpmndi:BPMNDiagram>
</definitions>
ibzlite-provider/ibzlite-provider-api/src/main/java/cn/ibizlab/api/dto/MetaDynamicModelDTO.java
浏览文件 @ 9fa650c5
......@@ -39,7 +39,7 @@ public class MetaDynamicModelDTO extends DTOBase implements Serializable {
@JSONField(name = "dynainstid")
@JsonProperty("dynainstid")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("动态实例标识")
@ApiModelProperty("动态实例")
private String dynainstid;
/**
......@@ -69,7 +69,7 @@ public class MetaDynamicModelDTO extends DTOBase implements Serializable {
@JSONField(name = "configname")
@JsonProperty("configname")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("名称")
@ApiModelProperty("配置名称")
private String configname;
/**
......@@ -79,7 +79,7 @@ public class MetaDynamicModelDTO extends DTOBase implements Serializable {
@JSONField(name = "configid")
@JsonProperty("configid")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("ID")
@ApiModelProperty("配置标识")
private String configid;
/**
......@@ -89,7 +89,7 @@ public class MetaDynamicModelDTO extends DTOBase implements Serializable {
@JSONField(name = "system_id")
@JsonProperty("system_id")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("系统标识")
@ApiModelProperty("系统")
private String systemId;
/**
......@@ -99,7 +99,7 @@ public class MetaDynamicModelDTO extends DTOBase implements Serializable {
@JSONField(name = "pdynainstid")
@JsonProperty("pdynainstid")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("ID")
@ApiModelProperty("父实例")
private String pdynainstid;
......
ibzlite-util/src/main/java/cn/ibizlab/util/aspect/DELogicAspect.java
浏览文件 @ 9fa650c5
......@@ -78,12 +78,14 @@ public class DELogicAspect {
EntityBase entity = null;
if ("remove".equalsIgnoreCase(action) || "get".equalsIgnoreCase(action)) {
entity = getEntity(service.getClass());
String id = DEFieldCacheMap.getDEKeyField(entity.getClass());
if(StringUtils.isEmpty(id)) {
log.debug("无法获取实体主键属性[{}]",entity.getClass().getSimpleName());
return point.proceed();
if(!ObjectUtils.isEmpty(entity)) {
String id = DEFieldCacheMap.getDEKeyField(entity.getClass());
if(StringUtils.isEmpty(id)) {
log.debug("无法获取实体主键属性[{}]",entity.getClass().getSimpleName());
return point.proceed();
}
entity.set(id, arg);
}
entity.set(id, arg);
} else if (arg instanceof EntityBase) {
entity = (EntityBase) arg;
}
......@@ -187,7 +189,7 @@ public class DELogicAspect {
KieBuilder kieBuilder = kieServices.newKieBuilder(kieFileSystem).buildAll();
Results results = kieBuilder.getResults();
if (results.hasMessages(Message.Level.ERROR)) {
throw new BadRequestAlertException(String.format("编译实体处理逻辑 [%s] 发生异常, %s", logic.getName(), results.getMessages()), "LogicAspect", "reloadLogic");
throw new BadRequestAlertException(String.format("编译实体处理逻辑 [%s] 发生异常, %s", logic.getName(), results.getMessages()), "DELogicAspect", "reloadLogic");
}
KieContainer kieContainer = kieServices.newKieContainer(kieServices.getRepository().getDefaultReleaseId());
logic.setContainer(kieContainer);
......@@ -290,6 +292,7 @@ public class DELogicAspect {
logic.setMd5(getMd5(refFiles));
}
} catch (Exception e) {
log.error("执行处理逻辑失败"+e);
} finally {
try {
if (reader != null) {
......@@ -299,6 +302,7 @@ public class DELogicAspect {
bpmn.close();
}
} catch (Exception e) {
log.error("执行处理逻辑失败"+e);
}
}
return logic;
......@@ -326,7 +330,8 @@ public class DELogicAspect {
if(!ObjectUtils.isEmpty(service.getSuperclass()) && !service.getSuperclass().getName().equals(Object.class.getName())) {
return getEntity(service.getSuperclass());
}
throw new BadRequestAlertException("获取实体信息失败", "DELogicAspect", "getEntity");
log.error("获取实体信息失败，未能在[{}]中找到参数为实体类对象的行为，如create.update等",service.getSimpleName());
return null;
}
/**
......@@ -347,6 +352,7 @@ public class DELogicAspect {
buffer.append(strBpmn);
}
} catch (Exception e) {
log.error("处理逻辑版本检查失败"+e);
} finally {
if (bpmnFile != null) {
bpmnFile.close();
......@@ -359,6 +365,7 @@ public class DELogicAspect {
return null;
}
} catch (Exception e) {
log.error("处理逻辑版本检查失败"+e);
return null;
}
}
......@@ -418,6 +425,7 @@ public class DELogicAspect {
FileUtils.copyToFile(in, bpmn);
}
} catch (IOException e) {
log.error("执行处理逻辑失败，无法获取逻辑文件"+e);
} finally {
if (in != null) {
try {
......
ibzlite-util/src/main/java/cn/ibizlab/util/job/PermissionSyncJob.java
浏览文件 @ 9fa650c5
......@@ -40,6 +40,10 @@ public class PermissionSyncJob implements ApplicationRunner {
@Lazy
IBZLiteFeignClient liteClient;
@Autowired
@Lazy
private cn.ibizlab.util.client.IBZWFFeignClient wfClient;
@Override
public void run(ApplicationArguments args) {
try {
......@@ -76,5 +80,23 @@ public class PermissionSyncJob implements ApplicationRunner {
} catch (Exception ex) {
log.error("向[lite]同步系统模型失败，请检查[lite]服务是否正常运行! {}", ex.getMessage());
}
try {
List<Map<String, Object>> workflows = new ArrayList(); //工作流
if (!ObjectUtils.isEmpty(this.getClass().getResourceAsStream("/workflow/Workflowv1.bpmn"))) {
workflows.add(new HashMap<String, Object>() {{
put("Workflowv1.bpmn", IOUtils.toString(this.getClass().getResourceAsStream("/workflow/Workflowv1.bpmn"), "UTF-8"));
}});
}
if (workflows.size() > 0) {
if (wfClient.deployBpmnFile(workflows)) {
log.info("向[wf]部署流程成功");
} else {
log.error("向[wf]部署流程失败");
}
}
} catch (Exception ex) {
log.error("向[wf]部署流程失败，请检查[wf]服务是否正常运行! {}", ex.getMessage());
}
}
}
\ No newline at end of file
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或