Skip to content

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

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

上级 aefb759b
隐藏空白字符变更
内嵌 并排
正在显示 包含 55 行增加 和 41 行删除
app_web/src/locale/lanres/entities/rule-engine/rule-engine_BO_CN_base.ts
浏览文件 @ ed463865
......@@ -46,10 +46,10 @@ function getLocaleResourceBase(){
execstate: commonLogic.appcommonhandle("状态",null),
total: commonLogic.appcommonhandle("总数",null),
processed: commonLogic.appcommonhandle("已处理数",null),
extparams: commonLogic.appcommonhandle("扩展参数",null),
datakeys: commonLogic.appcommonhandle("业务数据主键",null),
ruleids: commonLogic.appcommonhandle("规则主键",null),
result: commonLogic.appcommonhandle("规则校验结果",null),
extparams: commonLogic.appcommonhandle("扩展参数",null),
systemid: commonLogic.appcommonhandle("系统",null),
modelid: commonLogic.appcommonhandle("模型标识",null),
engineid: commonLogic.appcommonhandle("标识",null),
......
app_web/src/locale/lanres/entities/rule-engine/rule-engine_en_US_base.ts
浏览文件 @ ed463865
......@@ -46,10 +46,10 @@ function getLocaleResourceBase(){
execstate: commonLogic.appcommonhandle("状态",null),
total: commonLogic.appcommonhandle("总数",null),
processed: commonLogic.appcommonhandle("已处理数",null),
extparams: commonLogic.appcommonhandle("扩展参数",null),
datakeys: commonLogic.appcommonhandle("业务数据主键",null),
ruleids: commonLogic.appcommonhandle("规则主键",null),
result: commonLogic.appcommonhandle("规则校验结果",null),
extparams: commonLogic.appcommonhandle("扩展参数",null),
systemid: commonLogic.appcommonhandle("系统",null),
modelid: commonLogic.appcommonhandle("模型标识",null),
engineid: commonLogic.appcommonhandle("标识",null),
......
app_web/src/locale/lanres/entities/rule-engine/rule-engine_zh_CN_base.ts
浏览文件 @ ed463865
......@@ -46,10 +46,10 @@ function getLocaleResourceBase(){
execstate: commonLogic.appcommonhandle("状态",null),
total: commonLogic.appcommonhandle("总数",null),
processed: commonLogic.appcommonhandle("已处理数",null),
extparams: commonLogic.appcommonhandle("扩展参数",null),
datakeys: commonLogic.appcommonhandle("业务数据主键",null),
ruleids: commonLogic.appcommonhandle("规则主键",null),
result: commonLogic.appcommonhandle("规则校验结果",null),
extparams: commonLogic.appcommonhandle("扩展参数",null),
systemid: commonLogic.appcommonhandle("系统",null),
modelid: commonLogic.appcommonhandle("模型标识",null),
engineid: commonLogic.appcommonhandle("标识",null),
......
app_web/src/widgets/dict-catalog/main-grid/main-grid-base.vue
浏览文件 @ ed463865
......@@ -330,6 +330,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;
/**
* 是否嵌入关系界面
......@@ -852,7 +866,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: 'DictCatalogPickupGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DictCatalogGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
return;
}
if(pageReset){
......@@ -947,7 +961,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: 'DictCatalogPickupGridView'+(this.$t('app.gridpage.notConfig.removeAction') as string) });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DictCatalogGridView'+(this.$t('app.gridpage.notConfig.removeAction') as string) });
return;
}
let _datas:any[] = [];
......@@ -1053,7 +1067,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: 'DictCatalogPickupGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DictCatalogGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
return;
}
if(!arg){
......@@ -1846,7 +1860,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_dictcatalogpickupgridview_grid_main'});
Object.assign(viewParams,{utilServiceName: 'grid_dynaconfig', modelid: 'ibzdst_web_dictcataloggridview_grid_main'});
const post = this.service.loadModel('grid_dynaconfig', this.context, viewParams);
post.then((response: any) => {
if(response.status == 200 && response.data) {
......@@ -1913,7 +1927,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_dictcatalogpickupgridview_grid_main', model: this.allColumns});
Object.assign(viewParams,{utilServiceName: 'grid_dynaconfig', modelid: 'ibzdst_web_dictcataloggridview_grid_main', model: this.allColumns});
const post = this.service.saveModel('grid_dynaconfig', this.context, viewParams);
post.then((response: any) => {
if (response.status == 200) {
......@@ -1984,7 +1998,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: 'DictCatalogPickupGridView'+(this.$t('app.gridpage.notConfig.createAction') as string) });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DictCatalogGridView'+(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);
......@@ -1992,7 +2006,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: 'DictCatalogPickupGridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DictCatalogGridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
}else{
Object.assign(item,{viewparams:this.viewparams});
if(item.dictcatalog){
......@@ -2059,7 +2073,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: 'DictCatalogPickupGridView'+(this.$t('app.gridpage.notConfig.loaddraftAction') as string) });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DictCatalogGridView'+(this.$t('app.gridpage.notConfig.loaddraftAction') as string) });
return;
}
let _this = this;
......
app_web/src/widgets/meta-entity/default-searchform/default-searchform-base.vue
浏览文件 @ ed463865
......@@ -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: '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;
}
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: '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;
}
const arg: any = { ...opt } ;
......
app_web/src/widgets/rule-engine/main-form/main-form-base.vue
浏览文件 @ ed463865
......@@ -117,6 +117,10 @@
</app-form-item>
</i-col>
<i-col v-show="detailsModel.extparams.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<avue-custom-form :isSubForm="true" :isParseString="true" :isFormData="false" :options='{"column":[{"type":"dynamic","label":"","span":24,"display":true,"children":{"type":"crud","index":false,"align":"center","headerAlign":"center","addBtn":true,"delBtn":true,"column":[{"type":"input","label":"参数","span":24,"display":true,"prop":"property"},{"type":"input","label":"值","span":24,"display":true,"prop":"value"}]},"prop":"1600652985606_85389"}],"labelPosition":"right","labelSuffix":"","labelWidth":120,"gutter":0,"menuBtn":false,"submitBtn":false,"submitText":"提交","emptyBtn":false,"emptyText":"清空","menuPosition":"center"}' v-model="data.extparams" :formData="data" :formState="formState"></avue-custom-form>
</i-col>
<i-col v-show="detailsModel.datakeys.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='datakeys' :itemRules="this.rules().datakeys" class='' :caption="$t('entities.ruleengine.main_form.details.datakeys')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.datakeys.error" :isEmptyCaption="false" labelPos="LEFT">
......@@ -138,10 +142,6 @@
</app-form-item>
</i-col>
<i-col v-show="detailsModel.extparams.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<avue-custom-form :isSubForm="true" :isParseString="true" :isFormData="false" :options='{"column":[{"type":"dynamic","label":"","span":24,"display":true,"children":{"type":"crud","index":false,"align":"center","headerAlign":"center","addBtn":true,"delBtn":true,"column":[{"type":"input","label":"参数","span":24,"display":true,"prop":"property"},{"type":"input","label":"值","span":24,"display":true,"prop":"value"}]},"prop":"1600652985606_85389"}],"labelPosition":"right","labelSuffix":"","labelWidth":120,"gutter":0,"menuBtn":false,"submitBtn":false,"submitText":"提交","emptyBtn":false,"emptyText":"清空","menuPosition":"center"}' v-model="data.extparams" :formData="data" :formState="formState"></avue-custom-form>
</i-col>
</row>
......@@ -558,10 +558,10 @@ export default class MainBase extends Vue implements ControlInterface {
execstate: null,
total: null,
processed: null,
extparams: null,
datakeys: null,
ruleids: null,
result: null,
extparams: null,
systemid: null,
modelid: null,
engineid: null,
......@@ -644,6 +644,10 @@ export default class MainBase extends Vue implements ControlInterface {
{ required: this.detailsModel.processed.required, type: 'number', message: '已处理数 值不能为空', trigger: 'change' },
{ required: this.detailsModel.processed.required, type: 'number', message: '已处理数 值不能为空', trigger: 'blur' },
],
extparams: [
{ required: this.detailsModel.extparams.required, type: 'string', message: '扩展参数 值不能为空', trigger: 'change' },
{ required: this.detailsModel.extparams.required, type: 'string', message: '扩展参数 值不能为空', trigger: 'blur' },
],
datakeys: [
{ required: this.detailsModel.datakeys.required, type: 'string', message: '业务数据主键 值不能为空', trigger: 'change' },
{ required: this.detailsModel.datakeys.required, type: 'string', message: '业务数据主键 值不能为空', trigger: 'blur' },
......@@ -656,10 +660,6 @@ export default class MainBase extends Vue implements ControlInterface {
{ required: this.detailsModel.result.required, type: 'string', message: '规则校验结果 值不能为空', trigger: 'change' },
{ required: this.detailsModel.result.required, type: 'string', message: '规则校验结果 值不能为空', trigger: 'blur' },
],
extparams: [
{ required: this.detailsModel.extparams.required, type: 'string', message: '扩展参数 值不能为空', trigger: 'change' },
{ required: this.detailsModel.extparams.required, type: 'string', message: '扩展参数 值不能为空', trigger: 'blur' },
],
}
}
......@@ -798,14 +798,14 @@ export default class MainBase extends Vue implements ControlInterface {
total: new FormItemModel({ caption: '总数', detailType: 'FORMITEM', name: 'total', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
processed: new FormItemModel({ caption: '已处理数', detailType: 'FORMITEM', name: 'processed', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
extparams: new FormItemModel({ caption: '扩展参数', detailType: 'FORMITEM', name: 'extparams', visible: true, isShowCaption: false, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
datakeys: new FormItemModel({ caption: '业务数据主键', detailType: 'FORMITEM', name: 'datakeys', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
ruleids: new FormItemModel({ caption: '规则主键', detailType: 'FORMITEM', name: 'ruleids', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
result: new FormItemModel({ caption: '规则校验结果', detailType: 'FORMITEM', name: 'result', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
extparams: new FormItemModel({ caption: '扩展参数', detailType: 'FORMITEM', name: 'extparams', visible: true, isShowCaption: false, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
systemid: new FormItemModel({ caption: '系统', detailType: 'FORMITEM', name: 'systemid', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
......@@ -983,6 +983,18 @@ export default class MainBase extends Vue implements ControlInterface {
this.formDataChange({ name: 'processed', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 extparams 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof MainBase
*/
@Watch('data.extparams')
onExtparamsChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'extparams', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 datakeys 值
*
......@@ -1019,18 +1031,6 @@ export default class MainBase extends Vue implements ControlInterface {
this.formDataChange({ name: 'result', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 extparams 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof MainBase
*/
@Watch('data.extparams')
onExtparamsChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'extparams', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 systemid 值
*
......
app_web/src/widgets/rule-engine/main-form/main-form-model.ts
浏览文件 @ ed463865
......@@ -85,6 +85,11 @@ export default class MainModel {
prop: 'processed',
dataType: 'INT',
},
{
name: 'extparams',
prop: 'ext_params',
dataType: 'LONGTEXT',
},
{
name: 'datakeys',
prop: 'datakeys',
......@@ -100,11 +105,6 @@ export default class MainModel {
prop: 'result',
dataType: 'LONGTEXT',
},
{
name: 'extparams',
prop: 'ext_params',
dataType: 'LONGTEXT',
},
{
name: 'systemid',
prop: 'system_id',
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或