ibiz4j 发布系统代码 [ibz-lite，应用]

app_web/package.json

+{
+  "name": "app",
+  "version": "0.1.0",
+  "private": true,
+  "scripts": {
+    "serve": "node --max_old_space_size=8102 ./node_modules/@vue/cli-service/bin/vue-cli-service serve --mode test",
+    "dev-serve": "node --max_old_space_size=8102 ./node_modules/@vue/cli-service/bin/vue-cli-service serve --mode development",
+    "build": "node --max_old_space_size=8102 ./node_modules/@vue/cli-service/bin/vue-cli-service build",
+    "dev-build": "node --max_old_space_size=8102 ./node_modules/@vue/cli-service/bin/vue-cli-service build --mode development",
+    "test:unit": "vue-cli-service test:unit",
+    "test:e2e": "vue-cli-service test:e2e",
+    "lint": "vue-cli-service lint"
+  },
+  "dependencies": {
+    "@fullcalendar/core": "^4.4.0",
+    "@fullcalendar/daygrid": "^4.4.0",
+    "@fullcalendar/interaction": "^4.4.0",
+    "@fullcalendar/list": "^4.4.0",
+    "@fullcalendar/timegrid": "^4.4.0",
+    "@fullcalendar/vue": "^4.4.0",
+    "vuedraggable": "^2.23.2",
+    "async-validator": "^3.3.0",
+    "@popperjs/core": "^2.4.3",
+    "axios": "^0.19.1",
+    "core-js": "^3.4.4",
+    "echarts": "^4.6.0",
+    "element-ui": "^2.13.0",
+    "file-saver": "^2.0.2",
+    "font-awesome": "^4.7.0",
+    "ibiz-gantt-elastic": "^1.0.17",
+    "ibiz-vue-lib": "^0.1.13",
+    "ibiz-vue-pivottable": "^1.0.6",
+    "interactjs": "^1.9.4",
+    "moment": "^2.24.0",
+    "path-to-regexp": "^6.1.0",
+    "qs": "^6.9.1",
+    "rxjs": "^6.5.4",
+    "tinymce": "4.8.5",
+    "view-design": "4.2.0",
+    "vue": "^2.6.10",
+    "vue-amap": "^0.5.10",
+    "vue-class-component": "^7.0.2",
+    "vue-grid-layout": "^2.3.7",
+    "vue-i18n": "^8.15.3",
+    "vue-property-decorator": "^8.3.0",
+    "vue-router": "^3.1.3",
+    "vuex": "^3.1.2",
+    "bootstrap-vue": "^2.18.1",
+  "@json-editor/json-editor": "1.4.0-beta.0",
+  "js-object-pretty-print": "^0.3.0",
+  "v-jsoneditor": "^1.4.1",
+    "xlsx": "^0.15.6"
+  },
+  "devDependencies": {
+    "@types/echarts": "^4.4.3",
+    "@types/jest": "^24.0.19",
+    "@types/mockjs": "^1.0.2",
+    "@types/qs": "^6.9.0",
+    "@vue/cli-plugin-babel": "^4.1.0",
+    "@vue/cli-plugin-e2e-cypress": "^4.1.0",
+    "@vue/cli-plugin-router": "^4.1.0",
+    "@vue/cli-plugin-typescript": "^4.1.0",
+    "@vue/cli-plugin-unit-jest": "^4.1.0",
+    "@vue/cli-plugin-vuex": "^4.1.0",
+    "@vue/cli-service": "^4.1.0",
+    "@vue/test-utils": "1.0.0-beta.29",
+    "axios-mock-adapter": "^1.17.0",
+    "compression-webpack-plugin": "^4.0.0",
+    "less": "^3.0.4",
+    "less-loader": "^5.0.0",
+    "mockjs": "^1.1.0",
+    "script-loader": "^0.7.2",
+    "typescript": "^4.0.3",
+  
+  
+  
+  
+    "vue-template-compiler": "^2.6.10"
+  }
+}

app_web/src/components/app-panel-field/app-panel-field.less

@@ -5,6 +5,7 @@
   padding: 0 6px;
   .editor{
     flex-grow: 1;
+    line-height: 34px;
     .editorstyle{
       .ivu-input.ivu-input-default{
         border-color: red;
@@ -16,7 +17,7 @@
   }
   .app-panel-field-label {
     height: 34px !important;
-    line-height: 25px;
+    line-height: 22px;
     flex-shrink: 0;
     padding: 6px 10px 6px 0px;
   }

app_web/src/engine/view/edit-view3-engine.ts

@@ -89,10 +89,9 @@ export default class EditView3Engine extends EditViewEngine {
      */
     public onFormLoad(arg: any = {}): void {
         super.onFormLoad(arg);
-        this.view.formData = arg;
         if (this.getDrTab()) {
             const tag = this.getDrTab().name;
-            this.setViewState2({ tag: tag, action: 'state', viewdata: this.view.viewparams });
+            this.setViewState2({ tag: tag, action: 'state', viewdata: arg });
         }
     }
 
@@ -104,10 +103,9 @@ export default class EditView3Engine extends EditViewEngine {
      */
     public onFormSave(arg: any = {}): void {
         super.onFormSave(arg);
-        this.view.formData = arg;
         if (this.getDrTab()) {
             const tag = this.getDrTab().name;
-            this.setViewState2({ tag: tag, action: 'state', viewdata: this.view.viewparams });
+            this.setViewState2({ tag: tag, action: 'state', viewdata: arg });
         }
     }
 

app_web/src/engine/view/edit-view4-engine.ts

@@ -91,7 +91,7 @@ export default class EditView4Engine extends EditViewEngine {
         super.onFormLoad(arg);
         if (this.getDrTab()) {
             const tag = this.getDrTab().name;
-            this.setViewState2({ tag: tag, action: 'state', viewdata: this.view.viewparams });
+            this.setViewState2({ tag: tag, action: 'state', viewdata: arg });
         }
     }
 
@@ -105,7 +105,7 @@ export default class EditView4Engine extends EditViewEngine {
         super.onFormSave(arg);
         if (this.getDrTab()) {
             const tag = this.getDrTab().name;
-            this.setViewState2({ tag: tag, action: 'state', viewdata: this.view.viewparams });
+            this.setViewState2({ tag: tag, action: 'state', viewdata: arg });
         }
     }
 

config.xml

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

ibzlite-app/ibzlite-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 /ibzlite-app-web.jar
 
-EXPOSE 30010
+EXPOSE 8080
 
 ADD ibzlite-app-web.jar /ibzlite-app-web.jar

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

@@ -3,23 +3,9 @@ services:
   ibzlite-app-web:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzlite-app-web:latest
     ports:
-      - "30010:30010"
+      - "8080:8080"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
-      - SERVER_PORT=30010
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.100.243: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&allowMultiQueries=true
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
-      - NACOS=172.16.100.243:8848
-      - SPRING_CLOUD_NACOS_DISCOVERY_GROUP=ibizdev
     deploy:
       resources:
            limits: