lxm1993 发布系统代码 [TrainSys，Mob]

2174e29c · ibizdev · 7a9b9854 · 2174e29c · 2174e29c · 2174e29c
--- a/app_Mob/swarm.yaml
+++ b/app_Mob/swarm.yaml
@@ -3,7 +3,7 @@ services:
  trainsys-app-mob:
    image: dstimage
    ports:
-      - "50200:80"
+      - "80:80"
    networks:
      - agent_network
    environment:

--- a/config.xml
+++ b/config.xml
@@ -55,36 +55,6 @@
 	  git clone -b master $para2 trainsys/
      export NODE_OPTIONS=--max-old-space-size=4096
      cd trainsys/
-      mkdir -p /var/lib/jenkins/appcache/64777BB9-78E2-44DD-AEF6-FF87AC45C1D5
-      if [ -e app_Mob/.dynamic ]
-      then
-          cd app_Mob
-      else
-          cd app_Mob/app
-      fi
-      sed -i "s#dstimage#$para5#g" swarm.yaml      
-      if [[ $para3 = all ]];then
-          mv Dockerfile-ALL Dockerfile      
-          set +e
-          sed -i "s#/api#/sztrainsys__mob#g" src/environments/environment.ts  
-          sed -i "s#outputDir#//outputDir#g" vue.config.js 
-          set -e
-          yarn
-          ln -s /var/lib/jenkins/appcache/64777BB9-78E2-44DD-AEF6-FF87AC45C1D5 node_modules/.cache
-          yarn build
-      else
-          if [ -e .dynamic ]
-          then
-              mv  ../trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob model
-          else
-              mv  ../../trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob model
-          fi
-          sed -i "s#srcimagename#$para4#g" Dockerfile-MODEL
-          mv Dockerfile-MODEL Dockerfile
-      fi          
-      docker build -t $para5 .
-      docker push $para5
-      docker -H $para1 stack deploy --compose-file=swarm.yaml ebsx --with-registry-auth
      </command>
    </hudson.tasks.Shell>
  </builders>

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/MapData.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/MapData.json
@@ -637,10 +637,11 @@
      "name" : "[DATATYPE][数据类型]",
      "getPSDEFFormItem" : {
        "codeName" : "Default",
-        "editorType" : "TEXTBOX",
+        "editorType" : "DROPDOWNLIST",
        "name" : "[DATATYPE][数据类型]",
        "stringLength" : 100,
-        "uIMode" : "DEFAULT"
+        "uIMode" : "DEFAULT",
+        "needCodeListConfig" : true
      },
      "type" : "DEFAULT"
    } ],

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/MapData.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/MapData.json
@@ -462,10 +462,11 @@
      "name" : "[DATATYPE][数据类型]",
      "getPSDEFFormItem" : {
        "codeName" : "Default",
-        "editorType" : "TEXTBOX",
+        "editorType" : "DROPDOWNLIST",
        "name" : "[DATATYPE][数据类型]",
        "stringLength" : 100,
-        "uIMode" : "DEFAULT"
+        "uIMode" : "DEFAULT",
+        "needCodeListConfig" : true
      },
      "type" : "DEFAULT"
    } ],

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/MapData/PSFORMS/Main.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/MapData/PSFORMS/Main.json
@@ -398,7 +398,7 @@
        "detailStyle" : "DEFAULT",
        "detailType" : "FORMITEM",
        "enableCond" : 3,
-        "ignoreInput" : 3,
+        "ignoreInput" : 0,
        "labelPos" : "LEFT",
        "labelWidth" : 130,
        "name" : "datatype",
@@ -408,16 +408,20 @@
          "codeName" : "DataType"
        },
        "getPSEditor" : {
-          "editorType" : "TEXTBOX",
-          "maxLength" : 100,
-          "name" : "datatype"
+          "editorType" : "DROPDOWNLIST",
+          "name" : "datatype",
+          "getPSAppCodeList" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/MapDataType.json"
+          },
+          "singleSelect" : true
        },
        "getPSLayoutPos" : {
          "colMD" : 24,
          "layout" : "TABLE_24COL"
        },
        "allowEmpty" : true,
