chitanda 发布系统代码 [TrainSys，网页端]

app_Web/packages/ibiz-vue/src/components/common/app-checkbox/app-checkbox.vue

@@ -30,16 +30,30 @@ export default class AppCheckbox extends Vue {
      */
     @Prop({ default: false }) public readonly?: boolean;
 
+    /**
+     * 设置未选中值
+     *
+     * @type {boolean}
+     */
+    @Prop({ default: 0 }) public nullValue!: any;
+
+    /**
+     * 设置选中值
+     *
+     * @type {boolean}
+     */
+    @Prop({ default: 1 }) public selectValue!: any;
+
     /**
      * 当前值
      *
      * @memberof checkbox
      */
     get CurrentVal() {
-        if (this.value == 0) {
-            return false;
-        } else if (this.value == 1) {
-            return true;
+        if (this.value === this.selectValue) {
+          return true;
+        } else {
+          return false;
         }
     }
 
@@ -49,7 +63,13 @@ export default class AppCheckbox extends Vue {
      * @memberof checkbox
      */
     set CurrentVal(val: any) {
-        this.$emit('change', val ? 1 : 0);
+        let value: any;
+        if (val) {
+          value = this.selectValue;
+        } else {
+          value = this.nullValue;
+        }
+        this.$emit('change', value);
     }
 }
 </script>

app_Web/packages/ibiz-vue/src/components/common/app-picker/app-picker.vue

@@ -947,15 +947,16 @@ export default class AppPicker extends Vue {
             return false;
         }
         // 合并表单参数
-        arg.param = this.viewparams ? JSON.parse(JSON.stringify(this.viewparams)) : {};
+        arg.param = {};
         arg.context = this.context ? JSON.parse(JSON.stringify(this.context)) : {};
+        const viewParams = this.viewparams ? JSON.parse(JSON.stringify(this.viewparams)) : {};
         // 附加参数处理
         if (this.localContext && Object.keys(this.localContext).length > 0) {
-            let _context = this.$util.computedNavData(this.data, arg.context, arg.param, this.localContext);
+            let _context = this.$util.computedNavData(this.data, arg.context, viewParams, this.localContext);
             Object.assign(arg.context, _context);
         }
         if (this.localParam && Object.keys(this.localParam).length > 0) {
-            let _param = this.$util.computedNavData(this.data, arg.context, arg.param, this.localParam);
+            let _param = this.$util.computedNavData(this.data, arg.context, viewParams, this.localParam);
             Object.assign(arg.param, _param);
         }
         return true;

app_Web/packages/ibiz-vue/src/components/editor/checkbox-editor/checkbox-editor.tsx

@@ -55,6 +55,20 @@ export default class CheckboxEditor extends EditorBase {
         }
     }
 
+    /**
+     * @description 初始化选项框参数
+     * @memberof CheckboxEditor
+     */
+    public initCheckBoxParam() {
+      if (this.editorInstance.editorType == 'CHECKBOX') {
+        const params: any = {
+          nullValue: this.editorInstance.editorParams?.['nullValue'] ? eval('(' + this.editorInstance.editorParams['nullValue'] + ')') : 0,
+          selectValue: this.editorInstance.editorParams?.['selectValue'] ? eval('(' + this.editorInstance.editorParams['selectValue'] + ')') : 1,
+        }
+        Object.assign(this.customProps, params);
+      }
+    }
+
     /**
      * 编辑器change事件
      *
@@ -101,7 +115,6 @@ export default class CheckboxEditor extends EditorBase {
         return Object.assign(params, param);
     }
 
-
     /**
      * 绘制内容
      *
@@ -112,6 +125,7 @@ export default class CheckboxEditor extends EditorBase {
         if (!this.editorIsLoaded) {
             return null;
         }
+        this.initCheckBoxParam();
         return this.$createElement(this.editorComponentName, {
             ref: 'editor',
             props: {

app_Web/packages/ibiz-vue/src/ctrl-model/app-dataview-model.ts

@@ -37,23 +37,28 @@ export class AppDataViewModel {
     let modelArray: any[] = [
       {
         name: 'size',
-        prop: 'size'
+        prop: 'size',
+        dataType: 'QUERYPARAM'
       },
       {
         name: 'query',
-        prop: 'query'
+        prop: 'query',
+        dataType: 'QUERYPARAM'
       },
       {
         name: 'sort',
-        prop: 'sort'
+        prop: 'sort',
+        dataType: 'QUERYPARAM'
       },
       {
         name: 'page',
-        prop: 'page'
+        prop: 'page',
+        dataType: 'QUERYPARAM'
       },
       {
         name: 'srfparentdata',
-        prop: 'srfparentdata'
+        prop: 'srfparentdata',
+        dataType: 'QUERYPARAM'
       },
       {
         name: 'srfwfmemo',

app_Web/packages/ibiz-vue/src/widgets/dataview-control-base.tsx

@@ -791,7 +791,9 @@ export class DataViewControlBase extends MDControlBase implements DataViewContro
         const selections: any[] = [];
         this.items.map((item: any) => {
             if (item.srfchecked === 1) {
-                selections.push(item);
+              const data = Util.deepCopy(item);
+              delete data.srfchecked;
+              selections.push(data);
             }
         });
         this.handleCtrlEvents('onselectionchange', { action: 'SelectionChange', data: selections }).then((res: boolean) => {

app_Web/swarm.yaml

@@ -3,7 +3,7 @@ services:
   trainsys-app-web:
     image: dstimage
     ports:
-      - "50100:80"
+      - "80:80"
     networks:
       - agent_network
     environment:

config.xml

@@ -55,12 +55,6 @@
 	  git clone -b master $para2 trainsys/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd trainsys/
-      mvn clean package -Ptrainsys
-      mvn install -Ptrainsys
-      cd trainsys-provider
-      mvn -Ptrainsys docker:build
-      mvn -Ptrainsys docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/trainsys-provider-trainsys.yaml ebsx --with-registry-auth      
       </command>
     </hudson.tasks.Shell>
   </builders>

trainsys-provider/pom.xml

@@ -34,7 +34,7 @@
 
     <profiles>
         <profile>
-            <id>trainsys</id>
+            <id>runtime</id>
             <build>
                 <resources>
                     <resource>

trainsys-provider/src/main/docker/Dockerfile

@@ -10,6 +10,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Duser.timezone=$TZ -Djava.security.egd=file:/dev/./urandom -jar /trainsys-provider.jar
 
-EXPOSE 50000
+EXPOSE 8081
 
 ADD trainsys-provider.jar /trainsys-provider.jar

trainsys-provider/src/main/docker/trainsys-provider-trainsys-k8s.yaml

@@ -22,32 +22,7 @@ spec:
         image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
         imagePullPolicy: Always
         ports:
-        - containerPort: 50000
-        env:
-        - name: SPRING_CLOUD_NACOS_DISCOVERY_IP
-          value: "172.16.240.140"      
-        - name: SERVER_PORT
-          value: "50000"
-        - name: SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR
-          value: "172.16.240.140:8848"
-        - name: SPRING_REDIS_HOST
-          value: "127.0.0.1"
-        - name: SPRING_REDIS_PORT
-          value: "6379"
-        - name: SPRING_REDIS_DATABASE
-          value: "0"
-        - name: SPRING_DATASOURCE_USERNAME
-          value: "a_LAB01_d23cc850e"
-        - name: SPRING_DATASOURCE_PASSWORD
-          value: "f9Df4556"
-        - name: SPRING_DATASOURCE_URL
-          value: "jdbc:mysql://172.16.186.185:3306/a_LAB01_d23cc850e?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&serverTimezone=Asia/Shanghai&allowMultiQueries=true&serverTimezone=GMT%2B8"
-        - name: SPRING_DATASOURCE_DRIVER-CLASS-NAME
-          value: "com.mysql.jdbc.Driver"
-        - name: SPRING_DATASOURCE_DEFAULTSCHEMA
-          value: "a_LAB01_d23cc850e"
-        - name: NACOS
-          value: "172.16.240.140:8848"      
+        - containerPort: 8081
 
 ---
 apiVersion: v1
@@ -60,9 +35,9 @@ spec:
   type: NodePort
   ports:
   - name: http
-    port: 50000
-    targetPort: 50000
-    nodePort: 50000
+    port: 8081
+    targetPort: 8081
+    nodePort: 8081
     protocol: TCP
   selector:
     app: trainsys-provider

trainsys-provider/src/main/docker/trainsys-provider-trainsys.yaml

@@ -3,23 +3,9 @@ services:
   trainsys-provider:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
     ports:
-      - "50000:50000"
+      - "8081:8081"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.140
-      - SERVER_PORT=50000
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.140:8848
-      - SPRING_CLOUD_NACOS_CONFIG_SERVER-ADDR=172.16.240.140:8848
-      - SPRING_REDIS_HOST=127.0.0.1
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_LAB01_d23cc850e
-      - SPRING_DATASOURCE_PASSWORD=f9Df4556
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_d23cc850e?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&serverTimezone=Asia/Shanghai&allowMultiQueries=true&serverTimezone=GMT%2B8
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_d23cc850e
-      - NACOS=172.16.240.140:8848
     deploy:
       resources:
            limits: