zhouweidong@lab.ibiz5.com 发布系统代码

app_web/src/locale/lanres/entities/msg-user-account/msg-user-account_en_US.ts

@@ -30,7 +30,6 @@ export default {
 			userid: "用户标识", 
 			identity_type: "认证类型", 
 			identifier: "认证标识", 
-			credential: "凭据", 
 			authid: "标识", 
 		},
 		uiactions: {
@@ -38,11 +37,9 @@ export default {
 	},
 	main_grid: {
 		columns: {
-			authid: "标识",
 			userid: "用户标识",
 			identity_type: "认证类型",
 			identifier: "认证标识",
-			credential: "凭据",
 		},
 		uiactions: {
 		},

app_web/src/locale/lanres/entities/msg-user-account/msg-user-account_zh_CN.ts

@@ -29,7 +29,6 @@ export default {
 			userid: "用户标识", 
 			identity_type: "认证类型", 
 			identifier: "认证标识", 
-			credential: "凭据", 
 			authid: "标识", 
 		},
 		uiactions: {
@@ -37,11 +36,9 @@ export default {
 	},
 	main_grid: {
 		columns: {
-			authid: "标识",
 			userid: "用户标识",
 			identity_type: "认证类型",
 			identifier: "认证标识",
-			credential: "凭据",
 		},
 		uiactions: {
 		},

app_web/src/pages/notify/notify-index-view/main.ts

@@ -50,10 +50,14 @@ Vue.use(UserComponent);
 Vue.use(PortletComponent);
 
 router.beforeEach((to: any, from: any, next: any) => {
-  if (to.meta && !to.meta.ignoreAddPage) {
-    router.app.$store.commit('addPage', to);
+  if(sessionStorage.getItem('lockState') && to.path != '/lock'){
+    next({ path: '/lock'});
+  }else{
+    if (to.meta && !to.meta.ignoreAddPage) {
+      router.app.$store.commit('addPage', to);
+    }
+    next();
   }
-  next();
 });
 
 Interceptors.getInstance(router,store);

app_web/src/widgets/msg-user-account/main-form/main-form-base.vue

@@ -50,20 +50,6 @@
 
 </app-form-item>
 
-</i-col>
-<i-col v-show="detailsModel.credential.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 12, offset: 0 }">
-    <app-form-item name='credential' :itemRules="this.rules().credential" class='' :caption="$t('entities.msguseraccount.main_form.details.credential')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.credential.error" :isEmptyCaption="false" labelPos="LEFT">
-    <input-box 
-    v-model="data.credential"  
-    @enter="onEnter($event)"  
-     unit=""  
-    :disabled="detailsModel.credential.disabled" 
-    type='text' 
-    style="">
-</input-box>
-
-</app-form-item>
-
 </i-col>
 
 
@@ -406,7 +392,6 @@ export default class MainBase extends Vue implements ControlInterface {
         userid: null,
         identity_type: null,
         identifier: null,
-        credential: null,
         authid: null,
         msguseraccount:null,
     };
@@ -511,12 +496,6 @@ export default class MainBase extends Vue implements ControlInterface {
             { required: false, type: 'string', message: '认证标识 值不能为空', trigger: 'change' },
             { required: false, type: 'string', message: '认证标识 值不能为空', trigger: 'blur' },
         ],
-        credential: [
-            { type: 'string', message: '凭据 值必须为字符串类型', trigger: 'change' },
-            { type: 'string', message: '凭据 值必须为字符串类型', trigger: 'blur' },
-            { required: false, type: 'string', message: '凭据 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '凭据 值不能为空', trigger: 'blur' },
-        ],
         authid: [
             { type: 'string', message: '标识 值必须为字符串类型', trigger: 'change' },
             { type: 'string', message: '标识 值必须为字符串类型', trigger: 'blur' },
@@ -632,8 +611,6 @@ export default class MainBase extends Vue implements ControlInterface {
         identity_type: new FormItemModel({ caption: '认证类型', detailType: 'FORMITEM', name: 'identity_type', visible: true, isShowCaption: true, form: this, isControlledContent: false , disabled: false, enableCond: 3 })
 , 
         identifier: new FormItemModel({ caption: '认证标识', detailType: 'FORMITEM', name: 'identifier', visible: true, isShowCaption: true, form: this, isControlledContent: false , disabled: false, enableCond: 3 })
-, 
-        credential: new FormItemModel({ caption: '凭据', detailType: 'FORMITEM', name: 'credential', visible: true, isShowCaption: true, form: this, isControlledContent: false , disabled: false, enableCond: 3 })
 , 
         authid: new FormItemModel({ caption: '标识', detailType: 'FORMITEM', name: 'authid', visible: true, isShowCaption: true, form: this, isControlledContent: false , disabled: false, enableCond: 3 })
 , 
@@ -759,18 +736,6 @@ export default class MainBase extends Vue implements ControlInterface {
         this.formDataChange({ name: 'identifier', newVal: newVal, oldVal: oldVal });
     }
 
-    /**
-     * 监控表单属性 credential 值
-     *
-     * @param {*} newVal
-     * @param {*} oldVal
-     * @memberof MainBase
-     */
-    @Watch('data.credential')
-    onCredentialChange(newVal: any, oldVal: any) {
-        this.formDataChange({ name: 'credential', newVal: newVal, oldVal: oldVal });
-    }
-
     /**
      * 监控表单属性 authid 值
      *
@@ -849,7 +814,6 @@ export default class MainBase extends Vue implements ControlInterface {
 
 
 
-
     }
 
     /**

app_web/src/widgets/msg-user-account/main-form/main-form-model.ts

@@ -65,11 +65,6 @@ export default class MainModel {
         prop: 'identifier',
         dataType: 'TEXT',
       },
-      {
-        name: 'credential',
-        prop: 'credential',
-        dataType: 'TEXT',
-      },
       {
         name: 'authid',
         prop: 'id',

app_web/src/widgets/msg-user-account/main-grid/main-grid-base.vue

@@ -21,18 +21,6 @@
             <template v-if="!isSingleSelect">
                 <el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
             </template>
-            <template v-if="getColumnState('authid')">
-                <el-table-column show-overflow-tooltip :prop="'authid'" :label="$t('entities.msguseraccount.main_grid.columns.authid')" :width="150"  :align="'left'" :sortable="'custom'">
-                    <template v-slot:header="{column}">
-                      <span class="column-header ">
-                        {{$t('entities.msguseraccount.main_grid.columns.authid')}}
-                      </span>
-                    </template>
-                    <template v-slot="{row,column,$index}">
-                        <span>{{row.authid}}</span>
-                    </template>
-                </el-table-column>
-            </template>
             <template v-if="getColumnState('userid')">
                 <el-table-column show-overflow-tooltip :prop="'userid'" :label="$t('entities.msguseraccount.main_grid.columns.userid')" :width="150"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
@@ -71,18 +59,6 @@
                     </template>
                 </el-table-column>
             </template>
-            <template v-if="getColumnState('credential')">
-                <el-table-column show-overflow-tooltip :prop="'credential'" :label="$t('entities.msguseraccount.main_grid.columns.credential')" :width="150"  :align="'left'" :sortable="'custom'">
-                    <template v-slot:header="{column}">
-                      <span class="column-header ">
-                        {{$t('entities.msguseraccount.main_grid.columns.credential')}}
-                      </span>
-                    </template>
-                    <template v-slot="{row,column,$index}">
-                        <span>{{row.credential}}</span>
-                    </template>
-                </el-table-column>
-            </template>
             <template v-if="adaptiveState">
                 <el-table-column></el-table-column>
             </template>
@@ -607,14 +583,6 @@ export default class MainBase extends Vue implements ControlInterface {
      * @memberof MainBase
      */
     public allColumns: any[] = [
-        {
-            name: 'authid',
-            label: '标识',
-            langtag: 'entities.msguseraccount.main_grid.columns.authid',
-            show: true,
-            util: 'px',
-            isEnableRowEdit: false,
-        },
         {
             name: 'userid',
             label: '用户标识',
@@ -639,14 +607,6 @@ export default class MainBase extends Vue implements ControlInterface {
             util: 'px',
             isEnableRowEdit: false,
         },
-        {
-            name: 'credential',
-            label: '凭据',
-            langtag: 'entities.msguseraccount.main_grid.columns.credential',
-            show: true,
-            util: 'px',
-            isEnableRowEdit: false,
-        },
     ]
 
     /**

app_web/src/widgets/msg-user-account/main-grid/main-grid-model.ts

@@ -57,16 +57,6 @@ export default class MainModel {
           dataType: 'TEXT',
           isEditable:true
         },
-        {
-          name: 'credential',
-          prop: 'credential',
-          dataType: 'TEXT',
-        },
-        {
-          name: 'authid',
-          prop: 'id',
-          dataType: 'TEXT',
-        },
         {
           name: 'msguseraccount',
           prop: 'id',