ibiz4j 发布系统代码

app_web/src/components/context-menu/context-menu.less

 .context-menu-container {
-    // width: 100vw;
-    // height: 100vh;
-    // z-index: -10000;
-    // position: absolute;
-    // top: 0;
-    // left: 0;
-    line-height: 1;
+  // width: 100vw;
+  // height: 100vh;
+  // z-index: -10000;
+  // position: absolute;
+  // top: 0;
+  // left: 0;
+  // line-height: 1;
+  z-index: 10001;
 
-    .context-menu-content {
-        z-index: 10001;
-        position: absolute;
-        background: #FFF;
-        // border: 1px solid #e3e3e3;
-    }
+  .context-menu-content {
+      position: absolute;
+      background: #FFF;
+      // border: 1px solid #e3e3e3;
+      .ivu-divider{
+        width: 100%;
+      }
 
-    .context-menus {
+  }
 
-        .context-menus-item {
-            list-style: none;
-            line-height: 36px;
-            padding: 0 13px;
-            margin: 0;
-            font-size: 14px;
-            color: #606266;
-            cursor: pointer;
-            outline: none;
-            display: flex;
-    
-            .icon {
-                display: flex;
-                justify-content: center;
-                align-items: center;
-                font-size: 16px;
-                width: 20px;
-                margin-right: 8px;
-            }
-        }
-    
-        .context-menus-item:hover {
-            background-color: #ecf5ff;
-            color: #66b1ff;
-        }
-    }
+  .context-menus {
+
+      .context-menus-item {
+          list-style: none;
+          line-height: 36px;
+          padding: 0 13px;
+          margin: 0;
+          font-size: 14px;
+          color: #606266;
+          cursor: pointer;
+          outline: none;
+          display: flex;
+  
+          .icon {
+              display: flex;
+              justify-content: center;
+              align-items: center;
+              font-size: 16px;
+              width: 20px;
+              margin-right: 8px;
+          }
+      }
+  
+      .context-menus-item:hover {
+          background-color: #ecf5ff;
+          color: #66b1ff;
+      }
+  }
 }
 .context-menu {
-    position: fixed;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
 }
\ No newline at end of file

