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

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/ModelRepository/PSCODELISTS/CodeList44.json

@@ -8,7 +8,7 @@
   "name" : "图书类型",
   "getPSCodeItems" : [ {
     "codeName" : "Xx",
-    "data" : "a=11",
+    "data" : "{\na: 11\n}",
     "text" : "仙侠",
     "value" : "xx"
   }, {

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

 {
   "getAllPSCodeLists" : [ {
     "modelref" : true,
-    "path" : "PSMODULES/Test/PSCODELISTS/SongType.json"
+    "path" : "PSMODULES/Test/PSCODELISTS/SongLanguage.json"
   }, {
     "modelref" : true,
     "path" : "PSMODULES/Test/PSCODELISTS/TestAll.json"

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSCODELISTS/SongLanguage.json

+{
+  "codeListTag" : "Test__SongLanguage",
+  "codeListType" : "STATIC",
+  "codeName" : "SongLanguage",
+  "dynaInstMode" : 0,
+  "dynaModelFilePath" : "PSMODULES/Test/PSCODELISTS/SongLanguage.json",
+  "emptyText" : "未定义",
+  "name" : "歌曲语言",
+  "getPSSystemModule" : {
+    "modelref" : true,
+    "path" : "PSMODULES/Test.json"
+  },
+  "refFlag" : false,
+  "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/Test/PSDATAENTITIES/Song.json

@@ -184,8 +184,8 @@
   } ],
   "getAllPSDEDBTables" : [ {
     "getAllPSDEFields" : [ {
-      "name" : "TYPE",
-      "codeName" : "Type"
+      "name" : "LANGUAGE",
+      "codeName" : "Language"
     }, {
       "name" : "SONGNAME",
       "codeName" : "SongName"
@@ -310,42 +310,44 @@
   } ],
   "getAllPSDEFields" : [ {
     "getAllPSDEFDTColumns" : [ {
-      "columnName" : "TYPE",
+      "columnName" : "LANGUAGE",
       "dBType" : "MYSQL5",
-      "name" : "TYPE",
-      "queryCodeExp" : "t1.`TYPE`",
-      "standardColumnName" : "`TYPE`"
+      "name" : "LANGUAGE",
+      "queryCodeExp" : "t1.`LANGUAGE`",
+      "standardColumnName" : "`LANGUAGE`"
     } ],
     "getAllPSDEFSearchModes" : [ {
-      "codeName" : "N_TYPE_EQ",
-      "name" : "N_TYPE_EQ",
-      "stdDataType" : 9,
+      "codeName" : "N_LANGUAGE_EQ",
+      "name" : "N_LANGUAGE_EQ",
+      "stdDataType" : 25,
       "valueOP" : "EQ"
     } ],
     "getAllPSDEFUIModes" : [ {
+      "codeName" : "Default",
+      "name" : "[LANGUAGE][语言]",
+      "getPSDEFFormItem" : {
+        "codeName" : "Default",
+        "editorType" : "DROPDOWNLIST",
+        "name" : "[LANGUAGE][语言]",
+        "stringLength" : 60,
+        "uIMode" : "DEFAULT",
+        "needCodeListConfig" : true
+      },
+      "type" : "DEFAULT"
+    }, {
       "codeName" : "MobileDefault",
-      "name" : "[TYPE][属性]移动端默认",
+      "name" : "[LANGUAGE][语言]移动端默认",
       "getPSDEFFormItem" : {
         "codeName" : "MobileDefault",
         "editorType" : "MOBDROPDOWNLIST",
-        "name" : "[TYPE][属性]移动端默认",
+        "name" : "[LANGUAGE][语言]移动端默认",
+        "stringLength" : 60,
         "uIMode" : "MOBILEDEFAULT",
         "mobileMode" : true,
         "needCodeListConfig" : true
       },
       "type" : "MOBILEDEFAULT",
       "mobileMode" : true
-    }, {
-      "codeName" : "Default",
-      "name" : "[TYPE][属性]",
-      "getPSDEFFormItem" : {
-        "codeName" : "Default",
-        "editorType" : "DROPDOWNLIST",
-        "name" : "[TYPE][属性]",
-        "uIMode" : "DEFAULT",
-        "needCodeListConfig" : true
-      },
-      "type" : "DEFAULT"
     } ],
     "getAllPSDEFValueRules" : [ {
       "codeName" : "Default",
@@ -353,30 +355,43 @@
       "getPSDEFVRGroupCondition" : {
         "condOp" : "AND",
         "condType" : "GROUP",
-        "name" : "默认组"
+        "name" : "默认组",
+        "getPSDEFVRConditions" : [ {
+          "condType" : "STRINGLENGTH",
+          "dEFName" : "LANGUAGE",
+          "maxValue" : 60,
+          "name" : "默认字符串长度",
+          "ruleInfo" : "内容长度必须小于等于[60]",
+          "includeMaxValue" : true,
+          "includeMinValue" : false,
+          "keyCond" : true
+        } ],
+        "ruleInfo" : "内容长度必须小于等于[60]"
       },
-      "ruleInfo" : "默认规则",
+      "ruleInfo" : "内容长度必须小于等于[60]",
       "checkDefault" : true,
       "defaultMode" : true,
       "enableBackend" : true,
       "enableFront" : true
     } ],
-    "codeName" : "Type",
+    "codeName" : "Language",
     "dEFType" : 1,
-    "dataType" : "NSCODELIST",
+    "dataType" : "SSCODELIST",
     "importOrder" : 1000,
-    "logicName" : "属性",
-    "name" : "TYPE",
+    "length" : 60,
+    "logicName" : "语言",
+    "name" : "LANGUAGE",
     "getPSDEDBTable" : {
       "modelref" : true,
       "id" : "Table"
     },
     "getPSSysDBColumn" : {
       "modelref" : true,
-      "id" : "TYPE"
+      "id" : "LANGUAGE"
     },
-    "serviceCodeName" : "Type",
-    "stdDataType" : 9,
+    "serviceCodeName" : "Language",
+    "stdDataType" : 25,
+    "stringLength" : 60,
     "valueFormat" : "%1$s"
   }, {
     "getAllPSDEFDTColumns" : [ {
@@ -993,14 +1008,15 @@
   "getAllPSDEMethodDTOs" : [ {
     "name" : "SongDTO",
     "getPSDEMethodDTOFields" : [ {
-      "logicName" : "属性",
-      "name" : "Type",
+      "logicName" : "语言",
+      "name" : "Language",
       "getPSDEField" : {
-        "name" : "TYPE",
-        "codeName" : "Type"
+        "name" : "LANGUAGE",
+        "codeName" : "Language"
       },
       "sourceType" : "DEFIELD",
-      "stdDataType" : 9,
+      "stdDataType" : 25,
+      "stringLength" : 60,
       "type" : "SIMPLE"
     }, {
       "jsonFormat" : "yyyy-MM-dd HH:mm:ss",
@@ -1084,6 +1100,20 @@
   }, {
     "name" : "SongFilterDTO",
     "getPSDEFilterDTOFields" : [ {
+      "logicName" : "语言",
+      "name" : "N_LANGUAGE_EQ",
+      "getPSDEFSearchMode" : {
+        "modelref" : true,
+        "id" : "N_LANGUAGE_EQ"
+      },
+      "getPSDEField" : {
+        "name" : "LANGUAGE",
+        "codeName" : "Language"
+      },
+      "sourceType" : "DEFSEARCHMODE",
+      "stdDataType" : 25,
+      "type" : "SIMPLE"
+    }, {
       "logicName" : "歌曲标识",
       "name" : "N_SONGID_EQ",
       "getPSDEFSearchMode" : {
@@ -1111,20 +1141,6 @@
       "sourceType" : "DEFSEARCHMODE",
       "stdDataType" : 25,
       "type" : "SIMPLE"
-    }, {
-      "logicName" : "属性",
-      "name" : "N_TYPE_EQ",
-      "getPSDEFSearchMode" : {
-        "modelref" : true,
-        "id" : "N_TYPE_EQ"
-      },
-      "getPSDEField" : {
-        "name" : "TYPE",
-        "codeName" : "Type"
-      },
-      "sourceType" : "DEFSEARCHMODE",
-      "stdDataType" : 9,
-      "type" : "SIMPLE"
     } ],
     "sourceType" : "DE",
     "type" : "DEFILTER",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/Song/PSDEDATAQUERIES/Default/PSDEDQCODES/MYSQL5.json

@@ -7,15 +7,15 @@
   }, {
     "expression" : "t1.`CREATEMAN`",
     "name" : "CREATEMAN"
+  }, {
+    "expression" : "t1.`LANGUAGE`",
+    "name" : "LANGUAGE"
   }, {
     "expression" : "t1.`SONGID`",
     "name" : "SONGID"
   }, {
     "expression" : "t1.`SONGNAME`",
     "name" : "SONGNAME"
-  }, {
-    "expression" : "t1.`TYPE`",
-    "name" : "TYPE"
   }, {
     "expression" : "t1.`UPDATEDATE`",
     "name" : "UPDATEDATE"
@@ -23,6 +23,6 @@
     "expression" : "t1.`UPDATEMAN`",
     "name" : "UPDATEMAN"
   } ],
-  "queryCode" : "SELECT\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`SONGID`,\nt1.`SONGNAME`,\nt1.`TYPE`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_SONG` t1 \n",
+  "queryCode" : "SELECT\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`LANGUAGE`,\nt1.`SONGID`,\nt1.`SONGNAME`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_SONG` t1 \n",
   "id" : "PSMODULES/Test/PSDATAENTITIES/Song/PSDEDATAQUERIES/Default/PSDEDQCODES/MYSQL5.json"
 }
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/Song/PSDEDATAQUERIES/View/PSDEDQCODES/MYSQL5.json

@@ -7,15 +7,15 @@
   }, {
     "expression" : "t1.`CREATEMAN`",
     "name" : "CREATEMAN"
+  }, {
+    "expression" : "t1.`LANGUAGE`",
+    "name" : "LANGUAGE"
   }, {
     "expression" : "t1.`SONGID`",
     "name" : "SONGID"
   }, {
     "expression" : "t1.`SONGNAME`",
     "name" : "SONGNAME"
-  }, {
-    "expression" : "t1.`TYPE`",
-    "name" : "TYPE"
   }, {
     "expression" : "t1.`UPDATEDATE`",
     "name" : "UPDATEDATE"
@@ -23,6 +23,6 @@
     "expression" : "t1.`UPDATEMAN`",
     "name" : "UPDATEMAN"
   } ],
-  "queryCode" : "SELECT\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`SONGID`,\nt1.`SONGNAME`,\nt1.`TYPE`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_SONG` t1 \n",
+  "queryCode" : "SELECT\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`LANGUAGE`,\nt1.`SONGID`,\nt1.`SONGNAME`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_SONG` t1 \n",
   "id" : "PSMODULES/Test/PSDATAENTITIES/Song/PSDEDATAQUERIES/View/PSDEDQCODES/MYSQL5.json"
 }
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPCODELISTS/CodeList44.json

@@ -8,7 +8,7 @@
   "name" : "图书类型",
   "getPSCodeItems" : [ {
     "codeName" : "Xx",
-    "data" : "a=11",
+    "data" : "{\na: 11\n}",
     "text" : "仙侠",
     "value" : "xx"
   }, {

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

@@ -26,7 +26,7 @@
     "name" : "图书类型",
     "getPSCodeItems" : [ {
       "codeName" : "Xx",
-      "data" : "a=11",
+      "data" : "{\na: 11\n}",
       "text" : "仙侠",
       "value" : "xx"
     }, {

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPCODELISTS/CodeList44.json

@@ -8,7 +8,7 @@
   "name" : "图书类型",
   "getPSCodeItems" : [ {
     "codeName" : "Xx",
-    "data" : "a=11",
+    "data" : "{\na: 11\n}",
     "text" : "仙侠",
     "value" : "xx"
   }, {

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

@@ -9,7 +9,7 @@
     "name" : "图书类型",
     "getPSCodeItems" : [ {
       "codeName" : "Xx",
-      "data" : "a=11",
+      "data" : "{\na: 11\n}",
       "text" : "仙侠",
       "value" : "xx"
     }, {

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

@@ -8,7 +8,7 @@
   "name" : "图书类型",
   "getPSCodeItems" : [ {
     "codeName" : "Xx",
-    "data" : "a=11",
+    "data" : "{\na: 11\n}",
     "text" : "仙侠",
     "value" : "xx"
   }, {

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

@@ -1159,7 +1159,7 @@
     },
     "getPSSearchBarGroups" : [ {
       "caption" : "仙侠",
-      "data" : "a=11",
+      "data" : "{\na: 11\n}",
       "itemType" : "GROUP",
       "name" : "xx",
       "width" : 0.0,

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

@@ -75,7 +75,7 @@
     "name" : "图书类型",
     "getPSCodeItems" : [ {
       "codeName" : "Xx",
-      "data" : "a=11",
+      "data" : "{\na: 11\n}",
       "text" : "仙侠",
       "value" : "xx"
     }, {

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

@@ -2097,6 +2097,13 @@
       "name" : "CREATEMAN",
       "stdDataType" : 25,
       "nullable" : true
+    }, {
+      "codeName" : "LANGUAGE",
+      "length" : 60,
+      "logicName" : "语言",
+      "name" : "LANGUAGE",
+      "stdDataType" : 25,
+      "nullable" : true
     }, {
       "codeName" : "SONGID",
       "length" : 100,

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

@@ -131,7 +131,7 @@
     "path" : "PSCODELISTS/CodeList23.json"
   }, {
     "modelref" : true,
-    "path" : "PSMODULES/Test/PSCODELISTS/SongType.json"
+    "path" : "PSMODULES/Test/PSCODELISTS/SongLanguage.json"
   }, {
     "modelref" : true,
     "path" : "PSCODELISTS/CodeList86.json"
@@ -952,7 +952,7 @@
   }, {
     "getAllPSCodeLists" : [ {
       "modelref" : true,
-      "path" : "PSMODULES/Test/PSCODELISTS/SongType.json"
+      "path" : "PSMODULES/Test/PSCODELISTS/SongLanguage.json"
     }, {
       "modelref" : true,
       "path" : "PSMODULES/Test/PSCODELISTS/TestAll.json"