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

7c819235 · ibizdev · a06881c2 · 7c819235 · 7c819235 · 7c819235
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test.json
@@ -44,6 +44,9 @@
  }, {
    "modelref" : true,
    "path" : "PSMODULES/Test/PSCODELISTS/TreeDynaCodeList.json"
+  }, {
+    "modelref" : true,
+    "path" : "PSMODULES/Test/PSCODELISTS/UsrCodeList1225513652.json"
  }, {
    "modelref" : true,
    "path" : "PSMODULES/Test/PSCODELISTS/WorkFlowWfStep.json"

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSCODELISTS/UsrCodeList1225513652.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSCODELISTS/UsrCodeList1225513652.json
+{
+  "codeListTag" : "Test__UsrCodeList1225513652",
+  "codeListType" : "STATIC",
+  "codeName" : "UsrCodeList1225513652",
+  "dynaInstMode" : 0,
+  "dynaModelFilePath" : "PSMODULES/Test/PSCODELISTS/UsrCodeList1225513652.json",
+  "emptyText" : "未定义",
+  "name" : "优先级测试",
+  "getPSCodeItems" : [ {
+    "codeName" : "Item_1",
+    "iconCls" : "fa fa-eye",
+    "getPSSysImage" : {
+      "glyph" : "xf06e@FontAwesome",
+      "cssClass" : "fa fa-eye"
+    },
+    "text" : "低",
+    "value" : "8ce5d32258df312eeb26b3832aff8ab9"
+  } ],
+  "getPSSystemModule" : {
+    "modelref" : true,
+    "path" : "PSMODULES/Test.json"
+  },
+  "refFlag" : true,
+  "systemTag" : "TrainSys",
+  "codeItemValueNumber" : false,
+  "enableCache" : true,
+  "subSysAsCloud" : false,
+  "subSysCodeList" : false,
+  "userScope" : false
+}
\ No newline at end of file
--- 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
@@ -1517,16 +1517,16 @@
    "codeName" : "VMGroup2",
    "name" : "视图消息组2",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息2",
+      "name" : "视图消息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
      }
    }, {
-      "name" : "视图消息",
+      "name" : "视图消息2",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
      }
    } ]
  }, {

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPCODELISTS/UsrCodeList1225513652.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPCODELISTS/UsrCodeList1225513652.json
+{
+  "codeListTag" : "Test__UsrCodeList1225513652",
+  "codeListType" : "STATIC",
+  "codeName" : "UsrCodeList1225513652",
+  "dynaInstMode" : 0,
+  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPCODELISTS/UsrCodeList1225513652.json",
+  "emptyText" : "未定义",
+  "name" : "优先级测试",
+  "getPSCodeItems" : [ {
+    "codeName" : "Item_1",
+    "iconCls" : "fa fa-eye",
+    "getPSSysImage" : {
+      "glyph" : "xf06e@FontAwesome",
+      "cssClass" : "fa fa-eye"
+    },
+    "text" : "低",
+    "value" : "8ce5d32258df312eeb26b3832aff8ab9"
+  } ],
+  "enableCache" : true
+}
\ No newline at end of file
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TESTGRID/PSGRIDS/GridTestArrangePView_Grid.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TESTGRID/PSGRIDS/GridTestArrangePView_Grid.json
@@ -69,7 +69,7 @@
    "noPrivDisplayMode" : 1,
    "getPSAppCodeList" : {
      "modelref" : true,
-      "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SysOperator.json"
+      "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/UsrCodeList1225513652.json"
    },
    "getPSAppDEField" : {
      "name" : "UPDATEMAN",
@@ -191,17 +191,15 @@
      "codeName" : "UpdateMan"
    },
    "getPSEditor" : {
-      "editorStyle" : "CUSTOMEDIT",
-      "editorType" : "TEXTBOX",
-      "maxLength" : 60,
+      "editorType" : "SPAN",
      "name" : "updateman",
-      "getPSSysPFPlugin" : {
-        "pluginType" : "EDITOR_CUSTOMSTYLE",
-        "pluginCode" : "CUSTOMEDIT",
-        "runtimeObject" : true
-      }
+      "getPSAppCodeList" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/UsrCodeList1225513652.json"
+      },
+      "enableLinkView" : false
    },
-    "allowEmpty" : false,
+    "allowEmpty" : true,
    "convertToCodeItemText" : true
  }, {
    "caption" : "测试表格标识",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTGRIDGridTestArrangePView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTGRIDGridTestArrangePView.json
@@ -238,7 +238,7 @@
      "noPrivDisplayMode" : 1,
      "getPSAppCodeList" : {
        "modelref" : true,
-        "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SysOperator.json"
+        "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/UsrCodeList1225513652.json"
      },
      "getPSAppDEField" : {
        "name" : "UPDATEMAN",
@@ -360,17 +360,15 @@
        "codeName" : "UpdateMan"
      },
      "getPSEditor" : {
-        "editorStyle" : "CUSTOMEDIT",
-        "editorType" : "TEXTBOX",
-        "maxLength" : 60,
+        "editorType" : "SPAN",
        "name" : "updateman",
-        "getPSSysPFPlugin" : {
-          "pluginType" : "EDITOR_CUSTOMSTYLE",
-          "pluginCode" : "CUSTOMEDIT",
-          "runtimeObject" : true
-        }
+        "getPSAppCodeList" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/UsrCodeList1225513652.json"
+        },
+        "enableLinkView" : false
      },
