Skip to content

I
ibztask
提交 119d438d 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

ibiz4j 部署微服务应用

上级 f86447c9
显示空白字符变更
内嵌 并排
正在显示 包含 90 行增加 和 111 行删除
app_web/src/locale/lanres/entities/jobs-info/jobs-info_en_US.ts
浏览文件 @ 119d438d
...@@ -38,7 +38,6 @@ export default { ...@@ -38,7 +38,6 @@ export default {
srfuf: "", srfuf: "",
srfdeid: "", srfdeid: "",
srfsourcekey: "", srfsourcekey: "",
id: "主键ID",
app: "服务名", app: "服务名",
handler: "执行器任务HANDLER", handler: "执行器任务HANDLER",
cron: "任务执行CRON", cron: "任务执行CRON",
...@@ -53,6 +52,7 @@ export default { ...@@ -53,6 +52,7 @@ export default {
tenant_id: "租户ID", tenant_id: "租户ID",
create_time: "创建时间", create_time: "创建时间",
update_time: "更新时间", update_time: "更新时间",
id: "主键ID",
}, },
uiactions: { uiactions: {
}, },
......
app_web/src/locale/lanres/entities/jobs-info/jobs-info_zh_CN.ts
浏览文件 @ 119d438d
...@@ -37,7 +37,6 @@ export default { ...@@ -37,7 +37,6 @@ export default {
srfuf: '', srfuf: '',
srfdeid: '', srfdeid: '',
srfsourcekey: '', srfsourcekey: '',
id: '主键ID',
app: '服务名', app: '服务名',
handler: '执行器任务HANDLER', handler: '执行器任务HANDLER',
cron: '任务执行CRON', cron: '任务执行CRON',
...@@ -52,6 +51,7 @@ export default { ...@@ -52,6 +51,7 @@ export default {
tenant_id: '租户ID', tenant_id: '租户ID',
create_time: '创建时间', create_time: '创建时间',
update_time: '更新时间', update_time: '更新时间',
id: '主键ID',
}, },
uiactions: { uiactions: {
}, },
......
app_web/src/locale/lanres/entities/jobs-log/jobs-log_en_US.ts
浏览文件 @ 119d438d
...@@ -33,7 +33,6 @@ export default { ...@@ -33,7 +33,6 @@ export default {
srfuf: "", srfuf: "",
srfdeid: "", srfdeid: "",
srfsourcekey: "", srfsourcekey: "",
id: "主键ID",
job_id: "任务ID", job_id: "任务ID",
handler: "执行器任务HANDLER", handler: "执行器任务HANDLER",
param: "执行器任务参数", param: "执行器任务参数",
...@@ -43,6 +42,7 @@ export default { ...@@ -43,6 +42,7 @@ export default {
trigger_msg: "触发器调度信息", trigger_msg: "触发器调度信息",
address: "执行地址", address: "执行地址",
create_time: "创建时间", create_time: "创建时间",
id: "主键ID",
}, },
uiactions: { uiactions: {
}, },
......
app_web/src/locale/lanres/entities/jobs-log/jobs-log_zh_CN.ts
浏览文件 @ 119d438d
...@@ -32,7 +32,6 @@ export default { ...@@ -32,7 +32,6 @@ export default {
srfuf: '', srfuf: '',
srfdeid: '', srfdeid: '',
srfsourcekey: '', srfsourcekey: '',
id: '主键ID',
job_id: '任务ID', job_id: '任务ID',
handler: '执行器任务HANDLER', handler: '执行器任务HANDLER',
param: '执行器任务参数', param: '执行器任务参数',
...@@ -42,6 +41,7 @@ export default { ...@@ -42,6 +41,7 @@ export default {
trigger_msg: '触发器调度信息', trigger_msg: '触发器调度信息',
address: '执行地址', address: '执行地址',
create_time: '创建时间', create_time: '创建时间',
id: '主键ID',
}, },
uiactions: { uiactions: {
}, },
......
app_web/src/locale/lanres/entities/jobs-registry/jobs-registry_en_US.ts
浏览文件 @ 119d438d
...@@ -28,10 +28,10 @@ export default { ...@@ -28,10 +28,10 @@ export default {
srfuf: "", srfuf: "",
srfdeid: "", srfdeid: "",
srfsourcekey: "", srfsourcekey: "",
id: "主键ID",
app: "服务名", app: "服务名",
address: "执行地址", address: "执行地址",
status: "状态", status: "状态",
id: "主键ID",
}, },
uiactions: { uiactions: {
}, },
......
app_web/src/locale/lanres/entities/jobs-registry/jobs-registry_zh_CN.ts
浏览文件 @ 119d438d
...@@ -27,10 +27,10 @@ export default { ...@@ -27,10 +27,10 @@ export default {
srfuf: '', srfuf: '',
srfdeid: '', srfdeid: '',
srfsourcekey: '', srfsourcekey: '',
id: '主键ID',
app: '服务名', app: '服务名',
address: '执行地址', address: '执行地址',
status: '状态', status: '状态',
id: '主键ID',
}, },
uiactions: { uiactions: {
}, },
......
app_web/src/widgets/jobs-info/main-form/main-form-base.vue
浏览文件 @ 119d438d
...@@ -6,13 +6,7 @@ ...@@ -6,13 +6,7 @@
<i-col v-show="detailsModel.group1.visible" :style="{}" :lg="{ span: 24, offset: 0 }"> <i-col v-show="detailsModel.group1.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-group layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.jobsinfo.main_form.details.group1')" :isShowCaption="false" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" > <app-form-group layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.jobsinfo.main_form.details.group1')" :isShowCaption="false" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >
<row> <row>
<i-col v-show="detailsModel.id.visible" :style="{}" :lg="{ span: 24, offset: 0 }"> <i-col v-show="detailsModel.app.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='id' :itemRules="this.rules.id" class='' :caption="$t('entities.jobsinfo.main_form.details.id')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.id.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.id" @enter="onEnter($event)" unit="" :disabled="detailsModel.id.disabled" type='text' style=""></input-box>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.app.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='app' :itemRules="this.rules.app" class='' :caption="$t('entities.jobsinfo.main_form.details.app')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.app.error" :isEmptyCaption="false" labelPos="LEFT"> <app-form-item name='app' :itemRules="this.rules.app" class='' :caption="$t('entities.jobsinfo.main_form.details.app')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.app.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.app" @enter="onEnter($event)" unit="" :disabled="detailsModel.app.disabled" type='text' style=""></input-box> <input-box v-model="data.app" @enter="onEnter($event)" unit="" :disabled="detailsModel.app.disabled" type='text' style=""></input-box>
</app-form-item> </app-form-item>
...@@ -419,7 +413,6 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -419,7 +413,6 @@ export default class MainBase extends Vue implements ControlInterface {
srfuf: null, srfuf: null,
srfdeid: null, srfdeid: null,
srfsourcekey: null, srfsourcekey: null,
id: null,
app: null, app: null,
handler: null, handler: null,
cron: null, cron: null,
...@@ -434,6 +427,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -434,6 +427,7 @@ export default class MainBase extends Vue implements ControlInterface {
tenant_id: null, tenant_id: null,
create_time: null, create_time: null,
update_time: null, update_time: null,
id: null,
jobsinfo:null, jobsinfo:null,
}; };
...@@ -518,12 +512,6 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -518,12 +512,6 @@ export default class MainBase extends Vue implements ControlInterface {
{ required: false, type: 'string', message: ' 值不能为空', trigger: 'change' }, { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' }, { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
], ],
id: [
{ type: 'string', message: '主键ID 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '主键ID 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '主键ID 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '主键ID 值不能为空', trigger: 'blur' },
],
app: [ app: [
{ type: 'string', message: '服务名 值必须为字符串类型', trigger: 'change' }, { type: 'string', message: '服务名 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '服务名 值必须为字符串类型', trigger: 'blur' }, { type: 'string', message: '服务名 值必须为字符串类型', trigger: 'blur' },
...@@ -608,6 +596,12 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -608,6 +596,12 @@ export default class MainBase extends Vue implements ControlInterface {
{ required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'change' }, { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'blur' }, { required: false, type: 'string', message: '更新时间 值不能为空', trigger: 'blur' },
], ],
id: [
{ type: 'string', message: '主键ID 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '主键ID 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '主键ID 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '主键ID 值不能为空', trigger: 'blur' },
],
} }
/** /**
...@@ -634,8 +628,6 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -634,8 +628,6 @@ export default class MainBase extends Vue implements ControlInterface {
srfdeid: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfdeid', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }) srfdeid: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfdeid', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
, ,
srfsourcekey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfsourcekey', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }) srfsourcekey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfsourcekey', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
id: new FormItemModel({ caption: '主键ID', detailType: 'FORMITEM', name: 'id', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 0 })
, ,
app: new FormItemModel({ caption: '服务名', detailType: 'FORMITEM', name: 'app', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }) app: new FormItemModel({ caption: '服务名', detailType: 'FORMITEM', name: 'app', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
, ,
...@@ -664,6 +656,8 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -664,6 +656,8 @@ export default class MainBase extends Vue implements ControlInterface {
create_time: new FormItemModel({ caption: '创建时间', detailType: 'FORMITEM', name: 'create_time', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }) create_time: new FormItemModel({ caption: '创建时间', detailType: 'FORMITEM', name: 'create_time', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
, ,
update_time: new FormItemModel({ caption: '更新时间', detailType: 'FORMITEM', name: 'update_time', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }) update_time: new FormItemModel({ caption: '更新时间', detailType: 'FORMITEM', name: 'update_time', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
id: new FormItemModel({ caption: '主键ID', detailType: 'FORMITEM', name: 'id', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
, ,
}; };
...@@ -751,18 +745,6 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -751,18 +745,6 @@ export default class MainBase extends Vue implements ControlInterface {
this.formDataChange({ name: 'srfsourcekey', newVal: newVal, oldVal: oldVal }); this.formDataChange({ name: 'srfsourcekey', newVal: newVal, oldVal: oldVal });
} }
/**
* 监控表单属性 id 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof Main
*/
@Watch('data.id')
onIdChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'id', newVal: newVal, oldVal: oldVal });
}
/** /**
* 监控表单属性 app 值 * 监控表单属性 app 值
* *
...@@ -931,6 +913,18 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -931,6 +913,18 @@ export default class MainBase extends Vue implements ControlInterface {
this.formDataChange({ name: 'update_time', newVal: newVal, oldVal: oldVal }); this.formDataChange({ name: 'update_time', newVal: newVal, oldVal: oldVal });
} }
/**
* 监控表单属性 id 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof Main
*/
@Watch('data.id')
onIdChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'id', newVal: newVal, oldVal: oldVal });
}
/** /**
* 重置表单项值 * 重置表单项值
......
app_web/src/widgets/jobs-info/main-form/main-form-model.ts
浏览文件 @ 119d438d
...@@ -50,11 +50,6 @@ export default class MainModel { ...@@ -50,11 +50,6 @@ export default class MainModel {
{ {
name: 'srfsourcekey', name: 'srfsourcekey',
}, },
{
name: 'id',
prop: 'id',
dataType: 'TEXT',
},
{ {
name: 'app', name: 'app',
prop: 'app', prop: 'app',
...@@ -125,6 +120,11 @@ export default class MainModel { ...@@ -125,6 +120,11 @@ export default class MainModel {
prop: 'update_time', prop: 'update_time',
dataType: 'DATETIME', dataType: 'DATETIME',
}, },
{
name: 'id',
prop: 'id',
dataType: 'TEXT',
},
{ {
name: 'jobsinfo', name: 'jobsinfo',
prop: 'id', prop: 'id',
......
app_web/src/widgets/jobs-info/main-form/main-form-service.ts
浏览文件 @ 119d438d
...@@ -162,7 +162,6 @@ export default class MainService extends ControlService { ...@@ -162,7 +162,6 @@ export default class MainService extends ControlService {
@Errorlog @Errorlog
public add(action: string, context: any = {},data: any = {}, isloading?: boolean): Promise<any> { public add(action: string, context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
const {data:Data,context:Context} = this.handleRequestData(action,context,data); const {data:Data,context:Context} = this.handleRequestData(action,context,data);
Object.assign(Data,{id: data.id, srffrontuf: '1'});
return new Promise((resolve: any, reject: any) => { return new Promise((resolve: any, reject: any) => {
let result: Promise<any>; let result: Promise<any>;
const _appEntityService: any = this.appEntityService; const _appEntityService: any = this.appEntityService;
......
app_web/src/widgets/jobs-log/main-form/main-form-base.vue
浏览文件 @ 119d438d
...@@ -6,13 +6,7 @@ ...@@ -6,13 +6,7 @@
<i-col v-show="detailsModel.group1.visible" :style="{}" :lg="{ span: 24, offset: 0 }"> <i-col v-show="detailsModel.group1.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-group layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.jobslog.main_form.details.group1')" :isShowCaption="false" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" > <app-form-group layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.jobslog.main_form.details.group1')" :isShowCaption="false" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >
<row> <row>
<i-col v-show="detailsModel.id.visible" :style="{}" :lg="{ span: 24, offset: 0 }"> <i-col v-show="detailsModel.job_id.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='id' :itemRules="this.rules.id" class='' :caption="$t('entities.jobslog.main_form.details.id')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.id.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.id" @enter="onEnter($event)" unit="" :disabled="detailsModel.id.disabled" type='text' style=""></input-box>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.job_id.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='job_id' :itemRules="this.rules.job_id" class='' :caption="$t('entities.jobslog.main_form.details.job_id')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.job_id.error" :isEmptyCaption="false" labelPos="LEFT"> <app-form-item name='job_id' :itemRules="this.rules.job_id" class='' :caption="$t('entities.jobslog.main_form.details.job_id')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.job_id.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.job_id" @enter="onEnter($event)" unit="" :disabled="detailsModel.job_id.disabled" type='text' style=""></input-box> <input-box v-model="data.job_id" @enter="onEnter($event)" unit="" :disabled="detailsModel.job_id.disabled" type='text' style=""></input-box>
</app-form-item> </app-form-item>
...@@ -378,7 +372,6 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -378,7 +372,6 @@ export default class MainBase extends Vue implements ControlInterface {
srfuf: null, srfuf: null,
srfdeid: null, srfdeid: null,
srfsourcekey: null, srfsourcekey: null,
id: null,
job_id: null, job_id: null,
handler: null, handler: null,
param: null, param: null,
...@@ -388,6 +381,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -388,6 +381,7 @@ export default class MainBase extends Vue implements ControlInterface {
trigger_msg: null, trigger_msg: null,
address: null, address: null,
create_time: null, create_time: null,
id: null,
jobslog:null, jobslog:null,
}; };
...@@ -472,12 +466,6 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -472,12 +466,6 @@ export default class MainBase extends Vue implements ControlInterface {
{ required: false, type: 'string', message: ' 值不能为空', trigger: 'change' }, { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' }, { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
], ],
id: [
{ type: 'string', message: '主键ID 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '主键ID 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '主键ID 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '主键ID 值不能为空', trigger: 'blur' },
],
job_id: [ job_id: [
{ type: 'string', message: '任务ID 值必须为字符串类型', trigger: 'change' }, { type: 'string', message: '任务ID 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '任务ID 值必须为字符串类型', trigger: 'blur' }, { type: 'string', message: '任务ID 值必须为字符串类型', trigger: 'blur' },
...@@ -532,6 +520,12 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -532,6 +520,12 @@ export default class MainBase extends Vue implements ControlInterface {
{ required: true, type: 'string', message: '创建时间 值不能为空', trigger: 'change' }, { required: true, type: 'string', message: '创建时间 值不能为空', trigger: 'change' },
{ required: true, type: 'string', message: '创建时间 值不能为空', trigger: 'blur' }, { required: true, type: 'string', message: '创建时间 值不能为空', trigger: 'blur' },
], ],
id: [
{ type: 'string', message: '主键ID 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '主键ID 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '主键ID 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '主键ID 值不能为空', trigger: 'blur' },
],
} }
/** /**
...@@ -558,8 +552,6 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -558,8 +552,6 @@ export default class MainBase extends Vue implements ControlInterface {
srfdeid: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfdeid', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }) srfdeid: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfdeid', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
, ,
srfsourcekey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfsourcekey', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }) srfsourcekey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfsourcekey', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
id: new FormItemModel({ caption: '主键ID', detailType: 'FORMITEM', name: 'id', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 1 })
, ,
job_id: new FormItemModel({ caption: '任务ID', detailType: 'FORMITEM', name: 'job_id', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }) job_id: new FormItemModel({ caption: '任务ID', detailType: 'FORMITEM', name: 'job_id', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
, ,
...@@ -578,6 +570,8 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -578,6 +570,8 @@ export default class MainBase extends Vue implements ControlInterface {
address: new FormItemModel({ caption: '执行地址', detailType: 'FORMITEM', name: 'address', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }) address: new FormItemModel({ caption: '执行地址', detailType: 'FORMITEM', name: 'address', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
, ,
create_time: new FormItemModel({ caption: '创建时间', detailType: 'FORMITEM', name: 'create_time', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }) create_time: new FormItemModel({ caption: '创建时间', detailType: 'FORMITEM', name: 'create_time', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
id: new FormItemModel({ caption: '主键ID', detailType: 'FORMITEM', name: 'id', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
, ,
}; };
...@@ -665,18 +659,6 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -665,18 +659,6 @@ export default class MainBase extends Vue implements ControlInterface {
this.formDataChange({ name: 'srfsourcekey', newVal: newVal, oldVal: oldVal }); this.formDataChange({ name: 'srfsourcekey', newVal: newVal, oldVal: oldVal });
} }
/**
* 监控表单属性 id 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof Main
*/
@Watch('data.id')
onIdChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'id', newVal: newVal, oldVal: oldVal });
}
/** /**
* 监控表单属性 job_id 值 * 监控表单属性 job_id 值
* *
...@@ -785,6 +767,18 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -785,6 +767,18 @@ export default class MainBase extends Vue implements ControlInterface {
this.formDataChange({ name: 'create_time', newVal: newVal, oldVal: oldVal }); this.formDataChange({ name: 'create_time', newVal: newVal, oldVal: oldVal });
} }
/**
* 监控表单属性 id 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof Main
*/
@Watch('data.id')
onIdChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'id', newVal: newVal, oldVal: oldVal });
}
/** /**
* 重置表单项值 * 重置表单项值
......
app_web/src/widgets/jobs-log/main-form/main-form-model.ts
浏览文件 @ 119d438d
...@@ -50,11 +50,6 @@ export default class MainModel { ...@@ -50,11 +50,6 @@ export default class MainModel {
{ {
name: 'srfsourcekey', name: 'srfsourcekey',
}, },
{
name: 'id',
prop: 'id',
dataType: 'TEXT',
},
{ {
name: 'job_id', name: 'job_id',
prop: 'job_id', prop: 'job_id',
...@@ -100,6 +95,11 @@ export default class MainModel { ...@@ -100,6 +95,11 @@ export default class MainModel {
prop: 'create_time', prop: 'create_time',
dataType: 'DATETIME', dataType: 'DATETIME',
}, },
{
name: 'id',
prop: 'id',
dataType: 'TEXT',
},
{ {
name: 'jobslog', name: 'jobslog',
prop: 'id', prop: 'id',
......
app_web/src/widgets/jobs-log/main-form/main-form-service.ts
浏览文件 @ 119d438d
...@@ -162,7 +162,6 @@ export default class MainService extends ControlService { ...@@ -162,7 +162,6 @@ export default class MainService extends ControlService {
@Errorlog @Errorlog
public add(action: string, context: any = {},data: any = {}, isloading?: boolean): Promise<any> { public add(action: string, context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
const {data:Data,context:Context} = this.handleRequestData(action,context,data); const {data:Data,context:Context} = this.handleRequestData(action,context,data);
Object.assign(Data,{id: data.id, srffrontuf: '1'});
return new Promise((resolve: any, reject: any) => { return new Promise((resolve: any, reject: any) => {
let result: Promise<any>; let result: Promise<any>;
const _appEntityService: any = this.appEntityService; const _appEntityService: any = this.appEntityService;
......
app_web/src/widgets/jobs-registry/main-form/main-form-base.vue
浏览文件 @ 119d438d
...@@ -6,13 +6,7 @@ ...@@ -6,13 +6,7 @@
<i-col v-show="detailsModel.group1.visible" :style="{}" :lg="{ span: 24, offset: 0 }"> <i-col v-show="detailsModel.group1.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-group layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.jobsregistry.main_form.details.group1')" :isShowCaption="false" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" > <app-form-group layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.jobsregistry.main_form.details.group1')" :isShowCaption="false" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >
<row> <row>
<i-col v-show="detailsModel.id.visible" :style="{}" :lg="{ span: 24, offset: 0 }"> <i-col v-show="detailsModel.app.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='id' :itemRules="this.rules.id" class='' :caption="$t('entities.jobsregistry.main_form.details.id')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.id.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.id" @enter="onEnter($event)" unit="" :disabled="detailsModel.id.disabled" type='text' style=""></input-box>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.app.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='app' :itemRules="this.rules.app" class='' :caption="$t('entities.jobsregistry.main_form.details.app')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.app.error" :isEmptyCaption="false" labelPos="LEFT"> <app-form-item name='app' :itemRules="this.rules.app" class='' :caption="$t('entities.jobsregistry.main_form.details.app')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.app.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.app" @enter="onEnter($event)" unit="" :disabled="detailsModel.app.disabled" type='text' style=""></input-box> <input-box v-model="data.app" @enter="onEnter($event)" unit="" :disabled="detailsModel.app.disabled" type='text' style=""></input-box>
</app-form-item> </app-form-item>
...@@ -352,10 +346,10 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -352,10 +346,10 @@ export default class MainBase extends Vue implements ControlInterface {
srfuf: null, srfuf: null,
srfdeid: null, srfdeid: null,
srfsourcekey: null, srfsourcekey: null,
id: null,
app: null, app: null,
address: null, address: null,
status: null, status: null,
id: null,
jobsregistry:null, jobsregistry:null,
}; };
...@@ -440,12 +434,6 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -440,12 +434,6 @@ export default class MainBase extends Vue implements ControlInterface {
{ required: false, type: 'string', message: ' 值不能为空', trigger: 'change' }, { required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' }, { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
], ],
id: [
{ type: 'string', message: '主键ID 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '主键ID 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '主键ID 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '主键ID 值不能为空', trigger: 'blur' },
],
app: [ app: [
{ type: 'string', message: '服务名 值必须为字符串类型', trigger: 'change' }, { type: 'string', message: '服务名 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '服务名 值必须为字符串类型', trigger: 'blur' }, { type: 'string', message: '服务名 值必须为字符串类型', trigger: 'blur' },
...@@ -464,6 +452,12 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -464,6 +452,12 @@ export default class MainBase extends Vue implements ControlInterface {
{ required: true, type: 'number', message: '状态 值不能为空', trigger: 'change' }, { required: true, type: 'number', message: '状态 值不能为空', trigger: 'change' },
{ required: true, type: 'number', message: '状态 值不能为空', trigger: 'blur' }, { required: true, type: 'number', message: '状态 值不能为空', trigger: 'blur' },
], ],
id: [
{ type: 'string', message: '主键ID 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '主键ID 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '主键ID 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '主键ID 值不能为空', trigger: 'blur' },
],
} }
/** /**
...@@ -490,14 +484,14 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -490,14 +484,14 @@ export default class MainBase extends Vue implements ControlInterface {
srfdeid: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfdeid', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }) srfdeid: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfdeid', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
, ,
srfsourcekey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfsourcekey', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }) srfsourcekey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfsourcekey', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
id: new FormItemModel({ caption: '主键ID', detailType: 'FORMITEM', name: 'id', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
, ,
app: new FormItemModel({ caption: '服务名', detailType: 'FORMITEM', name: 'app', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }) app: new FormItemModel({ caption: '服务名', detailType: 'FORMITEM', name: 'app', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
, ,
address: new FormItemModel({ caption: '执行地址', detailType: 'FORMITEM', name: 'address', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }) address: new FormItemModel({ caption: '执行地址', detailType: 'FORMITEM', name: 'address', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
, ,
status: new FormItemModel({ caption: '状态', detailType: 'FORMITEM', name: 'status', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }) status: new FormItemModel({ caption: '状态', detailType: 'FORMITEM', name: 'status', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
id: new FormItemModel({ caption: '主键ID', detailType: 'FORMITEM', name: 'id', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
, ,
}; };
...@@ -585,18 +579,6 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -585,18 +579,6 @@ export default class MainBase extends Vue implements ControlInterface {
this.formDataChange({ name: 'srfsourcekey', newVal: newVal, oldVal: oldVal }); this.formDataChange({ name: 'srfsourcekey', newVal: newVal, oldVal: oldVal });
} }
/**
* 监控表单属性 id 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof Main
*/
@Watch('data.id')
onIdChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'id', newVal: newVal, oldVal: oldVal });
}
/** /**
* 监控表单属性 app 值 * 监控表单属性 app 值
* *
...@@ -633,6 +615,18 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -633,6 +615,18 @@ export default class MainBase extends Vue implements ControlInterface {
this.formDataChange({ name: 'status', newVal: newVal, oldVal: oldVal }); this.formDataChange({ name: 'status', newVal: newVal, oldVal: oldVal });
} }
/**
* 监控表单属性 id 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof Main
*/
@Watch('data.id')
onIdChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'id', newVal: newVal, oldVal: oldVal });
}
/** /**
* 重置表单项值 * 重置表单项值
......
app_web/src/widgets/jobs-registry/main-form/main-form-model.ts
浏览文件 @ 119d438d
...@@ -50,11 +50,6 @@ export default class MainModel { ...@@ -50,11 +50,6 @@ export default class MainModel {
{ {
name: 'srfsourcekey', name: 'srfsourcekey',
}, },
{
name: 'id',
prop: 'id',
dataType: 'TEXT',
},
{ {
name: 'app', name: 'app',
prop: 'app', prop: 'app',
...@@ -70,6 +65,11 @@ export default class MainModel { ...@@ -70,6 +65,11 @@ export default class MainModel {
prop: 'status', prop: 'status',
dataType: 'NSCODELIST', dataType: 'NSCODELIST',
}, },
{
name: 'id',
prop: 'id',
dataType: 'TEXT',
},
{ {
name: 'jobsregistry', name: 'jobsregistry',
prop: 'id', prop: 'id',
......
app_web/src/widgets/jobs-registry/main-form/main-form-service.ts
浏览文件 @ 119d438d
...@@ -162,7 +162,6 @@ export default class MainService extends ControlService { ...@@ -162,7 +162,6 @@ export default class MainService extends ControlService {
@Errorlog @Errorlog
public add(action: string, context: any = {},data: any = {}, isloading?: boolean): Promise<any> { public add(action: string, context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
const {data:Data,context:Context} = this.handleRequestData(action,context,data); const {data:Data,context:Context} = this.handleRequestData(action,context,data);
Object.assign(Data,{id: data.id, srffrontuf: '1'});
return new Promise((resolve: any, reject: any) => { return new Promise((resolve: any, reject: any) => {
let result: Promise<any>; let result: Promise<any>;
const _appEntityService: any = this.appEntityService; const _appEntityService: any = this.appEntityService;
......
ibztask-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ 119d438d
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<!--输出实体[JOBS_INFO]数据结构 --> <!--输出实体[JOBS_INFO]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-jobs_info-99-1"> <changeSet author="a_A_5d9d78509" id="tab-jobs_info-100-1">
<createTable tableName="JOBS_INFO"> <createTable tableName="JOBS_INFO">
<column name="ID" remarks="" type="VARCHAR(100)"> <column name="ID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_JOBS_INFO_ID"/> <constraints primaryKey="true" primaryKeyName="PK_JOBS_INFO_ID"/>
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
<!--输出实体[JOBS_REGISTRY]数据结构 --> <!--输出实体[JOBS_REGISTRY]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-jobs_registry-35-2"> <changeSet author="a_A_5d9d78509" id="tab-jobs_registry-37-2">
<createTable tableName="JOBS_REGISTRY"> <createTable tableName="JOBS_REGISTRY">
<column name="ID" remarks="" type="VARCHAR(100)"> <column name="ID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_JOBS_REGISTRY_ID"/> <constraints primaryKey="true" primaryKeyName="PK_JOBS_REGISTRY_ID"/>
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
<!--输出实体[JOBS_LOG]数据结构 --> <!--输出实体[JOBS_LOG]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-jobs_log-56-4"> <changeSet author="a_A_5d9d78509" id="tab-jobs_log-57-4">
<createTable tableName="JOBS_LOG"> <createTable tableName="JOBS_LOG">
<column name="ID" remarks="" type="VARCHAR(100)"> <column name="ID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_JOBS_LOG_ID"/> <constraints primaryKey="true" primaryKeyName="PK_JOBS_LOG_ID"/>
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或