Skip to content

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

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

上级 9a560a19
隐藏空白字符变更
内嵌 并排
正在显示 包含 329 行增加 和 52 行删除
app_web/src/locale/lanres/entities/meta-model/meta-model_BO_CN_base.ts
浏览文件 @ 2576aa51
......@@ -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
浏览文件 @ 2576aa51
......@@ -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
浏览文件 @ 2576aa51
......@@ -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/rule-engine/rule-engine_BO_CN_base.ts
浏览文件 @ 2576aa51
......@@ -14,6 +14,9 @@ function getLocaleResourceBase(){
total: commonLogic.appcommonhandle("总数",null),
processed: commonLogic.appcommonhandle("已处理数",null),
ext_params: commonLogic.appcommonhandle("扩展参数",null),
datakeys: commonLogic.appcommonhandle("业务数据主键",null),
ruleids: commonLogic.appcommonhandle("规则主键",null),
result: commonLogic.appcommonhandle("规则校验结果",null),
},
views: {
gridview: {
......@@ -43,6 +46,9 @@ function getLocaleResourceBase(){
execstate: commonLogic.appcommonhandle("状态",null),
total: commonLogic.appcommonhandle("总数",null),
processed: 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),
......@@ -142,6 +148,10 @@ function getLocaleResourceBase(){
caption: commonLogic.appcommonhandle("校验",null),
tip: commonLogic.appcommonhandle("校验",null),
},
tbitem1_syncrun: {
caption: commonLogic.appcommonhandle("同步运行",null),
tip: commonLogic.appcommonhandle("同步运行",null),
},
tbitem2: {
caption: commonLogic.appcommonhandle("-",null),
tip: commonLogic.appcommonhandle("",null),
......
app_web/src/locale/lanres/entities/rule-engine/rule-engine_en_US_base.ts
浏览文件 @ 2576aa51
......@@ -14,6 +14,9 @@ function getLocaleResourceBase(){
total: commonLogic.appcommonhandle("总数",null),
processed: commonLogic.appcommonhandle("已处理数",null),
ext_params: commonLogic.appcommonhandle("扩展参数",null),
datakeys: commonLogic.appcommonhandle("业务数据主键",null),
ruleids: commonLogic.appcommonhandle("规则主键",null),
result: commonLogic.appcommonhandle("规则校验结果",null),
},
views: {
gridview: {
......@@ -43,6 +46,9 @@ function getLocaleResourceBase(){
execstate: commonLogic.appcommonhandle("状态",null),
total: commonLogic.appcommonhandle("总数",null),
processed: 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),
......@@ -142,6 +148,10 @@ function getLocaleResourceBase(){
caption: commonLogic.appcommonhandle("校验",null),
tip: commonLogic.appcommonhandle("校验",null),
},
tbitem1_syncrun: {
caption: commonLogic.appcommonhandle("同步运行",null),
tip: commonLogic.appcommonhandle("同步运行",null),
},
tbitem2: {
caption: commonLogic.appcommonhandle("-",null),
tip: commonLogic.appcommonhandle("",null),
......
app_web/src/locale/lanres/entities/rule-engine/rule-engine_zh_CN_base.ts
浏览文件 @ 2576aa51
......@@ -14,6 +14,9 @@ function getLocaleResourceBase(){
total: commonLogic.appcommonhandle("总数",null),
processed: commonLogic.appcommonhandle("已处理数",null),
ext_params: commonLogic.appcommonhandle("扩展参数",null),
datakeys: commonLogic.appcommonhandle("业务数据主键",null),
ruleids: commonLogic.appcommonhandle("规则主键",null),
result: commonLogic.appcommonhandle("规则校验结果",null),
},
views: {
gridview: {
......@@ -43,6 +46,9 @@ function getLocaleResourceBase(){
execstate: commonLogic.appcommonhandle("状态",null),
total: commonLogic.appcommonhandle("总数",null),
processed: 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),
......@@ -142,6 +148,10 @@ function getLocaleResourceBase(){
caption: commonLogic.appcommonhandle("校验",null),
tip: commonLogic.appcommonhandle("校验",null),
},
tbitem1_syncrun: {
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
浏览文件 @ 2576aa51
......@@ -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
浏览文件 @ 2576aa51
......@@ -20,6 +20,13 @@
</i-button>
<div slot='content'>{{$t('entities.ruleengine.editviewtoolbar_toolbar.tbitem1_check.tip')}}</div>
</tooltip>
<tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem1_syncrun.visabled" :disabled="toolBarModels.tbitem1_syncrun.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem1_syncrun' }, $event)">
<i class=''></i>
<span class='caption'>{{$t('entities.ruleengine.editviewtoolbar_toolbar.tbitem1_syncrun.caption')}}</span>
</i-button>
<div slot='content'>{{$t('entities.ruleengine.editviewtoolbar_toolbar.tbitem1_syncrun.tip')}}</div>
</tooltip>
<span class='seperator'>|</span>
<tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem3.visabled" :disabled="toolBarModels.tbitem3.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem3' }, $event)">
......@@ -397,6 +404,8 @@ 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' } },
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: '' } },
......@@ -764,6 +773,9 @@ export default class RuleEngineEditViewBase extends Vue {
if (Object.is($event.tag, 'tbitem1_check')) {
this.toolbar_tbitem1_check_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem1_syncrun')) {
this.toolbar_tbitem1_syncrun_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem3')) {
this.toolbar_tbitem3_click(null, '', $event2);
}
......@@ -904,6 +916,35 @@ export default class RuleEngineEditViewBase extends Vue {
curUIService.RuleEngine_Check(datas,contextJO, paramJO, $event, xData,this,"RuleEngine");
}
/**
* 逻辑事件
*
* @param {*} [params={}]
* @param {*} [tag]
* @param {*} [$event]
* @memberof
*/
public toolbar_tbitem1_syncrun_click(params: any = {}, tag?: any, $event?: any) {
// 参数
// 取数
let datas: any[] = [];
let xData: any = null;
// _this 指向容器对象
const _this: any = this;
let paramJO:any = {};
let contextJO:any = {};
xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
const curUIService:RuleEngineUIService = new RuleEngineUIService();
curUIService.RuleEngine_syncRun(datas,contextJO, paramJO, $event, xData,this,"RuleEngine");
}
/**
* 逻辑事件
*
......
app_web/src/uiservice/rule-engine/rule-engine-ui-service-base.ts
浏览文件 @ 2576aa51
......@@ -278,6 +278,22 @@ export default class RuleEngineUIServiceBase extends UIService {
backend();
}
/**
* 同步运行
*
* @param {any[]} args 当前数据
* @param {any} context 行为附加上下文
* @param {*} [params] 附加参数
* @param {*} [$event] 事件源
* @param {*} [xData] 执行行为所需当前部件
* @param {*} [actionContext] 执行行为上下文
* @param {*} [srfParentDeName] 父实体名称
* @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: '不支持单项数据' });
}
/**
* 获取指定数据的重定向页面
......
app_web/src/widgets/dict-catalog/main-grid/main-grid-base.vue
浏览文件 @ 2576aa51
......@@ -2442,6 +2442,18 @@ export default class MainBase extends Vue implements ControlInterface {
}
</script>
<style lang='less'>
@import './main-grid.less';
</style>mberof MainBase
*/
public resetGridData(row: any, property: string, rowIndex: number) {
if(this.actualIsOpenEdit) {
}
}
}
</script>
<style lang='less'>
@import './main-grid.less';
</style>
\ No newline at end of file
app_web/src/widgets/rule-engine/main-form/main-form-base.vue
浏览文件 @ 2576aa51
......@@ -117,6 +117,27 @@
</app-form-item>
</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">
<input-box v-model="data.datakeys" :textareaId="this.$util.createUUID()" :disabled="detailsModel.datakeys.disabled" type='textarea' textareaStyle="height:200px;" ></input-box>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.ruleids.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='ruleids' :itemRules="this.rules().ruleids" class='' :caption="$t('entities.ruleengine.main_form.details.ruleids')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.ruleids.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.ruleids" :textareaId="this.$util.createUUID()" :disabled="detailsModel.ruleids.disabled" type='textarea' textareaStyle="height:200px;" ></input-box>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.result.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='result' :itemRules="this.rules().result" class='' :caption="$t('entities.ruleengine.main_form.details.result')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.result.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.result" :textareaId="this.$util.createUUID()" :disabled="detailsModel.result.disabled" type='textarea' textareaStyle="height:200px;" ></input-box>
</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>
......@@ -537,6 +558,9 @@ export default class MainBase extends Vue implements ControlInterface {
execstate: null,
total: null,
processed: null,
datakeys: null,
ruleids: null,
result: null,
extparams: null,
systemid: null,
modelid: null,
......@@ -620,6 +644,18 @@ 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' },
],
datakeys: [
{ required: this.detailsModel.datakeys.required, type: 'string', message: '业务数据主键 值不能为空', trigger: 'change' },
{ required: this.detailsModel.datakeys.required, type: 'string', message: '业务数据主键 值不能为空', trigger: 'blur' },
],
ruleids: [
{ required: this.detailsModel.ruleids.required, type: 'string', message: '规则主键 值不能为空', trigger: 'change' },
{ required: this.detailsModel.ruleids.required, type: 'string', message: '规则主键 值不能为空', trigger: 'blur' },
],
result: [
{ 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' },
......@@ -762,6 +798,12 @@ 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 })
,
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 })
,
......@@ -941,6 +983,42 @@ export default class MainBase extends Vue implements ControlInterface {
this.formDataChange({ name: 'processed', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 datakeys 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof MainBase
*/
@Watch('data.datakeys')
onDatakeysChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'datakeys', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 ruleids 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof MainBase
*/
@Watch('data.ruleids')
onRuleidsChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'ruleids', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 result 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof MainBase
*/
@Watch('data.result')
onResultChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'result', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 extparams 值
*
......@@ -1059,6 +1137,9 @@ export default class MainBase extends Vue implements ControlInterface {
......
app_web/src/widgets/rule-engine/main-form/main-form-model.ts
浏览文件 @ 2576aa51
......@@ -85,6 +85,21 @@ export default class MainModel {
prop: 'processed',
dataType: 'INT',
},
{
name: 'datakeys',
prop: 'datakeys',
dataType: 'LONGTEXT_1000',
},
{
name: 'ruleids',
prop: 'ruleids',
dataType: 'LONGTEXT_1000',
},
{
name: 'result',
prop: 'result',
dataType: 'LONGTEXT',
},
{
name: 'extparams',
prop: 'ext_params',
......
app_web/src/widgets/rule-item/default-searchform/default-searchform-base.vue
浏览文件 @ 2576aa51
......@@ -838,7 +838,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: '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;
}
const arg: any = { ...opt };
......@@ -874,7 +874,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: '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;
}
const arg: any = { ...opt } ;
......
app_web/src/widgets/rule-item/main-grid/main-grid-base.vue
浏览文件 @ 2576aa51
......@@ -392,20 +392,6 @@ 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;
/**
* 是否嵌入关系界面
......@@ -973,7 +959,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: '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;
}
if(pageReset){
......@@ -1068,7 +1054,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: '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;
}
let _datas:any[] = [];
......@@ -1174,7 +1160,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: '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;
}
if(!arg){
......@@ -1990,7 +1976,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_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);
post.then((response: any) => {
if(response.status == 200 && response.data) {
......@@ -2057,7 +2043,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_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);
post.then((response: any) => {
if (response.status == 200) {
......@@ -2128,7 +2114,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: '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{
Object.assign(item,{viewparams:this.viewparams});
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 {
}
}else if(Object.is(item.rowDataState, 'update')){
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{
Object.assign(item,{viewparams:this.viewparams});
if(item.ruleitem){
......@@ -2209,7 +2195,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: '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;
}
let _this = this;
......
ibzdst-core/src/main/java/cn/ibizlab/core/rule/domain/RuleEngine.java
浏览文件 @ 2576aa51
......@@ -138,6 +138,30 @@ public class RuleEngine extends EntityMP implements Serializable {
@JsonProperty("ext_params")
@ApiModelProperty("扩展参数")
private String extParams;
/**
* 业务数据主键
*/
@TableField(exist = false)
@JSONField(name = "datakeys")
@JsonProperty("datakeys")
@ApiModelProperty("业务数据主键")
private String datakeys;
/**
* 规则主键
*/
@TableField(exist = false)
@JSONField(name = "ruleids")
@JsonProperty("ruleids")
@ApiModelProperty("规则主键")
private String ruleids;
/**
* 规则校验结果
*/
@TableField(exist = false)
@JSONField(name = "result")
@JsonProperty("result")
@ApiModelProperty("规则校验结果")
private String result;
/**
* 模型
......
ibzdst-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ 2576aa51
......@@ -468,7 +468,7 @@
<!--输出实体[RU_ENGINE]数据结构 -->
<changeSet author="root" id="tab-ru_engine-6-17">
<changeSet author="root" id="tab-ru_engine-19-17">
<createTable tableName="IBZRULEENGINE">
<column name="ENGINEID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_RU_ENGINE_ENGINEID"/>
......
ibzdst-core/src/main/resources/sysmodel/ibzdst.json
浏览文件 @ 2576aa51
......@@ -3753,6 +3753,48 @@
"key_field":0,
"show_order":20,
"major_field":0
},
{
"fieldname":"DATAKEYS" ,
"codename":"Datakeys",
"field_logic_name":"业务数据主键",
"entity_name":"RU_ENGINE",
"field_type":"LONGTEXT_1000",
"nullable":1,
"physical_field":0,
"data_type":"VARCHAR",
"data_length":2000,
"key_field":0,
"show_order":1000,
"major_field":0
},
{
"fieldname":"RULEIDS" ,
"codename":"Ruleids",
"field_logic_name":"规则主键",
"entity_name":"RU_ENGINE",
"field_type":"LONGTEXT_1000",
"nullable":1,
"physical_field":0,
"data_type":"VARCHAR",
"data_length":2000,
"key_field":0,
"show_order":1000,
"major_field":0
},
{
"fieldname":"RESULT" ,
"codename":"Result",
"field_logic_name":"规则校验结果",
"entity_name":"RU_ENGINE",
"field_type":"LONGTEXT",
"nullable":1,
"physical_field":0,
"data_type":"TEXT",
"data_length":1048576,
"key_field":0,
"show_order":1000,
"major_field":0
}
],
"subEntitys":[
......
ibzdst-provider/ibzdst-provider-api/src/main/java/cn/ibizlab/api/dto/RuleEngineDTO.java
浏览文件 @ 2576aa51
......@@ -140,6 +140,36 @@ public class RuleEngineDTO extends DTOBase implements Serializable {
@ApiModelProperty("扩展参数")
private String extParams;
/**
* 属性 [DATAKEYS]
*
*/
@JSONField(name = "datakeys")
@JsonProperty("datakeys")
@Size(min = 0, max = 2000, message = "内容长度必须小于等于[2000]")
@ApiModelProperty("业务数据主键")
private String datakeys;
/**
* 属性 [RULEIDS]
*
*/
@JSONField(name = "ruleids")
@JsonProperty("ruleids")
@Size(min = 0, max = 2000, message = "内容长度必须小于等于[2000]")
@ApiModelProperty("规则主键")
private String ruleids;
/**
* 属性 [RESULT]
*
*/
@JSONField(name = "result")
@JsonProperty("result")
@Size(min = 0, max = 1048576, message = "内容长度必须小于等于[1048576]")
@ApiModelProperty("规则校验结果")
private String result;
/**
* 设置 [ENGINENAME]
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或