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

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,15 +55,6 @@
 	  git clone -b master $para2 trainsys/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd trainsys/
-      mkdir -p /var/lib/jenkins/appcache/A3064A91-F42D-4D7F-BC1C-4173A4F5772C
-      if [ -e app_Web/.dynamic ]
-      then
-          cd app_Web
-      else
-          cd app_Web/app
-      fi
-      sed -i "s#dstimage#registry.cn-shanghai.aliyuncs.com/ibizsys/ibizcloud-standardsys-app-webapp:2022.07.29.003#g" swarm.yaml
-      docker -H $para1 stack deploy --compose-file=swarm.yaml ebsx --with-registry-auth    
       </command>
     </hudson.tasks.Shell>
   </builders>

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

@@ -72,7 +72,7 @@
     </changeSet>
 
     <!--输出实体[PHONE]数据结构 -->
-    <changeSet author="root" id="tab-phone-21-3">
+    <changeSet author="root" id="tab-phone-23-3">
         <createTable tableName="T_PHONE">
                 <column name="PHONEID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_PHONE"/>

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common.json

 {
+  "getAllPSCodeLists" : [ {
+    "modelref" : true,
+    "path" : "PSMODULES/common/PSCODELISTS/PhoneType.json"
+  } ],
   "getAllPSDataEntities" : [ {
     "modelref" : true,
     "path" : "PSMODULES/common/PSDATAENTITIES/Book.json"

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSCODELISTS/PhoneType.json

+{
+  "codeListTag" : "common__PhoneType",
+  "codeListType" : "STATIC",
+  "codeName" : "PhoneType",
+  "dynaInstMode" : 0,
+  "dynaModelFilePath" : "PSMODULES/common/PSCODELISTS/PhoneType.json",
+  "emptyText" : "未定义",
+  "name" : "手机类型",
+  "getPSCodeItems" : [ {
+    "codeName" : "Xiaomi",
+    "text" : "小米",
+    "value" : "XiaoMi"
+  }, {
+    "codeName" : "Iphone",
+    "text" : "苹果",
+    "value" : "Iphone"
+  } ],
+  "getPSDataEntity" : {
+    "modelref" : true,
+    "path" : "PSMODULES/common/PSDATAENTITIES/Phone.json"
+  },
+  "getPSSystemModule" : {
+    "modelref" : true,
+    "path" : "PSMODULES/common.json"
+  },
+  "refFlag" : true,
+  "systemTag" : "TrainSys",
+  "codeItemValueNumber" : false,
+  "enableCache" : true,
+  "subSysAsCloud" : false,
+  "subSysCodeList" : false,
+  "userScope" : false
+}
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Phone.json

@@ -1073,10 +1073,11 @@
       "name" : "[PHONETYPE][手机型号]",
       "getPSDEFFormItem" : {
         "codeName" : "Default",
-        "editorType" : "TEXTBOX",
+        "editorType" : "DROPDOWNLIST",
         "name" : "[PHONETYPE][手机型号]",
         "stringLength" : 100,
-        "uIMode" : "DEFAULT"
+        "uIMode" : "DEFAULT",
+        "needCodeListConfig" : true
       },
       "type" : "DEFAULT"
     }, {
@@ -1084,11 +1085,12 @@
       "name" : "[PHONETYPE][手机型号]移动端默认",
       "getPSDEFFormItem" : {
         "codeName" : "MobileDefault",
-        "editorType" : "MOBTEXT",
+        "editorType" : "MOBDROPDOWNLIST",
         "name" : "[PHONETYPE][手机型号]移动端默认",
         "stringLength" : 100,
         "uIMode" : "MOBILEDEFAULT",
-        "mobileMode" : true
+        "mobileMode" : true,
+        "needCodeListConfig" : true
       },
       "type" : "MOBILEDEFAULT",
       "mobileMode" : true
@@ -1120,11 +1122,15 @@
     } ],
     "codeName" : "Phonetype",
     "dEFType" : 1,
-    "dataType" : "TEXT",
+    "dataType" : "SSCODELIST",
     "importOrder" : 1000,
     "length" : 100,
     "logicName" : "手机型号",
     "name" : "PHONETYPE",
+    "getPSCodeList" : {
+      "modelref" : true,
+      "path" : "PSMODULES/common/PSCODELISTS/PhoneType.json"
+    },
     "getPSDEDBTable" : {
       "modelref" : true,
       "path" : "PSMODULES/common/PSDATAENTITIES/Phone/PSDETABLES/Table.json"

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPCODELISTS/PhoneType.json

+{
+  "codeListTag" : "common__PhoneType",
+  "codeListType" : "STATIC",
+  "codeName" : "PhoneType",
+  "dynaInstMode" : 0,
+  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPCODELISTS/PhoneType.json",
+  "emptyText" : "未定义",
+  "name" : "手机类型",
+  "getPSAppDataEntity" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone.json"
+  },
+  "getPSCodeItems" : [ {
+    "codeName" : "Xiaomi",
+    "text" : "小米",
+    "value" : "XiaoMi"
+  }, {
+    "codeName" : "Iphone",
+    "text" : "苹果",
+    "value" : "Iphone"
+  } ],
+  "enableCache" : true
+}
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone/PSGRIDS/Main.json

@@ -27,7 +27,7 @@
   } ],
   "getPSDEGridColumns" : [ {
     "align" : "LEFT",
-    "cLConvertMode" : "NONE",
+    "cLConvertMode" : "FRONT",
     "caption" : "手机型号",
     "codeName" : "phonetype",
     "columnType" : "DEFGRIDCOLUMN",
@@ -35,6 +35,10 @@
     "excelCaption" : "手机型号",
     "name" : "phonetype",
     "noPrivDisplayMode" : 1,
+    "getPSAppCodeList" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/PhoneType.json"
+    },
     "getPSAppDEField" : {
       "name" : "PHONETYPE",
       "codeName" : "Phonetype"
@@ -188,11 +192,16 @@
       "codeName" : "Phonetype"
     },
     "getPSEditor" : {
-      "editorType" : "TEXTBOX",
-      "maxLength" : 100,
-      "name" : "phonetype"
+      "editorType" : "DROPDOWNLIST",
+      "name" : "phonetype",
+      "getPSAppCodeList" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/PhoneType.json"
+      },
+      "singleSelect" : true
     },
