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

3ba27321 · ibizdev · fa7a32a5 · 3ba27321 · 3ba27321 · 3ba27321
--- a/config.xml
+++ b/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>

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSSYSAPP.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSSYSAPP.json
@@ -1482,16 +1482,16 @@
    "codeName" : "VMGroup2",
    "name" : "视图消息组2",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息",
+      "name" : "视图消息2",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
      }
    }, {
-      "name" : "视图消息2",
+      "name" : "视图消息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
      }
    } ],
    "uniqueTag" : "VMGroup2"

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSGRIDS/RowEditGridView_Grid.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSGRIDS/RowEditGridView_Grid.json
@@ -141,17 +141,22 @@
  }, {
    "align" : "RIGHT",
    "cLConvertMode" : "NONE",
-    "caption" : "属性",
+    "caption" : "开始时间",
    "codeName" : "field",
    "columnType" : "DEFGRIDCOLUMN",
    "dataItemName" : "field",
-    "excelCaption" : "属性",
+    "excelCaption" : "开始时间",
    "name" : "field",
    "noPrivDisplayMode" : 1,
    "getPSAppDEField" : {
      "name" : "FIELD",
      "codeName" : "Field"
    },
+    "getPSControlAttributes" : [ {
+      "attrName" : "placeholder",
+      "attrValue" : "\"选择一个当月的日期\"",
+      "name" : "field_placeholder"
+    } ],
    "getPSControlLogics" : [ {
      "itemName" : "field",
      "logicTag" : "grid",
@@ -164,6 +169,29 @@
    "widthUnit" : "PX",
    "enableRowEdit" : true,
    "enableSort" : true
+  }, {
+    "align" : "LEFT",
+    "cLConvertMode" : "NONE",
+    "caption" : "结束时间",
+    "codeName" : "field2",
+    "columnType" : "DEFGRIDCOLUMN",
+    "dataItemName" : "field2",
+    "excelCaption" : "结束时间",
+    "name" : "field2",
+    "noPrivDisplayMode" : 1,
+    "getPSAppDEField" : {
+      "name" : "FIELD2",
+      "codeName" : "Field2"
+    },
+    "getPSControlAttributes" : [ {
+      "attrName" : "disabledDate",
+      "attrValue" : "(time) => {\r\n    console.log('注入属性');\r\n    if (!data.field1) {\r\n        return false;\r\n    }\r\n    const field1 = new Date(data.field1).getTime();\r\n    return time.getTime() < field1;\r\n}",
+      "name" : "field2_disabledDate"
+    } ],
+    "width" : 100,
+    "widthUnit" : "PX",
+    "enableRowEdit" : true,
+    "enableSort" : true
  } ],
  "getPSDEGridDataItems" : [ {
    "dataType" : 25,
@@ -193,6 +221,13 @@
      "name" : "FIELD",
      "codeName" : "Field"
    }
+  }, {
+    "dataType" : 25,
+    "name" : "field2",
+    "getPSAppDEField" : {
+      "name" : "FIELD2",
+      "codeName" : "Field2"
+    }
  }, {
    "dataType" : 25,
    "name" : "srfkey",
@@ -262,7 +297,7 @@
    "allowEmpty" : true,
    "enableUnitName" : true
  }, {
-    "caption" : "属性",
+    "caption" : "开始时间",
    "codeName" : "field",
    "enableCond" : 3,
    "ignoreInput" : 0,
@@ -272,11 +307,33 @@
      "codeName" : "Field"
    },
    "getPSEditor" : {
-      "editorType" : "TEXTBOX",
-      "maxLength" : 100,
+      "dateTimeFormat" : "YYYY-MM-DD",
+      "editorParams" : {
+        "TIMEFMT" : "YYYY-MM-DD"
+      },
+      "editorType" : "DATEPICKEREX_NOTIME",
      "name" : "field"
    },
    "allowEmpty" : true
+  }, {
+    "caption" : "结束时间",
+    "codeName" : "field2",
+    "enableCond" : 3,
+    "ignoreInput" : 0,
+    "name" : "field2",
+    "getPSAppDEField" : {
+      "name" : "FIELD2",
+      "codeName" : "Field2"
+    },
+    "getPSEditor" : {
+      "dateTimeFormat" : "YYYY-MM-DD",
+      "editorParams" : {
+        "TIMEFMT" : "YYYY-MM-DD"
+      },
+      "editorType" : "DATEPICKEREX_NOTIME",
+      "name" : "field2"
+    },
+    "allowEmpty" : true
  }, {
    "caption" : "测试实体标识",
    "codeName" : "srfkey",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSPANELS/Default.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSPANELS/Default.json
@@ -9,6 +9,9 @@
    "id" : "field_text_dynamic"
  }, {
    "id" : "field_textbox"
+  }, {
+    "id" : "time",
+    "viewFieldName" : "time"
  } ],
  "codeName" : "Default",
  "controlType" : "PANEL",
@@ -520,6 +523,51 @@
      "layout" : "TABLE_24COL"
    },
    "predefinedType" : "CONTAINER_IMAGE"
