Merge remote-tracking branch 'origin/master'

app_web/src/locale/lanres/entities/jobs-info/jobs-info_en_US.ts

@@ -38,7 +38,6 @@ export default {
 			srfuf: "", 
 			srfdeid: "", 
 			srfsourcekey: "", 
-			id: "主键ID", 
 			app: "服务名", 
 			handler: "执行器任务HANDLER", 
 			cron: "任务执行CRON", 
@@ -53,6 +52,7 @@ export default {
 			tenant_id: "租户ID", 
 			create_time: "创建时间", 
 			update_time: "更新时间", 
+			id: "主键ID", 
 		},
 		uiactions: {
 		},

app_web/src/locale/lanres/entities/jobs-info/jobs-info_zh_CN.ts

@@ -37,7 +37,6 @@ export default {
 			srfuf: '', 
 			srfdeid: '', 
 			srfsourcekey: '', 
-			id: '主键ID', 
 			app: '服务名', 
 			handler: '执行器任务HANDLER', 
 			cron: '任务执行CRON', 
@@ -52,6 +51,7 @@ export default {
 			tenant_id: '租户ID', 
 			create_time: '创建时间', 
 			update_time: '更新时间', 
+			id: '主键ID', 
 		},
 		uiactions: {
 		},

app_web/src/locale/lanres/entities/jobs-log/jobs-log_en_US.ts

@@ -33,7 +33,6 @@ export default {
 			srfuf: "", 
 			srfdeid: "", 
 			srfsourcekey: "", 
-			id: "主键ID", 
 			job_id: "任务ID", 
 			handler: "执行器任务HANDLER", 
 			param: "执行器任务参数", 
@@ -43,6 +42,7 @@ export default {
 			trigger_msg: "触发器调度信息", 
 			address: "执行地址", 
 			create_time: "创建时间", 
+			id: "主键ID", 
 		},
 		uiactions: {
 		},

app_web/src/locale/lanres/entities/jobs-log/jobs-log_zh_CN.ts

@@ -32,7 +32,6 @@ export default {
 			srfuf: '', 
 			srfdeid: '', 
 			srfsourcekey: '', 
-			id: '主键ID', 
 			job_id: '任务ID', 
 			handler: '执行器任务HANDLER', 
 			param: '执行器任务参数', 
@@ -42,6 +41,7 @@ export default {
 			trigger_msg: '触发器调度信息', 
 			address: '执行地址', 
 			create_time: '创建时间', 
+			id: '主键ID', 
 		},
 		uiactions: {
 		},

app_web/src/locale/lanres/entities/jobs-registry/jobs-registry_en_US.ts

@@ -28,10 +28,10 @@ export default {
 			srfuf: "", 
 			srfdeid: "", 
 			srfsourcekey: "", 
-			id: "主键ID", 
 			app: "服务名", 
 			address: "执行地址", 
 			status: "状态", 
+			id: "主键ID", 
 		},
 		uiactions: {
 		},

app_web/src/locale/lanres/entities/jobs-registry/jobs-registry_zh_CN.ts

@@ -27,10 +27,10 @@ export default {
 			srfuf: '', 
 			srfdeid: '', 
 			srfsourcekey: '', 
-			id: '主键ID', 
 			app: '服务名', 
 			address: '执行地址', 
 			status: '状态', 
+			id: '主键ID', 
 		},
 		uiactions: {
 		},

app_web/src/widgets/jobs-info/default-searchform/default-searchform-service.ts

@@ -281,10 +281,6 @@ export default class DefaultService extends ControlService {
     @Errorlog
     public loadDraft(action: string,context: any = {}, data: any = {}, isloading?: boolean): Promise<any> {
         const {data:Data,context:Context} = this.handleRequestData(action,context,data);
-        //仿真主键数据
-        const PrimaryKey = Util.createUUID();
-        Data.id = PrimaryKey;
-        Data.jobsinfo = PrimaryKey;
         return new Promise((resolve: any, reject: any) => {
             let result: Promise<any>;
             const _appEntityService: any = this.appEntityService;
@@ -294,7 +290,6 @@ export default class DefaultService extends ControlService {
                 result = this.appEntityService.GetDraft(Context,Data, isloading);
             }
             result.then((response) => {
-                response.data.id = PrimaryKey;
                 this.handleResponse(action, response, true);
                 resolve(response);
             }).catch(response => {

app_web/src/widgets/jobs-info/main-form/main-form-base.vue

@@ -6,13 +6,7 @@
 <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" >    
     <row>
-        <i-col v-show="detailsModel.id.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 }">
+        <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">
     <input-box v-model="data.app"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.app.disabled" type='text'  style=""></input-box>
 </app-form-item>
@@ -419,7 +413,6 @@ export default class MainBase extends Vue implements ControlInterface {
         srfuf: null,
         srfdeid: null,
         srfsourcekey: null,
-        id: null,
         app: null,
         handler: null,
         cron: null,
@@ -434,6 +427,7 @@ export default class MainBase extends Vue implements ControlInterface {
         tenant_id: null,
         create_time: null,
         update_time: null,
+        id: null,
         jobsinfo:null,
     };
 
@@ -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: '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: [
             { type: 'string', message: '服务名 值必须为字符串类型', trigger: 'change' },
             { type: 'string', message: '服务名 值必须为字符串类型', trigger: 'blur' },
@@ -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: '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 {
         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 })
-, 
-        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 })
 , 
@@ -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 })
 , 
         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 {
         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 值
      *
@@ -931,6 +913,18 @@ export default class MainBase extends Vue implements ControlInterface {
         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

@@ -50,11 +50,6 @@ export default class MainModel {
       {
         name: 'srfsourcekey',
       },
-      {
-        name: 'id',
-        prop: 'id',
-        dataType: 'TEXT',
-      },
       {
         name: 'app',
         prop: 'app',
@@ -125,6 +120,11 @@ export default class MainModel {
         prop: 'update_time',
         dataType: 'DATETIME',
       },
+      {
+        name: 'id',
+        prop: 'id',
+        dataType: 'TEXT',
+      },
       {
         name: 'jobsinfo',
         prop: 'id',

app_web/src/widgets/jobs-info/main-form/main-form-service.ts

@@ -162,7 +162,6 @@ export default class MainService extends ControlService {
     @Errorlog
     public add(action: string, context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         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) => {
             let result: Promise<any>;
             const _appEntityService: any = this.appEntityService;

app_web/src/widgets/jobs-log/default-searchform/default-searchform-service.ts

@@ -281,10 +281,6 @@ export default class DefaultService extends ControlService {
     @Errorlog
     public loadDraft(action: string,context: any = {}, data: any = {}, isloading?: boolean): Promise<any> {
         const {data:Data,context:Context} = this.handleRequestData(action,context,data);
-        //仿真主键数据
-        const PrimaryKey = Util.createUUID();
-        Data.id = PrimaryKey;
-        Data.jobslog = PrimaryKey;
         return new Promise((resolve: any, reject: any) => {
             let result: Promise<any>;
             const _appEntityService: any = this.appEntityService;
@@ -294,7 +290,6 @@ export default class DefaultService extends ControlService {
                 result = this.appEntityService.GetDraft(Context,Data, isloading);
             }
             result.then((response) => {
-                response.data.id = PrimaryKey;
                 this.handleResponse(action, response, true);
                 resolve(response);
             }).catch(response => {

app_web/src/widgets/jobs-log/main-form/main-form-base.vue

@@ -6,13 +6,7 @@
 <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" >    
     <row>
-        <i-col v-show="detailsModel.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 }">
+        <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">
     <input-box v-model="data.job_id"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.job_id.disabled" type='text'  style=""></input-box>
 </app-form-item>
@@ -378,7 +372,6 @@ export default class MainBase extends Vue implements ControlInterface {
         srfuf: null,
         srfdeid: null,
         srfsourcekey: null,
-        id: null,
         job_id: null,
         handler: null,
         param: null,
@@ -388,6 +381,7 @@ export default class MainBase extends Vue implements ControlInterface {
         trigger_msg: null,
         address: null,
         create_time: null,
+        id: null,
         jobslog:null,
     };
 
@@ -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: '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: [
             { type: 'string', message: '任务ID 值必须为字符串类型', trigger: 'change' },
             { type: 'string', message: '任务ID 值必须为字符串类型', trigger: 'blur' },
@@ -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: '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 {
         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 })
-, 
-        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 })
 , 
@@ -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 })
 , 
         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 {
         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 值
      *
@@ -785,6 +767,18 @@ export default class MainBase extends Vue implements ControlInterface {
         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

@@ -50,11 +50,6 @@ export default class MainModel {
       {
         name: 'srfsourcekey',
       },
-      {
-        name: 'id',
-        prop: 'id',
-        dataType: 'TEXT',
-      },
       {
         name: 'job_id',
         prop: 'job_id',
@@ -100,6 +95,11 @@ export default class MainModel {
         prop: 'create_time',
         dataType: 'DATETIME',
       },
+      {
+        name: 'id',
+        prop: 'id',
+        dataType: 'TEXT',
+      },
       {
         name: 'jobslog',
         prop: 'id',

app_web/src/widgets/jobs-log/main-form/main-form-service.ts

@@ -162,7 +162,6 @@ export default class MainService extends ControlService {
     @Errorlog
     public add(action: string, context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         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) => {
             let result: Promise<any>;
             const _appEntityService: any = this.appEntityService;

app_web/src/widgets/jobs-registry/default-searchform/default-searchform-service.ts

@@ -281,10 +281,6 @@ export default class DefaultService extends ControlService {
     @Errorlog
     public loadDraft(action: string,context: any = {}, data: any = {}, isloading?: boolean): Promise<any> {
         const {data:Data,context:Context} = this.handleRequestData(action,context,data);
-        //仿真主键数据
-        const PrimaryKey = Util.createUUID();
-        Data.id = PrimaryKey;
-        Data.jobsregistry = PrimaryKey;
         return new Promise((resolve: any, reject: any) => {
             let result: Promise<any>;
             const _appEntityService: any = this.appEntityService;
@@ -294,7 +290,6 @@ export default class DefaultService extends ControlService {
                 result = this.appEntityService.GetDraft(Context,Data, isloading);
             }
             result.then((response) => {
-                response.data.id = PrimaryKey;
                 this.handleResponse(action, response, true);
                 resolve(response);
             }).catch(response => {

app_web/src/widgets/jobs-registry/main-form/main-form-base.vue

@@ -6,13 +6,7 @@
 <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" >    
     <row>
-        <i-col v-show="detailsModel.id.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 }">
+        <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">
     <input-box v-model="data.app"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.app.disabled" type='text'  style=""></input-box>
 </app-form-item>
@@ -352,10 +346,10 @@ export default class MainBase extends Vue implements ControlInterface {
         srfuf: null,
         srfdeid: null,
         srfsourcekey: null,
-        id: null,
         app: null,
         address: null,
         status: null,
+        id: null,
         jobsregistry:null,
     };
 
@@ -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: '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: [
             { type: 'string', message: '服务名 值必须为字符串类型', trigger: 'change' },
             { type: 'string', message: '服务名 值必须为字符串类型', trigger: 'blur' },
@@ -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: '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 {
         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 })
-, 
-        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 })
 , 
         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 })
+, 
+        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 {
         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 值
      *
@@ -633,6 +615,18 @@ export default class MainBase extends Vue implements ControlInterface {
         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

@@ -50,11 +50,6 @@ export default class MainModel {
       {
         name: 'srfsourcekey',
       },
-      {
-        name: 'id',
-        prop: 'id',
-        dataType: 'TEXT',
-      },
       {
         name: 'app',
         prop: 'app',
@@ -70,6 +65,11 @@ export default class MainModel {
         prop: 'status',
         dataType: 'NSCODELIST',
       },
+      {
+        name: 'id',
+        prop: 'id',
+        dataType: 'TEXT',
+      },
       {
         name: 'jobsregistry',
         prop: 'id',

app_web/src/widgets/jobs-registry/main-form/main-form-service.ts

@@ -162,7 +162,6 @@ export default class MainService extends ControlService {
     @Errorlog
     public add(action: string, context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         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) => {
             let result: Promise<any>;
             const _appEntityService: any = this.appEntityService;

config.xml

@@ -37,6 +37,11 @@
 	  git clone -b master $para2 ibztask/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd ibztask/
+      mvn clean package -Pweb
+      cd ibztask-app/ibztask-app-web
+      mvn -Pweb docker:build
+      mvn -Pweb docker:push
+      docker -H $para1 stack deploy --compose-file=src/main/docker/ibztask-app-web.yaml ibzlab-rt --with-registry-auth
       </command>
     </hudson.tasks.Shell>
   </builders>

ibztask-app/ibztask-app-web/src/main/docker/Dockerfile

@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibztask-app-web.jar
 
-EXPOSE 8080
+EXPOSE 30005
 
 ADD ibztask-app-web.jar /ibztask-app-web.jar

ibztask-app/ibztask-app-web/src/main/docker/ibztask-app-web.yaml

@@ -3,9 +3,22 @@ services:
   ibztask-app-web:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibztask-app-web:latest
     ports:
-      - "8080:8080"
+      - "30005:30005"
     networks:
       - agent_network
+    environment:
+      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
+      - SERVER_PORT=30005
+      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.102.211:8848
+      - SPRING_REDIS_HOST=172.16.100.243
+      - SPRING_REDIS_PORT=6379
+      - SPRING_REDIS_DATABASE=0
+      - SPRING_DATASOURCE_USERNAME=a_A_5d9d78509
+      - SPRING_DATASOURCE_PASSWORD=@6dEfb3@
+      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
+      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
+      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
+      - NACOS=172.16.102.211:8848
     deploy:
       resources:
            limits:

ibztask-core/src/main/resources/liquibase/h2_table.xml

@@ -4,7 +4,7 @@
 
 
     <!--输出实体[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">
                 <column name="ID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_JOBS_INFO_ID"/>
@@ -42,7 +42,7 @@
 
 
     <!--输出实体[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">
                 <column name="ID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_JOBS_REGISTRY_ID"/>
@@ -76,7 +76,7 @@
 
 
     <!--输出实体[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">
                 <column name="ID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_JOBS_LOG_ID"/>