Skip to content

I
ibzdst
提交 6df239dc 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

lab_xuhui 发布系统代码 [ibz-dst，应用]

上级 ed463865
隐藏空白字符变更
内嵌 并排
正在显示 包含 122 行增加 和 42 行删除
app_web/src/locale/lanres/entities/meta-model/meta-model_BO_CN_base.ts
浏览文件 @ 6df239dc
......@@ -104,14 +104,14 @@ function getLocaleResourceBase(){
},
},
gridviewtoolbar_toolbar: {
tbitem1_export: {
caption: commonLogic.appcommonhandle("模型导出",null),
tip: commonLogic.appcommonhandle("模型导出",null),
},
tbitem1_import: {
caption: commonLogic.appcommonhandle("模型导入",null),
tip: commonLogic.appcommonhandle("模型导入",null),
},
tbitem1_export: {
caption: commonLogic.appcommonhandle("模型导出",null),
tip: commonLogic.appcommonhandle("模型导出",null),
},
tbitem2: {
caption: commonLogic.appcommonhandle("-",null),
tip: commonLogic.appcommonhandle("",null),
......
app_web/src/locale/lanres/entities/meta-model/meta-model_en_US_base.ts
浏览文件 @ 6df239dc
......@@ -104,14 +104,14 @@ function getLocaleResourceBase(){
},
},
gridviewtoolbar_toolbar: {
tbitem1_export: {
caption: commonLogic.appcommonhandle("模型导出",null),
tip: commonLogic.appcommonhandle("模型导出",null),
},
tbitem1_import: {
caption: commonLogic.appcommonhandle("模型导入",null),
tip: commonLogic.appcommonhandle("模型导入",null),
},
tbitem1_export: {
caption: commonLogic.appcommonhandle("模型导出",null),
tip: commonLogic.appcommonhandle("模型导出",null),
},
tbitem2: {
caption: commonLogic.appcommonhandle("-",null),
tip: commonLogic.appcommonhandle("",null),
......
app_web/src/locale/lanres/entities/meta-model/meta-model_zh_CN_base.ts
浏览文件 @ 6df239dc
......@@ -104,14 +104,14 @@ function getLocaleResourceBase(){
},
},
gridviewtoolbar_toolbar: {
tbitem1_export: {
caption: commonLogic.appcommonhandle("模型导出",null),
tip: commonLogic.appcommonhandle("模型导出",null),
},
tbitem1_import: {
caption: commonLogic.appcommonhandle("模型导入",null),
tip: commonLogic.appcommonhandle("模型导入",null),
},
tbitem1_export: {
caption: commonLogic.appcommonhandle("模型导出",null),
tip: commonLogic.appcommonhandle("模型导出",null),
},
tbitem2: {
caption: commonLogic.appcommonhandle("-",null),
tip: commonLogic.appcommonhandle("",null),
......
app_web/src/pages/lite/meta-model-grid-view/meta-model-grid-view-base.vue
浏览文件 @ 6df239dc
......@@ -13,18 +13,18 @@
<div class='pull-right'>
<div class='toolbar-container'>
<tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem1_export.visabled" :disabled="toolBarModels.tbitem1_export.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem1_export' }, $event)">
<i-button v-show="toolBarModels.tbitem1_import.visabled" :disabled="toolBarModels.tbitem1_import.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem1_import' }, $event)">
<i class=''></i>
<span class='caption'>{{$t('entities.metamodel.gridviewtoolbar_toolbar.tbitem1_export.caption')}}</span>
<span class='caption'>{{$t('entities.metamodel.gridviewtoolbar_toolbar.tbitem1_import.caption')}}</span>
</i-button>
<div slot='content'>{{$t('entities.metamodel.gridviewtoolbar_toolbar.tbitem1_export.tip')}}</div>
<div slot='content'>{{$t('entities.metamodel.gridviewtoolbar_toolbar.tbitem1_import.tip')}}</div>
</tooltip>
<tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem1_import.visabled" :disabled="toolBarModels.tbitem1_import.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem1_import' }, $event)">
<i-button v-show="toolBarModels.tbitem1_export.visabled" :disabled="toolBarModels.tbitem1_export.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem1_export' }, $event)">
<i class=''></i>
<span class='caption'>{{$t('entities.metamodel.gridviewtoolbar_toolbar.tbitem1_import.caption')}}</span>
<span class='caption'>{{$t('entities.metamodel.gridviewtoolbar_toolbar.tbitem1_export.caption')}}</span>
</i-button>
<div slot='content'>{{$t('entities.metamodel.gridviewtoolbar_toolbar.tbitem1_import.tip')}}</div>
<div slot='content'>{{$t('entities.metamodel.gridviewtoolbar_toolbar.tbitem1_export.tip')}}</div>
</tooltip>
<span class='seperator'>|</span>
<tooltip :transfer="true" :max-width="600">
......@@ -384,10 +384,10 @@ export default class MetaModelGridViewBase extends Vue {
* @memberof MetaModelGridView
*/
public toolBarModels: any = {
tbitem1_export: { name: 'tbitem1_export', actiontarget: 'NONE', caption: '模型导出', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'export', target: 'MULTIKEY' } },
tbitem1_import: { name: 'tbitem1_import', actiontarget: 'NONE', caption: '模型导入', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'import', target: 'NONE' } },
tbitem1_export: { name: 'tbitem1_export', actiontarget: 'NONE', caption: '模型导出', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'export', target: 'MULTIKEY' } },
tbitem2: { name: 'tbitem2', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
tbitem3: { name: 'tbitem3', actiontarget: 'NONE', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'New', target: '' } },
......@@ -860,12 +860,12 @@ export default class MetaModelGridViewBase extends Vue {
* @memberof MetaModelGridViewBase
*/
public toolbar_click($event: any, $event2?: any) {
if (Object.is($event.tag, 'tbitem1_export')) {
this.toolbar_tbitem1_export_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem1_import')) {
this.toolbar_tbitem1_import_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem1_export')) {
this.toolbar_tbitem1_export_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem3')) {
this.toolbar_tbitem3_click(null, '', $event2);
}
......@@ -920,7 +920,7 @@ export default class MetaModelGridViewBase extends Vue {
* @param {*} [$event]
* @memberof
*/
public toolbar_tbitem1_export_click(params: any = {}, tag?: any, $event?: any) {
public toolbar_tbitem1_import_click(params: any = {}, tag?: any, $event?: any) {
// 参数
// 取数
let datas: any[] = [];
......@@ -938,7 +938,7 @@ export default class MetaModelGridViewBase extends Vue {
}
// 界面行为
const curUIService:MetaModelUIService = new MetaModelUIService();
curUIService.MetaModel_export(datas,contextJO, paramJO, $event, xData,this,"MetaModel");
curUIService.MetaModel_import(datas,contextJO, paramJO, $event, xData,this,"MetaModel");
}
/**
......@@ -949,7 +949,7 @@ export default class MetaModelGridViewBase extends Vue {
* @param {*} [$event]
* @memberof
*/
public toolbar_tbitem1_import_click(params: any = {}, tag?: any, $event?: any) {
public toolbar_tbitem1_export_click(params: any = {}, tag?: any, $event?: any) {
// 参数
// 取数
let datas: any[] = [];
......@@ -967,7 +967,7 @@ export default class MetaModelGridViewBase extends Vue {
}
// 界面行为
const curUIService:MetaModelUIService = new MetaModelUIService();
curUIService.MetaModel_import(datas,contextJO, paramJO, $event, xData,this,"MetaModel");
curUIService.MetaModel_export(datas,contextJO, paramJO, $event, xData,this,"MetaModel");
}
/**
......
app_web/src/pages/rule/rule-engine-edit-view/rule-engine-edit-view-base.vue
浏览文件 @ 6df239dc
......@@ -404,7 +404,7 @@ export default class RuleEngineEditViewBase extends Vue {
tbitem1_check: { name: 'tbitem1_check', actiontarget: 'NONE', caption: '校验', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Check', target: 'SINGLEKEY' } },
tbitem1_syncrun: { name: 'tbitem1_syncrun', actiontarget: 'NONE', caption: '同步运行', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'syncRun', target: 'SINGLEDATA' } },
tbitem1_syncrun: { name: 'tbitem1_syncrun', actiontarget: 'NONE', caption: '同步运行', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'syncRun', target: 'SINGLEKEY' } },
tbitem2: { name: 'tbitem2', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
tbitem3: { name: 'tbitem3', actiontarget: 'NONE', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Save', target: '' } },
......
app_web/src/uiservice/rule-engine/rule-engine-ui-service-base.ts
浏览文件 @ 6df239dc
......@@ -291,7 +291,73 @@ export default class RuleEngineUIServiceBase extends UIService {
* @returns {Promise<any>}
*/
public async RuleEngine_syncRun(args: any[],context:any = {}, params:any = {}, $event?: any, xData?: any,actionContext?: any,srfParentDeName?:string){
actionContext.$Notice.error({ title: '错误', desc: '不支持单项数据' });
let data: any = {};
let parentContext:any = {};
let parentViewParam:any = {};
const _this: any = actionContext;
Object.assign(params,{ruleids:"%ruleids%",datakeys:"%datakeys%"});
const _args: any[] = Util.deepCopy(args);
const actionTarget: string | null = 'SINGLEKEY';
Object.assign(context, { ruleengine: '%ruleengine%' });
Object.assign(params, { engine_id: '%ruleengine%' });
Object.assign(params, { engine_name: '%engine_name%' });
if(_this.context){
parentContext = _this.context;
}
if(_this.viewparams){
parentViewParam = _this.viewparams;
}
context = UIActionTool.handleContextParam(actionTarget,_args,parentContext,parentViewParam,context);
data = UIActionTool.handleActionParam(actionTarget,_args,parentContext,parentViewParam,params);
if(Object.is(actionTarget,"MULTIKEY")){
let tempDataArray:Array<any> = [];
if((_args.length >1) && (Object.keys(data).length >0)){
for(let i =0;i<_args.length;i++){
let tempObject:any = {};
Object.keys(data).forEach((key:string) =>{
Object.assign(tempObject,{[key]:data[key].split(',')[i]});
})
tempDataArray.push(tempObject);
}
}else{
tempDataArray.push(data);
}
data = tempDataArray;
}
context = Object.assign({},actionContext.context,context);
let parentObj:any = {srfparentdename:srfParentDeName?srfParentDeName:null,srfparentkey:srfParentDeName?context[srfParentDeName.toLowerCase()]:null};
if(!Object.is(actionTarget,"MULTIKEY")){
Object.assign(data,parentObj);
}
Object.assign(context,parentObj);
// 直接调实体服务需要转换的数据
if(context && context.srfsessionid){
context.srfsessionkey = context.srfsessionid;
delete context.srfsessionid;
}
const backend = () => {
const curService:RuleEngineService = new RuleEngineService();
curService.SyncRun(context,data, true).then((response: any) => {
if (!response || response.status !== 200) {
actionContext.$Notice.error({ title: '错误', desc: response.message });
return;
}
actionContext.$Notice.success({ title: '成功', desc: '同步运行成功！' });
const _this: any = actionContext;
return response;
}).catch((response: any) => {
if (response && response.status && response.data) {
actionContext.$Notice.error({ title: (actionContext.$t('app.commonWords.wrong') as string), desc: response.data.message });
return;
}
if (!response || !response.status || !response.data) {
actionContext.$Notice.error({ title: (actionContext.$t('app.commonWords.wrong') as string), desc: (actionContext.$t('app.commonWords.sysException') as string) });
return;
}
return response;
});
};
backend();
}
......
app_web/src/widgets/dict-catalog/default-searchform/default-searchform-base.vue
浏览文件 @ 6df239dc
......@@ -698,7 +698,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
*/
public load(opt: any = {}): void {
if(!this.loadAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DictCatalogPickupGridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DictCatalogGridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
return;
}
const arg: any = { ...opt };
......@@ -734,7 +734,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
*/
public loadDraft(opt: any = {},mode?:string): void {
if(!this.loaddraftAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DictCatalogPickupGridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DictCatalogGridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
return;
}
const arg: any = { ...opt } ;
......
app_web/src/widgets/meta-entity/default-searchform/default-searchform-base.vue
浏览文件 @ 6df239dc
......@@ -795,7 +795,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
*/
public load(opt: any = {}): void {
if(!this.loadAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'MetaEntityPickupGridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'MetaEntityGridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
return;
}
const arg: any = { ...opt };
......@@ -831,7 +831,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
*/
public loadDraft(opt: any = {},mode?:string): void {
if(!this.loaddraftAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'MetaEntityPickupGridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'MetaEntityGridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
return;
}
const arg: any = { ...opt } ;
......
app_web/src/widgets/meta-entity/main-grid/main-grid-base.vue
浏览文件 @ 6df239dc
......@@ -342,6 +342,20 @@ export default class MainBase extends Vue implements ControlInterface {
return this.selections[0];
}
/**
* 打开新建数据视图
*
* @type {any}
* @memberof MainBase
*/
@Prop() public newdata: any;
/**
* 打开编辑数据视图
*
* @type {any}
* @memberof MainBase
*/
@Prop() public opendata: any;
/**
* 是否嵌入关系界面
......@@ -873,7 +887,7 @@ export default class MainBase extends Vue implements ControlInterface {
*/
public load(opt: any = {}, pageReset: boolean = false): void {
if(!this.fetchAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'MetaEntityPickupGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'MetaEntityGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
return;
}
if(pageReset){
......@@ -968,7 +982,7 @@ export default class MainBase extends Vue implements ControlInterface {
*/
public async remove(datas: any[]): Promise<any> {
if(!this.removeAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'MetaEntityPickupGridView'+(this.$t('app.gridpage.notConfig.removeAction') as string) });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'MetaEntityGridView'+(this.$t('app.gridpage.notConfig.removeAction') as string) });
return;
}
let _datas:any[] = [];
......@@ -1074,7 +1088,7 @@ export default class MainBase extends Vue implements ControlInterface {
*/
public addBatch(arg: any = {}): void {
if(!this.fetchAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'MetaEntityPickupGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'MetaEntityGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
return;
}
if(!arg){
......@@ -1870,7 +1884,7 @@ export default class MainBase extends Vue implements ControlInterface {
public setColState() {
this.resetColModel = Util.deepCopy(this.allColumns);
const viewParams: any = Util.deepCopy(this.viewparams);
Object.assign(viewParams,{utilServiceName: 'grid_dynaconfig', modelid: 'ibzdst_web_metaentitypickupgridview_grid_main'});
Object.assign(viewParams,{utilServiceName: 'grid_dynaconfig', modelid: 'ibzdst_web_metaentitygridview_grid_main'});
const post = this.service.loadModel('grid_dynaconfig', this.context, viewParams);
post.then((response: any) => {
if(response.status == 200 && response.data) {
......@@ -1937,7 +1951,7 @@ export default class MainBase extends Vue implements ControlInterface {
*/
public saveDynaConfig() {
const viewParams: any = Util.deepCopy(this.viewparams);
Object.assign(viewParams,{utilServiceName: 'grid_dynaconfig', modelid: 'ibzdst_web_metaentitypickupgridview_grid_main', model: this.allColumns});
Object.assign(viewParams,{utilServiceName: 'grid_dynaconfig', modelid: 'ibzdst_web_metaentitygridview_grid_main', model: this.allColumns});
const post = this.service.saveModel('grid_dynaconfig', this.context, viewParams);
post.then((response: any) => {
if (response.status == 200) {
......@@ -2008,7 +2022,7 @@ export default class MainBase extends Vue implements ControlInterface {
try {
if(Object.is(item.rowDataState, 'create')){
if(!this.createAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'MetaEntityPickupGridView'+(this.$t('app.gridpage.notConfig.createAction') as string) });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'MetaEntityGridView'+(this.$t('app.gridpage.notConfig.createAction') as string) });
}else{
Object.assign(item,{viewparams:this.viewparams});
let response = await this.service.add(this.createAction, JSON.parse(JSON.stringify(this.context)),item, this.showBusyIndicator);
......@@ -2016,7 +2030,7 @@ export default class MainBase extends Vue implements ControlInterface {
}
}else if(Object.is(item.rowDataState, 'update')){
if(!this.updateAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'MetaEntityPickupGridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'MetaEntityGridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
}else{
Object.assign(item,{viewparams:this.viewparams});
if(item.metaentity){
......@@ -2083,7 +2097,7 @@ export default class MainBase extends Vue implements ControlInterface {
*/
public newRow(args: any[], params?: any, $event?: any, xData?: any): void {
if(!this.loaddraftAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'MetaEntityPickupGridView'+(this.$t('app.gridpage.notConfig.loaddraftAction') as string) });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'MetaEntityGridView'+(this.$t('app.gridpage.notConfig.loaddraftAction') as string) });
return;
}
let _this = this;
......
ibzdst-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ 6df239dc
......@@ -468,7 +468,7 @@
<!--输出实体[RU_ENGINE]数据结构 -->
<changeSet author="root" id="tab-ru_engine-22-17">
<changeSet author="root" id="tab-ru_engine-24-17">
<createTable tableName="IBZRULEENGINE">
<column name="ENGINEID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_RU_ENGINE_ENGINEID"/>
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或