+  }, {
+    "caption" : "属性注入测试",
+    "itemStyle" : "DEFAULT",
+    "itemType" : "CONTAINER",
+    "name" : "container_group",
+    "getPSLayout" : {
+      "childColLG" : -1,
+      "childColMD" : 24,
+      "childColSM" : -1,
+      "childColXS" : -1,
+      "columnCount" : 24,
+      "layout" : "TABLE_24COL"
+    },
+    "getPSLayoutPos" : {
+      "colMD" : 24,
+      "layout" : "TABLE_24COL"
+    },
+    "getPSPanelItems" : [ {
+      "caption" : "文本框",
+      "itemStyle" : "DEFAULT",
+      "itemType" : "FIELD",
+      "name" : "time",
+      "getPSControlAttributes" : [ {
+        "attrName" : "disabledDate",
+        "attrValue" : "(time) => {\r\n    console.log('注入属性');\r\n    return time.getTime() > Date.now();\r\n}",
+        "name" : "time_disabledDate"
+      } ],
+      "getPSEditor" : {
+        "dateTimeFormat" : "YYYY-MM-DD",
+        "editorParams" : {
+          "TIMEFMT" : "YYYY-MM-DD"
+        },
+        "editorType" : "DATEPICKEREX_NOTIME",
+        "name" : "time"
+      },
+      "getPSLayoutPos" : {
+        "colMD" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "viewFieldName" : "time",
+      "hidden" : false,
+      "showCaption" : false
+    } ],
+    "predefinedType" : "CONTAINER_GROUP",
+    "showCaption" : true
  } ],
  "modelid" : "5202844E-3E6C-4A89-8BAD-41E022C2F640",
  "modeltype" : "PSSYSVIEWPANEL"

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTPanelView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTPanelView.json
@@ -23,6 +23,9 @@
      "id" : "field_text_dynamic"
    }, {
      "id" : "field_textbox"
+    }, {
+      "id" : "time",
+      "viewFieldName" : "time"
    } ],
    "codeName" : "Default",
    "controlType" : "PANEL",
@@ -537,6 +540,51 @@
        "layout" : "TABLE_24COL"
      },
      "predefinedType" : "CONTAINER_IMAGE"
