Skip to content

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

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

上级 9793896d
隐藏空白字符变更
内嵌 并排
正在显示 包含 20 行增加 和 50 行删除
app_web/src/widgets/meta-entity/default-searchform/default-searchform-base.vue
浏览文件 @ 4fc3be36
...@@ -795,7 +795,7 @@ export default class DefaultBase extends Vue implements ControlInterface { ...@@ -795,7 +795,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: 'MetaEntityGridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'MetaEntityPickupGridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
return; return;
} }
const arg: any = { ...opt }; const arg: any = { ...opt };
...@@ -831,7 +831,7 @@ export default class DefaultBase extends Vue implements ControlInterface { ...@@ -831,7 +831,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: 'MetaEntityGridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'MetaEntityPickupGridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
return; return;
} }
const arg: any = { ...opt } ; const arg: any = { ...opt } ;
......
app_web/src/widgets/meta-entity/main-grid/main-grid-base.vue
浏览文件 @ 4fc3be36
...@@ -342,20 +342,6 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -342,20 +342,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;
/** /**
* 是否嵌入关系界面 * 是否嵌入关系界面
...@@ -887,7 +873,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -887,7 +873,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: 'MetaEntityGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'MetaEntityPickupGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
return; return;
} }
if(pageReset){ if(pageReset){
...@@ -982,7 +968,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -982,7 +968,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: 'MetaEntityGridView'+(this.$t('app.gridpage.notConfig.removeAction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'MetaEntityPickupGridView'+(this.$t('app.gridpage.notConfig.removeAction') as string) });
return; return;
} }
let _datas:any[] = []; let _datas:any[] = [];
...@@ -1088,7 +1074,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1088,7 +1074,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: 'MetaEntityGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'MetaEntityPickupGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
return; return;
} }
if(!arg){ if(!arg){
...@@ -1884,7 +1870,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1884,7 +1870,7 @@ export default class MainBase extends Vue implements ControlInterface {
public setColState() { public setColState() {
this.resetColModel = Util.deepCopy(this.allColumns); this.resetColModel = Util.deepCopy(this.allColumns);
const viewParams: any = Util.deepCopy(this.viewparams); const viewParams: any = Util.deepCopy(this.viewparams);
Object.assign(viewParams,{utilServiceName: 'grid_dynaconfig', modelid: 'ibzdst_web_metaentitygridview_grid_main'}); Object.assign(viewParams,{utilServiceName: 'grid_dynaconfig', modelid: 'ibzdst_web_metaentitypickupgridview_grid_main'});
const post = this.service.loadModel('grid_dynaconfig', this.context, viewParams); const post = this.service.loadModel('grid_dynaconfig', this.context, viewParams);
post.then((response: any) => { post.then((response: any) => {
if(response.status == 200 && response.data) { if(response.status == 200 && response.data) {
...@@ -1951,7 +1937,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1951,7 +1937,7 @@ export default class MainBase extends Vue implements ControlInterface {
*/ */
public saveDynaConfig() { public saveDynaConfig() {
const viewParams: any = Util.deepCopy(this.viewparams); const viewParams: any = Util.deepCopy(this.viewparams);
Object.assign(viewParams,{utilServiceName: 'grid_dynaconfig', modelid: 'ibzdst_web_metaentitygridview_grid_main', model: this.allColumns}); Object.assign(viewParams,{utilServiceName: 'grid_dynaconfig', modelid: 'ibzdst_web_metaentitypickupgridview_grid_main', model: this.allColumns});
const post = this.service.saveModel('grid_dynaconfig', this.context, viewParams); const post = this.service.saveModel('grid_dynaconfig', this.context, viewParams);
post.then((response: any) => { post.then((response: any) => {
if (response.status == 200) { if (response.status == 200) {
...@@ -2022,7 +2008,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -2022,7 +2008,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: 'MetaEntityGridView'+(this.$t('app.gridpage.notConfig.createAction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'MetaEntityPickupGridView'+(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);
...@@ -2030,7 +2016,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -2030,7 +2016,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: 'MetaEntityGridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'MetaEntityPickupGridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
}else{ }else{
Object.assign(item,{viewparams:this.viewparams}); Object.assign(item,{viewparams:this.viewparams});
if(item.metaentity){ if(item.metaentity){
...@@ -2097,7 +2083,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -2097,7 +2083,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: 'MetaEntityGridView'+(this.$t('app.gridpage.notConfig.loaddraftAction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'MetaEntityPickupGridView'+(this.$t('app.gridpage.notConfig.loaddraftAction') as string) });
return; return;
} }
let _this = this; let _this = this;
......
app_web/src/widgets/rule-item/default-searchform/default-searchform-base.vue
浏览文件 @ 4fc3be36
...@@ -838,7 +838,7 @@ export default class DefaultBase extends Vue implements ControlInterface { ...@@ -838,7 +838,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: 'RuleItemGridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'RuleItemPickupGridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
return; return;
} }
const arg: any = { ...opt }; const arg: any = { ...opt };
...@@ -874,7 +874,7 @@ export default class DefaultBase extends Vue implements ControlInterface { ...@@ -874,7 +874,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: 'RuleItemGridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'RuleItemPickupGridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
return; return;
} }
const arg: any = { ...opt } ; const arg: any = { ...opt } ;
......
app_web/src/widgets/rule-item/main-grid/main-grid-base.vue
浏览文件 @ 4fc3be36
...@@ -392,20 +392,6 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -392,20 +392,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;
/** /**
* 是否嵌入关系界面 * 是否嵌入关系界面
...@@ -973,7 +959,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -973,7 +959,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: 'RuleItemGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'RuleItemPickupGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
return; return;
} }
if(pageReset){ if(pageReset){
...@@ -1068,7 +1054,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1068,7 +1054,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: 'RuleItemGridView'+(this.$t('app.gridpage.notConfig.removeAction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'RuleItemPickupGridView'+(this.$t('app.gridpage.notConfig.removeAction') as string) });
return; return;
} }
let _datas:any[] = []; let _datas:any[] = [];
...@@ -1174,7 +1160,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1174,7 +1160,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: 'RuleItemGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'RuleItemPickupGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
return; return;
} }
if(!arg){ if(!arg){
...@@ -1990,7 +1976,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1990,7 +1976,7 @@ export default class MainBase extends Vue implements ControlInterface {
public setColState() { public setColState() {
this.resetColModel = Util.deepCopy(this.allColumns); this.resetColModel = Util.deepCopy(this.allColumns);
const viewParams: any = Util.deepCopy(this.viewparams); const viewParams: any = Util.deepCopy(this.viewparams);
Object.assign(viewParams,{utilServiceName: 'grid_dynaconfig', modelid: 'ibzdst_web_ruleitemgridview_grid_main'}); Object.assign(viewParams,{utilServiceName: 'grid_dynaconfig', modelid: 'ibzdst_web_ruleitempickupgridview_grid_main'});
const post = this.service.loadModel('grid_dynaconfig', this.context, viewParams); const post = this.service.loadModel('grid_dynaconfig', this.context, viewParams);
post.then((response: any) => { post.then((response: any) => {
if(response.status == 200 && response.data) { if(response.status == 200 && response.data) {
...@@ -2057,7 +2043,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -2057,7 +2043,7 @@ export default class MainBase extends Vue implements ControlInterface {
*/ */
public saveDynaConfig() { public saveDynaConfig() {
const viewParams: any = Util.deepCopy(this.viewparams); const viewParams: any = Util.deepCopy(this.viewparams);
Object.assign(viewParams,{utilServiceName: 'grid_dynaconfig', modelid: 'ibzdst_web_ruleitemgridview_grid_main', model: this.allColumns}); Object.assign(viewParams,{utilServiceName: 'grid_dynaconfig', modelid: 'ibzdst_web_ruleitempickupgridview_grid_main', model: this.allColumns});
const post = this.service.saveModel('grid_dynaconfig', this.context, viewParams); const post = this.service.saveModel('grid_dynaconfig', this.context, viewParams);
post.then((response: any) => { post.then((response: any) => {
if (response.status == 200) { if (response.status == 200) {
...@@ -2128,7 +2114,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -2128,7 +2114,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: 'RuleItemGridView'+(this.$t('app.gridpage.notConfig.createAction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'RuleItemPickupGridView'+(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);
...@@ -2136,7 +2122,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -2136,7 +2122,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: 'RuleItemGridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'RuleItemPickupGridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
}else{ }else{
Object.assign(item,{viewparams:this.viewparams}); Object.assign(item,{viewparams:this.viewparams});
if(item.ruleitem){ if(item.ruleitem){
...@@ -2209,7 +2195,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -2209,7 +2195,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: 'RuleItemGridView'+(this.$t('app.gridpage.notConfig.loaddraftAction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'RuleItemPickupGridView'+(this.$t('app.gridpage.notConfig.loaddraftAction') as string) });
return; return;
} }
let _this = this; let _this = this;
......
ibzdst-provider/ibzdst-provider-api/src/main/java/cn/ibizlab/api/rest/RuleItemResource.java
浏览文件 @ 4fc3be36
...@@ -177,7 +177,6 @@ public class RuleItemResource { ...@@ -177,7 +177,6 @@ public class RuleItemResource {
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzdst-RuleItem-TestRule-all')")
@ApiOperation(value = "TestRule", tags = {"规则" }, notes = "TestRule") @ApiOperation(value = "TestRule", tags = {"规则" }, notes = "TestRule")
@RequestMapping(method = RequestMethod.POST, value = "/ruleitems/{ruleitem_id}/testrule") @RequestMapping(method = RequestMethod.POST, value = "/ruleitems/{ruleitem_id}/testrule")
public ResponseEntity<RuleItemDTO> testRule(@PathVariable("ruleitem_id") String ruleitem_id, @RequestBody RuleItemDTO ruleitemdto) { public ResponseEntity<RuleItemDTO> testRule(@PathVariable("ruleitem_id") String ruleitem_id, @RequestBody RuleItemDTO ruleitemdto) {
...@@ -187,7 +186,6 @@ public class RuleItemResource { ...@@ -187,7 +186,6 @@ public class RuleItemResource {
ruleitemdto = ruleitemMapping.toDto(domain); ruleitemdto = ruleitemMapping.toDto(domain);
return ResponseEntity.status(HttpStatus.OK).body(ruleitemdto); return ResponseEntity.status(HttpStatus.OK).body(ruleitemdto);
} }
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzdst-RuleItem-TestRule-all')")
@ApiOperation(value = "批量处理[TestRule]", tags = {"规则" }, notes = "批量处理[TestRule]") @ApiOperation(value = "批量处理[TestRule]", tags = {"规则" }, notes = "批量处理[TestRule]")
@RequestMapping(method = RequestMethod.POST, value = "/ruleitems/testrulebatch") @RequestMapping(method = RequestMethod.POST, value = "/ruleitems/testrulebatch")
public ResponseEntity<Boolean> testRuleBatch(@RequestBody List<RuleItemDTO> ruleitemdtos) { public ResponseEntity<Boolean> testRuleBatch(@RequestBody List<RuleItemDTO> ruleitemdtos) {
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或