-        "convertToCodeItemText" : true,
+        "needCodeListConfig" : true,
        "showCaption" : true
      } ],
      "getPSLayout" : {

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/MapDataEditView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/MapDataEditView.json
@@ -1101,7 +1101,7 @@
          "detailStyle" : "DEFAULT",
          "detailType" : "FORMITEM",
          "enableCond" : 3,
-          "ignoreInput" : 3,
+          "ignoreInput" : 0,
          "labelPos" : "LEFT",
          "labelWidth" : 130,
          "name" : "datatype",
@@ -1111,16 +1111,20 @@
            "codeName" : "DataType"
          },
          "getPSEditor" : {
-            "editorType" : "TEXTBOX",
-            "maxLength" : 100,
-            "name" : "datatype"
+            "editorType" : "DROPDOWNLIST",
+            "name" : "datatype",
+            "getPSAppCodeList" : {
+              "modelref" : true,
+              "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/MapDataType.json"
+            },
+            "singleSelect" : true
          },
          "getPSLayoutPos" : {
            "colMD" : 24,
            "layout" : "TABLE_24COL"
          },
          "allowEmpty" : true,
-          "convertToCodeItemText" : true,
+          "needCodeListConfig" : true,
          "showCaption" : true
        } ],
        "getPSLayout" : {

--- 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
@@ -11227,10 +11227,10 @@
    "codeName" : "VMGroup3",
    "name" : "视图消息类型测试",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-常规信息",
+      "name" : "消息类型-警告信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg4"
+        "id" : "ViewMsg5"
      }
    }, {
      "name" : "消息类型-错误信息",
@@ -11239,10 +11239,10 @@
        "id" : "ViewMsg6"
      }
    }, {
-      "name" : "消息类型-警告信息",
+      "name" : "消息类型-常规信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg5"
+        "id" : "ViewMsg4"
      }
    } ]
  }, {
@@ -11259,10 +11259,10 @@
    "codeName" : "VMGroup4",
    "name" : "视图消息位置测试",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息位置-弹出",
+      "name" : "消息位置-视图上方",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg10"
+        "id" : "ViewMsg7"
      }
    }, {
      "name" : "消息位置-视图下方",
@@ -11271,52 +11271,53 @@
        "id" : "ViewMsg8"
      }
    }, {
-      "name" : "消息位置-视图内容区",
+      "name" : "消息位置-弹出",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg9"
+        "id" : "ViewMsg10"
      }
    }, {
-      "name" : "消息位置-视图上方",
+      "name" : "消息位置-视图内容区",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg7"
+        "id" : "ViewMsg9"
      }
    } ]
  }, {
    "codeName" : "VMGroup8",
    "name" : "【静态测试】",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-错误信息",
+      "name" : "消息类型-警告信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg6"
+        "id" : "ViewMsg5"
      },
      "position" : "POPUP"
    }, {
-      "name" : "关闭模式-无删除-上方-常规",
+      "name" : "关闭模式-本次删除-上方-警告",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg13"
      }
    }, {
-      "name" : "消息类型-常规信息",
+      "name" : "消息类型-错误信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg4"
+        "id" : "ViewMsg6"
      },
      "position" : "POPUP"
    }, {
-      "name" : "关闭模式-默认删除-上方-错误",
+      "name" : "消息类型-常规信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg12"
-      }
+        "id" : "ViewMsg4"
+      },
+      "position" : "POPUP"
    }, {
-      "name" : "消息位置-视图内容区",
+      "name" : "关闭模式-无删除-上方-常规",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg9"
+        "id" : "ViewMsg11"
      }
    }, {
      "name" : "消息位置-视图下方",
@@ -11325,33 +11326,32 @@
        "id" : "ViewMsg8"
      }
    }, {
-      "name" : "关闭模式-本次删除-上方-警告",
+      "name" : "消息位置-视图内容区",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg13"
+        "id" : "ViewMsg9"
      }
    }, {
-      "name" : "消息类型-警告信息",
+      "name" : "关闭模式-默认删除-上方-错误",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg5"
-      },
-      "position" : "POPUP"
+        "id" : "ViewMsg12"
+      }
    } ]
  }, {
    "codeName" : "VMGroup5",
    "name" : "视图消息关闭模式",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-默认删除",
+      "name" : "关闭模式-无删除",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg12"
+        "id" : "ViewMsg11"
      }
    }, {
-      "name" : "关闭模式-无删除",
+      "name" : "关闭模式-默认删除",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg12"
      }
    }, {
      "name" : "关闭模式-本次删除",
@@ -11364,16 +11364,16 @@
    "codeName" : "VMGroup6",
    "name" : "视图消息动态模式测试",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "动态模式-实体数据集",
+      "name" : "动态模式-静态内容",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg14"
+        "id" : "ViewMsg15"
      }
    }, {
-      "name" : "动态模式-静态内容",
+      "name" : "动态模式-实体数据集",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg15"
+        "id" : "ViewMsg14"
      }
    } ]
  } ],