-      "allowEmpty" : false,
+      "allowEmpty" : true,
      "convertToCodeItemText" : true
    }, {
      "caption" : "测试表格标识",

--- 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
@@ -644,6 +644,25 @@
      "value" : "zhaoliu"
    } ],
    "enableCache" : true
+  }, {
+    "codeListTag" : "Test__UsrCodeList1225513652",
+    "codeListType" : "STATIC",
+    "codeName" : "UsrCodeList1225513652",
+    "dynaInstMode" : 0,
+    "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPCODELISTS/UsrCodeList1225513652.json",
+    "emptyText" : "未定义",
+    "name" : "优先级测试",
+    "getPSCodeItems" : [ {
+      "codeName" : "Item_1",
+      "iconCls" : "fa fa-eye",
+      "getPSSysImage" : {
+        "glyph" : "xf06e@FontAwesome",
+        "cssClass" : "fa fa-eye"
+      },
+      "text" : "低",
+      "value" : "8ce5d32258df312eeb26b3832aff8ab9"
+    } ],
+    "enableCache" : true
  }, {
    "codeListTag" : "Test__ViewMsgPosition",
    "codeListType" : "STATIC",
@@ -12336,16 +12355,16 @@
    "codeName" : "VMGroup2",
    "name" : "视图消息组2",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息2",
+      "name" : "视图消息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
      }
    }, {
-      "name" : "视图消息",
+      "name" : "视图消息2",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
      }
    } ]
  }, {
@@ -12380,16 +12399,16 @@
        "id" : "ViewMsg4"
      }
    }, {
-      "name" : "消息类型-警告信息",
+      "name" : "消息类型-错误信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg5"
+        "id" : "ViewMsg6"
      }
    }, {
-      "name" : "消息类型-错误信息",
+      "name" : "消息类型-警告信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg6"
+        "id" : "ViewMsg5"
      }
    } ]
  }, {
@@ -12406,16 +12425,16 @@
    "codeName" : "VMGroup4",
    "name" : "视图消息位置测试",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息位置-视图下方",
+      "name" : "消息位置-弹出",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg10"
      }
    }, {
-      "name" : "消息位置-弹出",
+      "name" : "消息位置-视图内容区",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg10"
+        "id" : "ViewMsg9"
      }
    }, {
      "name" : "消息位置-视图上方",
@@ -12424,33 +12443,35 @@
        "id" : "ViewMsg7"
      }
    }, {
-      "name" : "消息位置-视图内容区",
+      "name" : "消息位置-视图下方",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg9"
+        "id" : "ViewMsg8"
      }
    } ]
  }, {
    "codeName" : "VMGroup8",
    "name" : "【静态测试】",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息位置-视图内容区",
+      "name" : "消息类型-错误信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg9"
-      }
+        "id" : "ViewMsg6"
+      },
+      "position" : "POPUP"
    }, {
-      "name" : "关闭模式-默认删除-上方-错误",
+      "name" : "关闭模式-无删除-上方-常规",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg12"
+        "id" : "ViewMsg11"
      }
    }, {
-      "name" : "关闭模式-本次删除-上方-警告",
+      "name" : "消息类型-常规信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg13"
-      }
+        "id" : "ViewMsg4"
+      },
+      "position" : "POPUP"
    }, {
      "name" : "消息位置-视图下方",
      "getPSAppViewMsg" : {
@@ -12458,43 +12479,35 @@
        "id" : "ViewMsg8"
      }
    }, {
-      "name" : "消息类型-错误信息",
+      "name" : "关闭模式-默认删除-上方-错误",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg6"
-      },
-      "position" : "POPUP"
+        "id" : "ViewMsg12"
+      }
    }, {
-      "name" : "消息类型-警告信息",
+      "name" : "消息位置-视图内容区",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg5"
-      },
-      "position" : "POPUP"
+        "id" : "ViewMsg9"
+      }
    }, {
-      "name" : "消息类型-常规信息",
+      "name" : "消息类型-警告信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg4"
+        "id" : "ViewMsg5"
      },
      "position" : "POPUP"
    }, {
-      "name" : "关闭模式-无删除-上方-常规",
+      "name" : "关闭模式-本次删除-上方-警告",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg13"
      }
    } ]
  }, {
    "codeName" : "VMGroup5",
    "name" : "视图消息关闭模式",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-本次删除",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg13"
-      }
-    }, {
      "name" : "关闭模式-无删除",
      "getPSAppViewMsg" : {
        "modelref" : true,
@@ -12506,6 +12519,12 @@
        "modelref" : true,
        "id" : "ViewMsg12"
      }
+    }, {
+      "name" : "关闭模式-本次删除",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg13"
+      }
    } ]
  }, {
    "codeName" : "VMGroup6",
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSTEM.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSTEM.json
@@ -363,6 +363,9 @@
  }, {
    "modelref" : true,
    "path" : "PSCODELISTS/CodeList22.json"
+  }, {
+    "modelref" : true,
+    "path" : "PSMODULES/Test/PSCODELISTS/UsrCodeList1225513652.json"
  }, {
    "modelref" : true,
    "path" : "PSCODELISTS/CodeList17.json"
@@ -1360,6 +1363,9 @@
    }, {
      "modelref" : true,
      "path" : "PSMODULES/Test/PSCODELISTS/TreeDynaCodeList.json"
+    }, {
+      "modelref" : true,
+      "path" : "PSMODULES/Test/PSCODELISTS/UsrCodeList1225513652.json"
    }, {
      "modelref" : true,
      "path" : "PSMODULES/Test/PSCODELISTS/WorkFlowWfStep.json"