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

42715e2e · ibizdev · 8f04486b · 42715e2e · 42715e2e · 42715e2e
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Song/PSGRIDS/Main.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Song/PSGRIDS/Main.json
@@ -361,19 +361,23 @@
    "caption" : "语言",
    "codeName" : "language",
    "enableCond" : 3,
-    "ignoreInput" : 3,
+    "ignoreInput" : 0,
    "name" : "language",
    "getPSAppDEField" : {
      "name" : "LANGUAGE",
      "codeName" : "Language"
    },
    "getPSEditor" : {
-      "editorType" : "TEXTBOX",
-      "maxLength" : 60,
-      "name" : "language"
+      "editorType" : "DROPDOWNLIST",
+      "name" : "language",
+      "getPSAppCodeList" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SongLanguage.json"
+      },
+      "singleSelect" : true
    },
    "allowEmpty" : true,
-    "convertToCodeItemText" : true
+    "needCodeListConfig" : true
  }, {
    "caption" : "歌曲标识",
    "codeName" : "srfkey",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/BXDMXUsr10257483CustomView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/BXDMXUsr10257483CustomView.json
@@ -893,19 +893,23 @@
        "caption" : "语言",
        "codeName" : "language",
        "enableCond" : 3,
-        "ignoreInput" : 3,
+        "ignoreInput" : 0,
        "name" : "language",
        "getPSAppDEField" : {
          "name" : "LANGUAGE",
          "codeName" : "Language"
        },
        "getPSEditor" : {
-          "editorType" : "TEXTBOX",
-          "maxLength" : 60,
-          "name" : "language"
+          "editorType" : "DROPDOWNLIST",
+          "name" : "language",
+          "getPSAppCodeList" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SongLanguage.json"
+          },
+          "singleSelect" : true
        },
        "allowEmpty" : true,
-        "convertToCodeItemText" : true
+        "needCodeListConfig" : true
      }, {
        "caption" : "歌曲标识",
        "codeName" : "srfkey",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/SongGridView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/SongGridView.json
@@ -1437,19 +1437,23 @@
      "caption" : "语言",
      "codeName" : "language",
      "enableCond" : 3,
-      "ignoreInput" : 3,
+      "ignoreInput" : 0,
      "name" : "language",
      "getPSAppDEField" : {
        "name" : "LANGUAGE",
        "codeName" : "Language"
      },
      "getPSEditor" : {
-        "editorType" : "TEXTBOX",
-        "maxLength" : 60,
-        "name" : "language"
+        "editorType" : "DROPDOWNLIST",
+        "name" : "language",
+        "getPSAppCodeList" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SongLanguage.json"
+        },
+        "singleSelect" : true
      },
      "allowEmpty" : true,
-      "convertToCodeItemText" : true
+      "needCodeListConfig" : true
    }, {
      "caption" : "歌曲标识",
      "codeName" : "srfkey",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/SongMPickupView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/SongMPickupView.json
@@ -505,19 +505,23 @@
          "caption" : "语言",
          "codeName" : "language",
          "enableCond" : 3,
-          "ignoreInput" : 3,
+          "ignoreInput" : 0,
          "name" : "language",
          "getPSAppDEField" : {
            "name" : "LANGUAGE",
            "codeName" : "Language"
          },
          "getPSEditor" : {
-            "editorType" : "TEXTBOX",
-            "maxLength" : 60,
-            "name" : "language"
+            "editorType" : "DROPDOWNLIST",
+            "name" : "language",
+            "getPSAppCodeList" : {
+              "modelref" : true,
+              "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SongLanguage.json"
+            },
+            "singleSelect" : true
          },
          "allowEmpty" : true,
-          "convertToCodeItemText" : true
+          "needCodeListConfig" : true
        }, {
          "caption" : "歌曲标识",
          "codeName" : "srfkey",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/SongPickupGridView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/SongPickupGridView.json
@@ -475,19 +475,23 @@
      "caption" : "语言",
      "codeName" : "language",
      "enableCond" : 3,
-      "ignoreInput" : 3,
+      "ignoreInput" : 0,
      "name" : "language",
      "getPSAppDEField" : {
        "name" : "LANGUAGE",
        "codeName" : "Language"
      },
      "getPSEditor" : {
-        "editorType" : "TEXTBOX",
-        "maxLength" : 60,
-        "name" : "language"
+        "editorType" : "DROPDOWNLIST",
+        "name" : "language",
+        "getPSAppCodeList" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SongLanguage.json"
+        },
+        "singleSelect" : true
      },
      "allowEmpty" : true,
