ibiz4j 发布系统代码

app_web/src/components/app-form-druipart/app-form-druipart.vue

@@ -40,6 +40,14 @@ export default class AppFormDRUIPart extends Vue {
      */
     @Prop() public viewname?: string;
 
+    /**
+     * 临时数据模式：从数据模式:"2"、主数据模式:"1"、无临时数据模式:"0"
+     *
+     * @type {string}
+     * @memberof AppFormDRUIPart
+     */    
+    @Prop({default:"0"}) public tempMode?:string;
+
     /**
      * 刷新关系项
      *
@@ -285,11 +293,16 @@ export default class AppFormDRUIPart extends Vue {
         }
         this.viewparam = JSON.stringify(tempParam);
         if (this.isRelationalData) {
-            if (!_paramitem || _paramitem == null || Object.is(_paramitem, '')) {
-                this.blockUIStart();
-                return;
-            } else {
+            // 从数据模式无遮罩层
+            if(this.tempMode && Object.is(this.tempMode,"2")){
                 this.blockUIStop();
+            }else{
+                if (!_paramitem || _paramitem == null || Object.is(_paramitem, '')) {
+                    this.blockUIStart();
+                    return;
+                } else {
+                    this.blockUIStop();
+                }
             }
         }
         if(!this.isForbidLoad){
@@ -320,7 +333,16 @@ export default class AppFormDRUIPart extends Vue {
              // 表单保存之前
             if (Object.is($event.type, 'beforesave')) {
                 if(Object.is(this.refviewtype,'DEMEDITVIEW9') || Object.is(this.refviewtype,'DEGRIDVIEW9') || Object.is(this.refviewtype,'DEGRIDVIEW')){
-                    this.formDruipart.next({action:'save',data:$event.data});
+                   // 从数据模式直接通知保存
+                   if(this.tempMode && Object.is(this.tempMode,"2")){
+                       this.formDruipart.next({action:'save',data:$event.data});
+                   }else{
+                       if($event.data && !Object.is($event.data.srfuf,"0")){
+                            this.formDruipart.next({action:'save',data:$event.data});
+                        }else{
+                            this.$emit('drdatasaved',$event);
+                        }
+                   }
                 } else {
                     // 不需要保存的界面也要抛出事件，供计数器计算
                     this.$emit('drdatasaved',$event);

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

@@ -1366,6 +1366,7 @@ export default class MainBase extends Vue implements ControlInterface {
             this.resetDraftFormStates();
             this.onFormLoad(data,'loadDraft');
             this.data.appid = null;
+            data.sysapp = null;
             this.$emit('load', data);
             this.$nextTick(() => {
                 this.formState.next({ type: 'load', data: data });

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

@@ -1161,6 +1161,7 @@ export default class MainBase extends Vue implements ControlInterface {
             const data = response.data;
             this.resetDraftFormStates();
             this.onFormLoad(data,'loadDraft');
+            data.syspermission = null;
             this.$emit('load', data);
             this.$nextTick(() => {
                 this.formState.next({ type: 'load', data: data });

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

@@ -1285,6 +1285,7 @@ export default class MainBase extends Vue implements ControlInterface {
             const data = response.data;
             this.resetDraftFormStates();
             this.onFormLoad(data,'loadDraft');
+            data.sysrolepermission = null;
             this.$emit('load', data);
             this.$nextTick(() => {
                 this.formState.next({ type: 'load', data: data });

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

@@ -83,7 +83,8 @@
     refviewtype='DECUSTOMVIEW' 
     refreshitems='' 
     :ignorefieldvaluechange="ignorefieldvaluechange"
-    viewname='sys-role-permission-custom-view' 
+    viewname='sys-role-permission-custom-view'
+    tempMode='0'
     :data="JSON.stringify(this.data)" 
     @drdatasaved="drdatasaved($event)"
     style=";overflow: auto;">
@@ -121,7 +122,8 @@
     refviewtype='DEGRIDVIEW' 
     refreshitems='' 
     :ignorefieldvaluechange="ignorefieldvaluechange"
-    viewname='sys-user-rolegrid-view' 
+    viewname='sys-user-rolegrid-view'
+    tempMode='0'
     :data="JSON.stringify(this.data)" 
     @drdatasaved="drdatasaved($event)"
     style=";overflow: auto;">
@@ -1368,6 +1370,7 @@ export default class MainBase extends Vue implements ControlInterface {
             const data = response.data;
             this.resetDraftFormStates();
             this.onFormLoad(data,'loadDraft');
+            data.sysrole = null;
             this.$emit('load', data);
             this.$nextTick(() => {
                 this.formState.next({ type: 'load', data: data });

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

@@ -82,7 +82,7 @@
                 </el-table-column>
             </template>
             <template v-if="getColumnState('prolename')">
-                <el-table-column show-overflow-tooltip :prop="'prolename'" :label="$t('entities.sysrole.main_grid.columns.prolename')" :width="250"  :align="'left'" :sortable="'custom'">
+                <el-table-column show-overflow-tooltip :prop="'prolename'" :label="$t('entities.sysrole.main_grid.columns.prolename')" :width="350"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
                         {{$t('entities.sysrole.main_grid.columns.prolename')}}
@@ -660,7 +660,7 @@ export default class MainBase extends Vue implements ControlInterface {
             name: 'proleid',
             label: '父角色标识',
             langtag: 'entities.sysrole.main_grid.columns.proleid',
-            show: true,
+            show: false,
             util: 'PX',
             isEnableRowEdit: false,
         },

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

@@ -1303,6 +1303,7 @@ export default class MainBase extends Vue implements ControlInterface {
             this.resetDraftFormStates();
             this.onFormLoad(data,'loadDraft');
             this.data.sys_user_roleid = null;
+            data.sysuserrole = null;
             this.$emit('load', data);
             this.$nextTick(() => {
                 this.formState.next({ type: 'load', data: data });

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

@@ -64,7 +64,8 @@
     refviewtype='DEGRIDVIEW' 
     refreshitems='' 
     :ignorefieldvaluechange="ignorefieldvaluechange"
-    viewname='sys-user-rolegrid-view' 
+    viewname='sys-user-rolegrid-view'
+    tempMode='0'
     :data="JSON.stringify(this.data)" 
     @drdatasaved="drdatasaved($event)"
     style=";overflow: auto;">
@@ -1292,6 +1293,7 @@ export default class MainBase extends Vue implements ControlInterface {
             this.resetDraftFormStates();
             this.onFormLoad(data,'loadDraft');
             this.data.userid = null;
+            data.sysuser = null;
             this.$emit('load', data);
             this.$nextTick(() => {
                 this.formState.next({ type: 'load', data: data });

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 -Pweb
-      cd ibzuaa-app/ibzuaa-app-web
-      mvn -Pweb docker:build
-      mvn -Pweb docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/ibzuaa-app-web.yaml ibzlab-rt --with-registry-auth
       </command>
     </hudson.tasks.Shell>
   </builders>

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

@@ -12,6 +12,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-app-web.jar
 
-EXPOSE 30002
+EXPOSE 8080
 
 ADD ibzuaa-app-web.jar /ibzuaa-app-web.jar

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

@@ -3,24 +3,9 @@ services:
   ibzuaa-app-web:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzuaa-app-web:latest
     ports:
-      - "30002:30002"
+      - "8080:8080"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
-      - SERVER_PORT=30002
-      - 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
-      - ABC=1
-      - DEC=3
-      - NACOS=172.16.102.211:8848
     deploy:
       resources:
            limits:

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

@@ -74,7 +74,7 @@
 
 
     <!--输出实体[SYS_ROLE]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-sys_role-106-4">
+    <changeSet author="a_A_5d9d78509" id="tab-sys_role-108-4">
         <createTable tableName="IBZROLE">
                 <column name="SYS_ROLEID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_SYS_ROLE_SYS_ROLEID"/>
@@ -134,7 +134,7 @@
         <!--输出实体[SYS_PSSYSTEM]外键关系 -->
         <!--输出实体[SYS_PERMISSION]外键关系 -->
         <!--输出实体[SYS_ROLE]外键关系 -->
-    <changeSet author="a_A_5d9d78509" id="fk-sys_role-106-7">
+    <changeSet author="a_A_5d9d78509" id="fk-sys_role-108-7">
        <addForeignKeyConstraint baseColumnNames="PROLEID" baseTableName="IBZROLE" constraintName="DER1N_SYS_ROLE_SYS_ROLE_PROLEI" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SYS_ROLEID" referencedTableName="IBZROLE" validate="true"/>
     </changeSet>
         <!--输出实体[SYS_ROLE_PERMISSION]外键关系 -->