-    "allowEmpty" : true
+    "allowEmpty" : true,
+    "needCodeListConfig" : true
   }, {
     "caption" : "手机标识",
     "codeName" : "phoneid",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/phonePhoneView.json

@@ -456,7 +456,7 @@
     },
     "getPSDEGridColumns" : [ {
       "align" : "LEFT",
-      "cLConvertMode" : "NONE",
+      "cLConvertMode" : "FRONT",
       "caption" : "手机型号",
       "codeName" : "phonetype",
       "columnType" : "DEFGRIDCOLUMN",
@@ -464,6 +464,10 @@
       "excelCaption" : "手机型号",
       "name" : "phonetype",
       "noPrivDisplayMode" : 1,
+      "getPSAppCodeList" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/PhoneType.json"
+      },
       "getPSAppDEField" : {
         "name" : "PHONETYPE",
         "codeName" : "Phonetype"
@@ -617,11 +621,16 @@
         "codeName" : "Phonetype"
       },
       "getPSEditor" : {
-        "editorType" : "TEXTBOX",
-        "maxLength" : 100,
-        "name" : "phonetype"
+        "editorType" : "DROPDOWNLIST",
+        "name" : "phonetype",
+        "getPSAppCodeList" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/PhoneType.json"
+        },
+        "singleSelect" : true
       },
-      "allowEmpty" : true
+      "allowEmpty" : true,
+      "needCodeListConfig" : true
     }, {
       "caption" : "手机标识",
       "codeName" : "phoneid",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json

 {
   "getAllPSAppCodeLists" : [ {
+    "codeListTag" : "common__PhoneType",
+    "codeListType" : "STATIC",
+    "codeName" : "PhoneType",
+    "dynaInstMode" : 0,
+    "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPCODELISTS/PhoneType.json",
+    "emptyText" : "未定义",
+    "name" : "手机类型",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone.json"
+    },
+    "getPSCodeItems" : [ {
+      "codeName" : "Xiaomi",
+      "text" : "小米",
+      "value" : "XiaoMi"
+    }, {
+      "codeName" : "Iphone",
+      "text" : "苹果",
+      "value" : "Iphone"
+    } ],
+    "enableCache" : true
+  }, {
     "codeListTag" : "SysOperator",
     "codeListType" : "DYNAMIC",
     "codeName" : "SysOperator",
@@ -4213,7 +4235,7 @@
         },
         "getPSDEGridColumns" : [ {
           "align" : "LEFT",
-          "cLConvertMode" : "NONE",
+          "cLConvertMode" : "FRONT",
           "caption" : "手机型号",
           "codeName" : "phonetype",
           "columnType" : "DEFGRIDCOLUMN",
@@ -4221,6 +4243,10 @@
           "excelCaption" : "手机型号",
           "name" : "phonetype",
           "noPrivDisplayMode" : 1,
+          "getPSAppCodeList" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/PhoneType.json"
+          },
           "getPSAppDEField" : {
             "name" : "PHONETYPE",
             "codeName" : "Phonetype"
@@ -4374,11 +4400,16 @@
             "codeName" : "Phonetype"
           },
           "getPSEditor" : {
-            "editorType" : "TEXTBOX",
-            "maxLength" : 100,
-            "name" : "phonetype"
+            "editorType" : "DROPDOWNLIST",
+            "name" : "phonetype",
+            "getPSAppCodeList" : {
+              "modelref" : true,
+              "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/PhoneType.json"
+            },
+            "singleSelect" : true
           },
-          "allowEmpty" : true
+          "allowEmpty" : true,
+          "needCodeListConfig" : true
         }, {
           "caption" : "手机标识",
           "codeName" : "phoneid",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSTEM.json

@@ -9,6 +9,9 @@
   }, {
     "modelref" : true,
     "path" : "PSCODELISTS/CodeList75.json"
+  }, {
+    "modelref" : true,
+    "path" : "PSMODULES/common/PSCODELISTS/PhoneType.json"
   }, {
     "modelref" : true,
     "path" : "PSCODELISTS/CodeList68.json"
@@ -551,6 +554,10 @@
     "path" : "PSSYSVALUERULES/ValueRule12.json"
   } ],
   "getAllPSSystemModules" : [ {
+    "getAllPSCodeLists" : [ {
+      "modelref" : true,
+      "path" : "PSMODULES/common/PSCODELISTS/PhoneType.json"
+    } ],
     "getAllPSDataEntities" : [ {
       "modelref" : true,
       "path" : "PSMODULES/common/PSDATAENTITIES/Book.json"