-      "convertToCodeItemText" : true
+      "needCodeListConfig" : true
    }, {
      "caption" : "歌曲标识",
      "codeName" : "srfkey",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/SongPickupView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/SongPickupView.json
@@ -505,19 +505,23 @@
          "caption" : "语言",
          "codeName" : "language",
          "enableCond" : 3,
-          "ignoreInput" : 3,
+          "ignoreInput" : 0,
          "name" : "language",
          "getPSAppDEField" : {
            "name" : "LANGUAGE",
            "codeName" : "Language"
          },
          "getPSEditor" : {
-            "editorType" : "TEXTBOX",
-            "maxLength" : 60,
-            "name" : "language"
+            "editorType" : "DROPDOWNLIST",
+            "name" : "language",
+            "getPSAppCodeList" : {
+              "modelref" : true,
+              "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SongLanguage.json"
+            },
+            "singleSelect" : true
          },
          "allowEmpty" : true,
-          "convertToCodeItemText" : true
+          "needCodeListConfig" : 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
@@ -12333,16 +12333,16 @@
        "id" : "ViewMsg4"
      }
    }, {
-      "name" : "消息类型-警告信息",
+      "name" : "消息类型-错误信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg5"
+        "id" : "ViewMsg6"
      }
    }, {
-      "name" : "消息类型-错误信息",
+      "name" : "消息类型-警告信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg6"
+        "id" : "ViewMsg5"
      }
    } ]
  }, {
@@ -12359,46 +12359,47 @@
    "codeName" : "VMGroup4",
    "name" : "视图消息位置测试",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息位置-弹出",
+      "name" : "消息位置-视图上方",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg10"
+        "id" : "ViewMsg7"
      }
    }, {
-      "name" : "消息位置-视图内容区",
+      "name" : "消息位置-弹出",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg9"
+        "id" : "ViewMsg10"
      }
    }, {
-      "name" : "消息位置-视图上方",
+      "name" : "消息位置-视图下方",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg7"
+        "id" : "ViewMsg8"
      }
    }, {
-      "name" : "消息位置-视图下方",
+      "name" : "消息位置-视图内容区",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg8"
+        "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" : "ViewMsg6"
+      },
+      "position" : "POPUP"
    }, {
      "name" : "消息类型-常规信息",
      "getPSAppViewMsg" : {
@@ -12407,10 +12408,10 @@
      },
      "position" : "POPUP"
    }, {
-      "name" : "消息位置-视图下方",
+      "name" : "关闭模式-无删除-上方-常规",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg11"
      }
    }, {
      "name" : "关闭模式-默认删除-上方-错误",
@@ -12425,12 +12426,11 @@
        "id" : "ViewMsg9"
      }
    }, {
-      "name" : "消息类型-警告信息",
+      "name" : "消息位置-视图下方",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg5"
-      },
-      "position" : "POPUP"
+        "id" : "ViewMsg8"
+      }
    }, {
      "name" : "关闭模式-本次删除-上方-警告",
      "getPSAppViewMsg" : {
@@ -12442,16 +12442,16 @@
    "codeName" : "VMGroup5",
    "name" : "视图消息关闭模式",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-无删除",
+      "name" : "关闭模式-默认删除",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg12"
      }
    }, {
-      "name" : "关闭模式-默认删除",
+      "name" : "关闭模式-无删除",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg12"
+        "id" : "ViewMsg11"
      }
    }, {
      "name" : "关闭模式-本次删除",
@@ -12464,16 +12464,16 @@
    "codeName" : "VMGroup6",
    "name" : "视图消息动态模式测试",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "动态模式-实体数据集",
+      "name" : "动态模式-静态内容",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg14"
+        "id" : "ViewMsg15"
      }
    }, {
-      "name" : "动态模式-静态内容",
+      "name" : "动态模式-实体数据集",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg15"
+        "id" : "ViewMsg14"
      }
    } ]
  } ],
@@ -40588,19 +40588,23 @@
            "caption" : "语言",
            "codeName" : "language",
            "enableCond" : 3,
-            "ignoreInput" : 3,
+            "ignoreInput" : 0,
            "name" : "language",
            "getPSAppDEField" : {
              "name" : "LANGUAGE",
              "codeName" : "Language"
            },
            "getPSEditor" : {
-              "editorType" : "TEXTBOX",
-              "maxLength" : 60,
-              "name" : "language"
+              "editorType" : "DROPDOWNLIST",
+              "name" : "language",
+              "getPSAppCodeList" : {
+                "modelref" : true,
+                "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SongLanguage.json"
+              },
+              "singleSelect" : true
            },
            "allowEmpty" : true,
-            "convertToCodeItemText" : true
+            "needCodeListConfig" : true
          }, {
            "caption" : "歌曲标识",
            "codeName" : "srfkey",