app_web/src/locale/lanres/sys-role/sys-role_en_US.ts

 
 export default {
   fields: {
-    roleid: '角色表标识',
-    rolename: '角色表名称',
+    roleid: '角色标识',
+    rolename: '角色名称',
     memo: '备注',
     createdate: '建立时间',
     updatedate: '更新时间',
@@ -48,23 +48,23 @@ export default {
 			formpage1: "基本信息", 
 			srfupdatedate: "更新时间", 
 			srforikey: "", 
-			srfkey: "角色表标识", 
-			srfmajortext: "角色表名称", 
+			srfkey: "角色标识", 
+			srfmajortext: "角色名称", 
 			srftempmode: "", 
 			srfuf: "", 
 			srfdeid: "", 
 			srfsourcekey: "", 
-			sys_rolename: "角色表名称", 
+			sys_rolename: "角色名称", 
 			memo: "备注", 
-			sys_roleid: "角色表标识", 
+			sys_roleid: "角色标识", 
 		},
 		uiactions: {
 		},
 	},
 	main_grid: {
 		columns: {
-			sys_roleid: "角色表标识",
-			sys_rolename: "角色表名称",
+			sys_roleid: "角色标识",
+			sys_rolename: "角色名称",
 			memo: "备注",
 			updatedate: "更新时间",
 		},
@@ -74,9 +74,7 @@ export default {
 	default_searchform: {
 		details: {
 			formpage1: "常规条件", 
-			n_sys_rolename_like: "角色表名称(%)", 
-			n_sys_rolename_isnotnull: "角色表名称(NotNil)", 
-			n_sys_rolename_isnull: "角色表名称(Nil)", 
+			n_sys_rolename_like: "角色名称(%)", 
 		},
 		uiactions: {
 		},

app_web/src/locale/lanres/sys-role/sys-role_zh_CN.ts

 export default {
   fields: {
-    roleid: '角色表标识',
-    rolename: '角色表名称',
+    roleid: '角色标识',
+    rolename: '角色名称',
     memo: '备注',
     createdate: '建立时间',
     updatedate: '更新时间',
@@ -47,23 +47,23 @@ export default {
 			formpage1: '基本信息', 
 			srfupdatedate: '更新时间', 
 			srforikey: '', 
-			srfkey: '角色表标识', 
-			srfmajortext: '角色表名称', 
+			srfkey: '角色标识', 
+			srfmajortext: '角色名称', 
 			srftempmode: '', 
 			srfuf: '', 
 			srfdeid: '', 
 			srfsourcekey: '', 
-			sys_rolename: '角色表名称', 
+			sys_rolename: '角色名称', 
 			memo: '备注', 
-			sys_roleid: '角色表标识', 
+			sys_roleid: '角色标识', 
 		},
 		uiactions: {
 		},
 	},
 	main_grid: {
 		columns: {
-			sys_roleid: '角色表标识',
-			sys_rolename: '角色表名称',
+			sys_roleid: '角色标识',
+			sys_rolename: '角色名称',
 			memo: '备注',
 			updatedate: '更新时间',
 		},
@@ -73,9 +73,7 @@ export default {
 	default_searchform: {
 		details: {
 			formpage1: '常规条件', 
-			n_sys_rolename_like: '角色表名称(%)', 
-			n_sys_rolename_isnotnull: '角色表名称(NotNil)', 
-			n_sys_rolename_isnull: '角色表名称(Nil)', 
+			n_sys_rolename_like: '角色名称(%)', 
 		},
 		uiactions: {
 		},

app_web/src/locale/lanres/sys-user-role/sys-user-role_en_US.ts

 
 export default {
   fields: {
-    userroleid: '用户角色关系表标识',
-    roleid: '角色表标识',
+    userroleid: '用户角色关系标识',
+    roleid: '角色标识',
     rolename: '角色名称',
     userid: '用户标识',
     personname: '用户名称',
@@ -45,14 +45,14 @@ export default {
 			formpage1: "基本信息", 
 			srfupdatedate: "更新时间", 
 			srforikey: "", 
-			srfkey: "用户角色关系表标识", 
+			srfkey: "用户角色关系标识", 
 			srfmajortext: "用户标识", 
 			srftempmode: "", 
 			srfuf: "", 
 			srfdeid: "", 
 			srfsourcekey: "", 
-			sys_roleid: "角色表标识", 
-			sys_user_roleid: "用户角色关系表标识", 
+			sys_roleid: "角色标识", 
+			sys_user_roleid: "用户角色关系标识", 
 			sys_rolename: "角色名称", 
 			sys_username: "用户名称", 
 			sys_userid: "用户标识", 
@@ -64,7 +64,6 @@ export default {
 		columns: {
 			sys_username: "用户名称",
 			sys_rolename: "角色名称",
-			updatedate: "更新时间",
 		},
 		uiactions: {
 		},

app_web/src/locale/lanres/sys-user-role/sys-user-role_zh_CN.ts

 export default {
   fields: {
-    userroleid: '用户角色关系表标识',
-    roleid: '角色表标识',
+    userroleid: '用户角色关系标识',
+    roleid: '角色标识',
     rolename: '角色名称',
     userid: '用户标识',
     personname: '用户名称',
@@ -44,14 +44,14 @@ export default {
 			formpage1: '基本信息', 
 			srfupdatedate: '更新时间', 
 			srforikey: '', 
-			srfkey: '用户角色关系表标识', 
+			srfkey: '用户角色关系标识', 
 			srfmajortext: '用户标识', 
 			srftempmode: '', 
 			srfuf: '', 
 			srfdeid: '', 
 			srfsourcekey: '', 
-			sys_roleid: '角色表标识', 
-			sys_user_roleid: '用户角色关系表标识', 
+			sys_roleid: '角色标识', 
+			sys_user_roleid: '用户角色关系标识', 
 			sys_rolename: '角色名称', 
 			sys_username: '用户名称', 
 			sys_userid: '用户标识', 
@@ -63,7 +63,6 @@ export default {
 		columns: {
 			sys_username: '用户名称',
 			sys_rolename: '角色名称',
-			updatedate: '更新时间',
 		},
 		uiactions: {
 		},

app_web/src/pages/uaa/sys-rolegrid-view/sys-rolegrid-view-base.vue

@@ -9,7 +9,7 @@
             <div class='view-top-messages'>
             </div>
             <div style='margin-bottom: 6px;'>
-                <i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;' placeholder="角色表名称" />
+                <i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;' placeholder="角色名称" />
                 <div class='pull-right'>
                     <div class='toolbar-container'>
                         <tooltip :transfer="true" :max-width="600">

app_web/src/widgets/sys-role/default-searchform/default-searchform-base.vue

@@ -9,18 +9,6 @@
               <input-box v-model="data.n_sys_rolename_like"  @enter="onEnter($event)"    :disabled="detailsModel.n_sys_rolename_like.disabled" type='text'  style="width:100px;"></input-box>
           </app-form-item>
           
-          </i-col>
-          <i-col v-show="detailsModel.n_sys_rolename_isnotnull.visible" :style="{}"  :lg="{ span: 8, offset: 0 }">
-              <app-form-item name='n_sys_rolename_isnotnull' :itemRules="this.rules.n_sys_rolename_isnotnull" class='' :caption="$t('entities.sysrole.default_searchform.details.n_sys_rolename_isnotnull')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_sys_rolename_isnotnull.error" :isEmptyCaption="false" labelPos="LEFT"> 
-              <input-box v-model="data.n_sys_rolename_isnotnull"  @enter="onEnter($event)"    :disabled="detailsModel.n_sys_rolename_isnotnull.disabled" type='text'  style="width:100px;"></input-box>
-          </app-form-item>
-          
-          </i-col>
-          <i-col v-show="detailsModel.n_sys_rolename_isnull.visible" :style="{}"  :lg="{ span: 8, offset: 0 }">
-              <app-form-item name='n_sys_rolename_isnull' :itemRules="this.rules.n_sys_rolename_isnull" class='' :caption="$t('entities.sysrole.default_searchform.details.n_sys_rolename_isnull')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_sys_rolename_isnull.error" :isEmptyCaption="false" labelPos="LEFT"> 
-              <input-box v-model="data.n_sys_rolename_isnull"  @enter="onEnter($event)"    :disabled="detailsModel.n_sys_rolename_isnull.disabled" type='text'  style="width:100px;"></input-box>
-          </app-form-item>
-          
           </i-col>
       </row>
     </i-col>
@@ -263,8 +251,6 @@ export default class DefaultBase extends Vue implements ControlInterface {
      */
     public data: any = {
         n_sys_rolename_like: null,
-        n_sys_rolename_isnotnull: null,
-        n_sys_rolename_isnull: null,
     };
 
     /**
@@ -275,22 +261,10 @@ export default class DefaultBase extends Vue implements ControlInterface {
      */
     public rules: any = {
         n_sys_rolename_like: [
-            { type: 'string', message: '角色表名称(%) 值必须为字符串类型', trigger: 'change' },
-            { type: 'string', message: '角色表名称(%) 值必须为字符串类型', trigger: 'blur' },
-            { required: false, type: 'string', message: '角色表名称(%) 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '角色表名称(%) 值不能为空', trigger: 'blur' },
-        ],
-        n_sys_rolename_isnotnull: [
-            { type: 'string', message: '角色表名称(NotNil) 值必须为字符串类型', trigger: 'change' },
-            { type: 'string', message: '角色表名称(NotNil) 值必须为字符串类型', trigger: 'blur' },
-            { required: false, type: 'string', message: '角色表名称(NotNil) 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '角色表名称(NotNil) 值不能为空', trigger: 'blur' },
-        ],
-        n_sys_rolename_isnull: [
-            { type: 'string', message: '角色表名称(Nil) 值必须为字符串类型', trigger: 'change' },
-            { type: 'string', message: '角色表名称(Nil) 值必须为字符串类型', trigger: 'blur' },
-            { required: false, type: 'string', message: '角色表名称(Nil) 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '角色表名称(Nil) 值不能为空', trigger: 'blur' },
+            { type: 'string', message: '角色名称(%) 值必须为字符串类型', trigger: 'change' },
+            { type: 'string', message: '角色名称(%) 值必须为字符串类型', trigger: 'blur' },
+            { required: false, type: 'string', message: '角色名称(%) 值不能为空', trigger: 'change' },
+            { required: false, type: 'string', message: '角色名称(%) 值不能为空', trigger: 'blur' },
         ],
     }
 
@@ -303,11 +277,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
     public detailsModel: any = {
         formpage1: new FormPageModel({ caption: '常规条件', detailType: 'FORMPAGE', name: 'formpage1', visible: true, isShowCaption: true, form: this })
 , 
-        n_sys_rolename_like: new FormItemModel({ caption: '角色表名称(%)', detailType: 'FORMITEM', name: 'n_sys_rolename_like', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
-, 
-        n_sys_rolename_isnotnull: new FormItemModel({ caption: '角色表名称(NotNil)', detailType: 'FORMITEM', name: 'n_sys_rolename_isnotnull', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
-, 
-        n_sys_rolename_isnull: new FormItemModel({ caption: '角色表名称(Nil)', detailType: 'FORMITEM', name: 'n_sys_rolename_isnull', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
+        n_sys_rolename_like: new FormItemModel({ caption: '角色名称(%)', detailType: 'FORMITEM', name: 'n_sys_rolename_like', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
 , 
     };
 
@@ -323,30 +293,6 @@ export default class DefaultBase extends Vue implements ControlInterface {
         this.formDataChange({ name: 'n_sys_rolename_like', newVal: newVal, oldVal: oldVal });
     }
 
-    /**
-     * 监控表单属性 n_sys_rolename_isnotnull 值
-     *
-     * @param {*} newVal
-     * @param {*} oldVal
-     * @memberof DefaultBase
-     */
-    @Watch('data.n_sys_rolename_isnotnull')
-    onN_sys_rolename_isnotnullChange(newVal: any, oldVal: any) {
-        this.formDataChange({ name: 'n_sys_rolename_isnotnull', newVal: newVal, oldVal: oldVal });
-    }
-
-    /**
-     * 监控表单属性 n_sys_rolename_isnull 值
-     *
-     * @param {*} newVal
-     * @param {*} oldVal
-     * @memberof DefaultBase
-     */
-    @Watch('data.n_sys_rolename_isnull')
-    onN_sys_rolename_isnullChange(newVal: any, oldVal: any) {
-        this.formDataChange({ name: 'n_sys_rolename_isnull', newVal: newVal, oldVal: oldVal });
-    }
-
 
     /**
      * 重置表单项值
@@ -369,8 +315,6 @@ export default class DefaultBase extends Vue implements ControlInterface {
                 
 
 
-
-
     }
 
     /**

app_web/src/widgets/sys-role/default-searchform/default-searchform-model.ts

@@ -30,16 +30,6 @@ export default class DefaultModel {
         prop: 'rolename',
         dataType: 'TEXT',
       },
-      {
-        name: 'n_sys_rolename_isnotnull',
-        prop: 'rolename',
-        dataType: 'TEXT',
-      },
-      {
-        name: 'n_sys_rolename_isnull',
-        prop: 'rolename',
-        dataType: 'TEXT',
-      },
     ]
   }
 

app_web/src/widgets/sys-role/main-form/main-form-base.vue

@@ -464,16 +464,16 @@ export default class MainBase extends Vue implements ControlInterface {
             { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
         ],
         srfkey: [
-            { type: 'string', message: '角色表标识 值必须为字符串类型', trigger: 'change' },
-            { type: 'string', message: '角色表标识 值必须为字符串类型', trigger: 'blur' },
-            { required: false, type: 'string', message: '角色表标识 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '角色表标识 值不能为空', trigger: 'blur' },
+            { type: 'string', message: '角色标识 值必须为字符串类型', trigger: 'change' },
+            { type: 'string', message: '角色标识 值必须为字符串类型', trigger: 'blur' },
+            { required: false, type: 'string', message: '角色标识 值不能为空', trigger: 'change' },
+            { required: false, type: 'string', message: '角色标识 值不能为空', trigger: 'blur' },
         ],
         srfmajortext: [
-            { type: 'string', message: '角色表名称 值必须为字符串类型', trigger: 'change' },
-            { type: 'string', message: '角色表名称 值必须为字符串类型', trigger: 'blur' },
-            { required: false, type: 'string', message: '角色表名称 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '角色表名称 值不能为空', trigger: 'blur' },
+            { type: 'string', message: '角色名称 值必须为字符串类型', trigger: 'change' },
+            { type: 'string', message: '角色名称 值必须为字符串类型', trigger: 'blur' },
+            { required: false, type: 'string', message: '角色名称 值不能为空', trigger: 'change' },
+            { required: false, type: 'string', message: '角色名称 值不能为空', trigger: 'blur' },
         ],
         srftempmode: [
             { type: 'string', message: ' 值必须为字符串类型', trigger: 'change' },
@@ -500,10 +500,10 @@ export default class MainBase extends Vue implements ControlInterface {
             { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
         ],
         sys_rolename: [
-            { type: 'string', message: '角色表名称 值必须为字符串类型', trigger: 'change' },
-            { type: 'string', message: '角色表名称 值必须为字符串类型', trigger: 'blur' },
-            { required: false, type: 'string', message: '角色表名称 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '角色表名称 值不能为空', trigger: 'blur' },
+            { type: 'string', message: '角色名称 值必须为字符串类型', trigger: 'change' },
+            { type: 'string', message: '角色名称 值必须为字符串类型', trigger: 'blur' },
+            { required: false, type: 'string', message: '角色名称 值不能为空', trigger: 'change' },
+            { required: false, type: 'string', message: '角色名称 值不能为空', trigger: 'blur' },
         ],
         memo: [
             { type: 'string', message: '备注 值必须为字符串类型', trigger: 'change' },
@@ -512,10 +512,10 @@ export default class MainBase extends Vue implements ControlInterface {
             { required: false, type: 'string', message: '备注 值不能为空', trigger: 'blur' },
         ],
         sys_roleid: [
-            { type: 'string', message: '角色表标识 值必须为字符串类型', trigger: 'change' },
-            { type: 'string', message: '角色表标识 值必须为字符串类型', trigger: 'blur' },
-            { required: false, type: 'string', message: '角色表标识 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '角色表标识 值不能为空', trigger: 'blur' },
+            { type: 'string', message: '角色标识 值必须为字符串类型', trigger: 'change' },
+            { type: 'string', message: '角色标识 值必须为字符串类型', trigger: 'blur' },
+            { required: false, type: 'string', message: '角色标识 值不能为空', trigger: 'change' },
+            { required: false, type: 'string', message: '角色标识 值不能为空', trigger: 'blur' },
         ],
     }
 
@@ -544,9 +544,9 @@ export default class MainBase extends Vue implements ControlInterface {
 , 
         srforikey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srforikey', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
 , 
-        srfkey: new FormItemModel({ caption: '角色表标识', detailType: 'FORMITEM', name: 'srfkey', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
+        srfkey: new FormItemModel({ caption: '角色标识', detailType: 'FORMITEM', name: 'srfkey', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
 , 
-        srfmajortext: new FormItemModel({ caption: '角色表名称', detailType: 'FORMITEM', name: 'srfmajortext', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
+        srfmajortext: new FormItemModel({ caption: '角色名称', detailType: 'FORMITEM', name: 'srfmajortext', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
 , 
         srftempmode: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srftempmode', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
 , 
@@ -556,11 +556,11 @@ export default class MainBase extends Vue implements ControlInterface {
 , 
         srfsourcekey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfsourcekey', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
 , 
-        sys_rolename: new FormItemModel({ caption: '角色表名称', detailType: 'FORMITEM', name: 'sys_rolename', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
+        sys_rolename: new FormItemModel({ caption: '角色名称', detailType: 'FORMITEM', name: 'sys_rolename', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
 , 
         memo: new FormItemModel({ caption: '备注', detailType: 'FORMITEM', name: 'memo', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
 , 
-        sys_roleid: new FormItemModel({ caption: '角色表标识', detailType: 'FORMITEM', name: 'sys_roleid', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
+        sys_roleid: new FormItemModel({ caption: '角色标识', detailType: 'FORMITEM', name: 'sys_roleid', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
 , 
     };
 

app_web/src/widgets/sys-role/main-grid/main-grid-base.vue

@@ -550,14 +550,14 @@ export default class MainBase extends Vue implements ControlInterface {
     public allColumns: any[] = [
         {
             name: 'sys_roleid',
-            label: '角色表标识',
+            label: '角色标识',
             langtag: 'entities.sysrole.main_grid.columns.sys_roleid',
-            show: true,
+            show: false,
             util: 'PX'
         },
         {
             name: 'sys_rolename',
-            label: '角色表名称',
+            label: '角色名称',
             langtag: 'entities.sysrole.main_grid.columns.sys_rolename',
             show: true,
             util: 'PX'
@@ -606,8 +606,8 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public rules: any = {
         srfkey: [
-             { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '角色表标识 值不能为空', trigger: 'change' },
-            { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '角色表标识 值不能为空', trigger: 'blur' },
+             { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '角色标识 值不能为空', trigger: 'change' },
+            { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '角色标识 值不能为空', trigger: 'blur' },
         ],
     }
 

app_web/src/widgets/sys-role/main-grid/main-grid-model.ts

@@ -70,16 +70,6 @@ export default class MainModel {
         prop: 'n_sys_rolename_like',
         dataType: 'TEXT',
       },
-      {
-        name: 'n_sys_rolename_isnotnull',
-        prop: 'n_sys_rolename_isnotnull',
-        dataType: 'TEXT',
-      },
-      {
-        name: 'n_sys_rolename_isnull',
-        prop: 'n_sys_rolename_isnull',
-        dataType: 'TEXT',
-      },
 
         {
           name:'size',

app_web/src/widgets/sys-user-role/main-form/main-form-base.vue

@@ -440,10 +440,10 @@ export default class MainBase extends Vue implements ControlInterface {
             { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
         ],
         srfkey: [
-            { type: 'string', message: '用户角色关系表标识 值必须为字符串类型', trigger: 'change' },
-            { type: 'string', message: '用户角色关系表标识 值必须为字符串类型', trigger: 'blur' },
-            { required: false, type: 'string', message: '用户角色关系表标识 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '用户角色关系表标识 值不能为空', trigger: 'blur' },
+            { type: 'string', message: '用户角色关系标识 值必须为字符串类型', trigger: 'change' },
+            { type: 'string', message: '用户角色关系标识 值必须为字符串类型', trigger: 'blur' },
+            { required: false, type: 'string', message: '用户角色关系标识 值不能为空', trigger: 'change' },
+            { required: false, type: 'string', message: '用户角色关系标识 值不能为空', trigger: 'blur' },
         ],
         srfmajortext: [
             { type: 'string', message: '用户标识 值必须为字符串类型', trigger: 'change' },
@@ -476,16 +476,16 @@ export default class MainBase extends Vue implements ControlInterface {
             { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
         ],
         sys_roleid: [
-            { type: 'string', message: '角色表标识 值必须为字符串类型', trigger: 'change' },
-            { type: 'string', message: '角色表标识 值必须为字符串类型', trigger: 'blur' },
-            { required: false, type: 'string', message: '角色表标识 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '角色表标识 值不能为空', trigger: 'blur' },
+            { type: 'string', message: '角色标识 值必须为字符串类型', trigger: 'change' },
+            { type: 'string', message: '角色标识 值必须为字符串类型', trigger: 'blur' },
+            { required: false, type: 'string', message: '角色标识 值不能为空', trigger: 'change' },
+            { required: false, type: 'string', message: '角色标识 值不能为空', trigger: 'blur' },
         ],
         sys_user_roleid: [
-            { type: 'string', message: '用户角色关系表标识 值必须为字符串类型', trigger: 'change' },
-            { type: 'string', message: '用户角色关系表标识 值必须为字符串类型', trigger: 'blur' },
-            { required: false, type: 'string', message: '用户角色关系表标识 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '用户角色关系表标识 值不能为空', trigger: 'blur' },
+            { type: 'string', message: '用户角色关系标识 值必须为字符串类型', trigger: 'change' },
+            { type: 'string', message: '用户角色关系标识 值必须为字符串类型', trigger: 'blur' },
+            { required: false, type: 'string', message: '用户角色关系标识 值不能为空', trigger: 'change' },
+            { required: false, type: 'string', message: '用户角色关系标识 值不能为空', trigger: 'blur' },
         ],
         sys_rolename: [
             { type: 'string', message: '角色名称 值必须为字符串类型', trigger: 'change' },
@@ -522,7 +522,7 @@ export default class MainBase extends Vue implements ControlInterface {
 , 
         srforikey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srforikey', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
 , 
-        srfkey: new FormItemModel({ caption: '用户角色关系表标识', detailType: 'FORMITEM', name: 'srfkey', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
+        srfkey: new FormItemModel({ caption: '用户角色关系标识', detailType: 'FORMITEM', name: 'srfkey', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
 , 
         srfmajortext: new FormItemModel({ caption: '用户标识', detailType: 'FORMITEM', name: 'srfmajortext', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
 , 
@@ -534,9 +534,9 @@ export default class MainBase extends Vue implements ControlInterface {
 , 
         srfsourcekey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfsourcekey', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
 , 
-        sys_roleid: new FormItemModel({ caption: '角色表标识', detailType: 'FORMITEM', name: 'sys_roleid', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
+        sys_roleid: new FormItemModel({ caption: '角色标识', detailType: 'FORMITEM', name: 'sys_roleid', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
 , 
-        sys_user_roleid: new FormItemModel({ caption: '用户角色关系表标识', detailType: 'FORMITEM', name: 'sys_user_roleid', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
+        sys_user_roleid: new FormItemModel({ caption: '用户角色关系标识', detailType: 'FORMITEM', name: 'sys_user_roleid', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
 , 
         sys_rolename: new FormItemModel({ caption: '角色名称', detailType: 'FORMITEM', name: 'sys_rolename', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
 , 

app_web/src/widgets/sys-user-role/main-grid/main-grid-base.vue

@@ -60,18 +60,6 @@
                     </template>
                 </el-table-column>
             </template>
-            <template v-if="getColumnState('updatedate')">
-                <el-table-column show-overflow-tooltip :prop="'updatedate'" :label="$t('entities.sysuserrole.main_grid.columns.updatedate')" :width="250"  :align="'left'" :sortable="'custom'">
-                    <template v-slot:header="{column}">
-                      <span class="column-header ">
-                        {{$t('entities.sysuserrole.main_grid.columns.updatedate')}}
-                      </span>
-                    </template>
-                    <template v-slot="{row,column,$index}">
-                        <app-format-data format="YYYY-MM-DD hh:mm:ss" :data="row.updatedate"></app-format-data>
-                    </template>
-                </el-table-column>
-            </template>
             <template v-if="adaptiveState">
                 <el-table-column></el-table-column>
             </template>
@@ -564,13 +552,6 @@ export default class MainBase extends Vue implements ControlInterface {
             show: true,
             util: 'PX'
         },
-        {
-            name: 'updatedate',
-            label: '更新时间',
-            langtag: 'entities.sysuserrole.main_grid.columns.updatedate',
-            show: true,
-            util: 'PX'
-        },
     ]
 
     /**
@@ -601,8 +582,8 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public rules: any = {
         srfkey: [
-             { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '用户角色关系表标识 值不能为空', trigger: 'change' },
-            { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '用户角色关系表标识 值不能为空', trigger: 'blur' },
+             { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '用户角色关系标识 值不能为空', trigger: 'change' },
+            { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '用户角色关系标识 值不能为空', trigger: 'blur' },
         ],
     }
 

app_web/src/widgets/sys-user-role/main-grid/main-grid-model.ts

@@ -41,11 +41,6 @@ export default class MainModel {
           prop: 'roleid',
           dataType: 'PICKUP',
         },
-        {
-          name: 'updatedate',
-          prop: 'updatedate',
-          dataType: 'DATETIME',
-        },
         {
           name: 'srfmajortext',
           prop: 'userid',

config.xml

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

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SysAuthLog.java

@@ -29,7 +29,6 @@ import cn.ibizlab.util.domain.EntityMP;
 /**
  * 实体[认证日志]
  */
-@Builder
 @Getter
 @Setter
 @NoArgsConstructor

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SysPermission.java

@@ -29,7 +29,6 @@ import cn.ibizlab.util.domain.EntityMP;
 /**
  * 实体[权限/资源]
  */
-@Builder
 @Getter
 @Setter
 @NoArgsConstructor

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SysRole.java

@@ -29,7 +29,6 @@ import cn.ibizlab.util.domain.EntityMP;
 /**
  * 实体[系统角色]
  */
-@Builder
 @Getter
 @Setter
 @NoArgsConstructor

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SysRolePermission.java

@@ -29,7 +29,6 @@ import cn.ibizlab.util.domain.EntityMP;
 /**
  * 实体[角色权限关系]
  */
-@Builder
 @Getter
 @Setter
 @NoArgsConstructor

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SysUser.java

@@ -29,7 +29,6 @@ import cn.ibizlab.util.domain.EntityMP;
 /**
  * 实体[系统用户]
  */
-@Builder
 @Getter
 @Setter
 @NoArgsConstructor

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SysUserRole.java

@@ -29,7 +29,6 @@ import cn.ibizlab.util.domain.EntityMP;
 /**
  * 实体[用户角色关系]
  */
-@Builder
 @Getter
 @Setter
 @NoArgsConstructor

ibzuaa-provider/ibzuaa-provider-api/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 /ibzuaa-provider-api.jar
 
-EXPOSE 40002
+EXPOSE 8081
 
 ADD ibzuaa-provider-api.jar /ibzuaa-provider-api.jar

ibzuaa-provider/ibzuaa-provider-api/src/main/docker/ibzuaa-provider-api.yaml

@@ -3,21 +3,9 @@ services:
   ibzuaa-provider-api:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzuaa-provider-api:latest
     ports:
-      - "40002:40002"
+      - "8081:8081"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
-      - SERVER_PORT=40002
-      - 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
     deploy:
       mode: replicated
       replicas: 1