+    }, {
+      "caption" : "属性注入测试",
+      "itemStyle" : "DEFAULT",
+      "itemType" : "CONTAINER",
+      "name" : "container_group",
+      "getPSLayout" : {
+        "childColLG" : -1,
+        "childColMD" : 24,
+        "childColSM" : -1,
+        "childColXS" : -1,
+        "columnCount" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "getPSLayoutPos" : {
+        "colMD" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "getPSPanelItems" : [ {
+        "caption" : "文本框",
+        "itemStyle" : "DEFAULT",
+        "itemType" : "FIELD",
+        "name" : "time",
+        "getPSControlAttributes" : [ {
+          "attrName" : "disabledDate",
+          "attrValue" : "(time) => {\r\n    console.log('注入属性');\r\n    return time.getTime() > Date.now();\r\n}",
+          "name" : "time_disabledDate"
+        } ],
+        "getPSEditor" : {
+          "dateTimeFormat" : "YYYY-MM-DD",
+          "editorParams" : {
+            "TIMEFMT" : "YYYY-MM-DD"
+          },
+          "editorType" : "DATEPICKEREX_NOTIME",
+          "name" : "time"
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "viewFieldName" : "time",
+        "hidden" : false,
+        "showCaption" : false
+      } ],
+      "predefinedType" : "CONTAINER_GROUP",
+      "showCaption" : true
    } ],
    "name" : "panel",
    "modelid" : "5202844E-3E6C-4A89-8BAD-41E022C2F640",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTRowEditGridView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTRowEditGridView.json
@@ -880,17 +880,22 @@
    }, {
      "align" : "RIGHT",
      "cLConvertMode" : "NONE",
-      "caption" : "属性",
+      "caption" : "开始时间",
      "codeName" : "field",
      "columnType" : "DEFGRIDCOLUMN",
      "dataItemName" : "field",
-      "excelCaption" : "属性",
+      "excelCaption" : "开始时间",
      "name" : "field",
      "noPrivDisplayMode" : 1,
      "getPSAppDEField" : {
        "name" : "FIELD",
        "codeName" : "Field"
      },
+      "getPSControlAttributes" : [ {
+        "attrName" : "placeholder",
+        "attrValue" : "\"选择一个当月的日期\"",
+        "name" : "field_placeholder"
+      } ],
      "getPSControlLogics" : [ {
        "itemName" : "field",
        "logicTag" : "grid",
@@ -903,6 +908,29 @@
      "widthUnit" : "PX",
      "enableRowEdit" : true,
      "enableSort" : true
+    }, {
+      "align" : "LEFT",
+      "cLConvertMode" : "NONE",
+      "caption" : "结束时间",
+      "codeName" : "field2",
+      "columnType" : "DEFGRIDCOLUMN",
+      "dataItemName" : "field2",
+      "excelCaption" : "结束时间",
+      "name" : "field2",
+      "noPrivDisplayMode" : 1,
+      "getPSAppDEField" : {
+        "name" : "FIELD2",
+        "codeName" : "Field2"
+      },
+      "getPSControlAttributes" : [ {
+        "attrName" : "disabledDate",
+        "attrValue" : "(time) => {\r\n    console.log('注入属性');\r\n    if (!data.field1) {\r\n        return false;\r\n    }\r\n    const field1 = new Date(data.field1).getTime();\r\n    return time.getTime() < field1;\r\n}",
+        "name" : "field2_disabledDate"
+      } ],
+      "width" : 100,
+      "widthUnit" : "PX",
+      "enableRowEdit" : true,
+      "enableSort" : true
    } ],
    "getPSDEGridDataItems" : [ {
      "dataType" : 25,
@@ -932,6 +960,13 @@
        "name" : "FIELD",
        "codeName" : "Field"
      }
+    }, {
+      "dataType" : 25,
+      "name" : "field2",
+      "getPSAppDEField" : {
+        "name" : "FIELD2",
+        "codeName" : "Field2"
+      }
    }, {
      "dataType" : 25,
      "name" : "srfkey",
@@ -1001,7 +1036,7 @@
      "allowEmpty" : true,
      "enableUnitName" : true
    }, {
-      "caption" : "属性",
+      "caption" : "开始时间",
      "codeName" : "field",
      "enableCond" : 3,
      "ignoreInput" : 0,
@@ -1011,11 +1046,33 @@
        "codeName" : "Field"
      },
      "getPSEditor" : {
-        "editorType" : "TEXTBOX",
-        "maxLength" : 100,
+        "dateTimeFormat" : "YYYY-MM-DD",
+        "editorParams" : {
+          "TIMEFMT" : "YYYY-MM-DD"
+        },
+        "editorType" : "DATEPICKEREX_NOTIME",
        "name" : "field"
      },
      "allowEmpty" : true
+    }, {
+      "caption" : "结束时间",
+      "codeName" : "field2",
+      "enableCond" : 3,
+      "ignoreInput" : 0,
+      "name" : "field2",
+      "getPSAppDEField" : {
+        "name" : "FIELD2",
+        "codeName" : "Field2"
+      },
+      "getPSEditor" : {
+        "dateTimeFormat" : "YYYY-MM-DD",
+        "editorParams" : {
+          "TIMEFMT" : "YYYY-MM-DD"
+        },
+        "editorType" : "DATEPICKEREX_NOTIME",
+        "name" : "field2"
+      },
+      "allowEmpty" : true
    }, {
      "caption" : "测试实体标识",
      "codeName" : "srfkey",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
@@ -13453,16 +13453,16 @@
    "codeName" : "VMGroup2",
    "name" : "视图消息组2",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息",
+      "name" : "视图消息2",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
      }
    }, {
-      "name" : "视图消息2",
+      "name" : "视图消息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
      }
    } ],
    "uniqueTag" : "VMGroup2"
@@ -13494,16 +13494,16 @@
    "codeName" : "VMGroup3",
    "name" : "视图消息类型测试",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-错误信息",
+      "name" : "消息类型-警告信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg6"
+        "id" : "ViewMsg5"
      }
    }, {
-      "name" : "消息类型-警告信息",
+      "name" : "消息类型-错误信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg5"
+        "id" : "ViewMsg6"
      }
    }, {
      "name" : "消息类型-常规信息",
@@ -13557,12 +13557,11 @@
    "codeName" : "VMGroup8",
    "name" : "【静态测试】",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-警告信息",
+      "name" : "消息位置-视图下方",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg5"
-      },
-      "position" : "POPUP"
+        "id" : "ViewMsg8"
+      }
    }, {
      "name" : "消息位置-视图内容区",
      "getPSAppViewMsg" : {
@@ -13575,6 +13574,13 @@
        "modelref" : true,
        "id" : "ViewMsg12"
      }
+    }, {
+      "name" : "消息类型-警告信息",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg5"
+      },
+      "position" : "POPUP"
    }, {
      "name" : "关闭模式-本次删除-上方-警告",
      "getPSAppViewMsg" : {
@@ -13588,12 +13594,6 @@
        "id" : "ViewMsg6"
      },
      "position" : "POPUP"
-    }, {
-      "name" : "消息位置-视图下方",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg8"
-      }
    }, {
      "name" : "消息类型-常规信息",
      "getPSAppViewMsg" : {
--- a/trainsys-provider/pom.xml
+++ b/trainsys-provider/pom.xml
@@ -33,7 +33,7 @@

    <profiles>
        <profile>
-            <id>trainsys</id>
+            <id>runtime</id>
            <build>
                <resources>
                    <resource>

--- a/trainsys-provider/src/main/docker/Dockerfile
+++ b/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
--- a/trainsys-provider/src/main/docker/trainsys-provider-trainsys-k8s.yaml
+++ b/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

--- a/trainsys-provider/src/main/docker/trainsys-provider-trainsys.yaml
+++ b/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: