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

4ee1ae7a · ibizdev · 9085a41f · 4ee1ae7a · 4ee1ae7a · 4ee1ae7a
--- 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
@@ -5,6 +5,9 @@
  }, {
    "modelref" : true,
    "path" : "PSMODULES/Test/PSCODELISTS/Booktype.json"
+  }, {
+    "modelref" : true,
+    "path" : "PSMODULES/Test/PSCODELISTS/UsrCodeList0103432882.json"
  }, {
    "modelref" : true,
    "path" : "PSMODULES/Test/PSCODELISTS/SongLanguage.json"

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSCODELISTS/UsrCodeList0103432882.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSCODELISTS/UsrCodeList0103432882.json
+{
+  "codeListTag" : "Test__UsrCodeList0103432882",
+  "codeListType" : "STATIC",
+  "codeName" : "UsrCodeList0103432882",
+  "dynaInstMode" : 0,
+  "dynaModelFilePath" : "PSMODULES/Test/PSCODELISTS/UsrCodeList0103432882.json",
+  "emptyText" : "未定义",
+  "name" : "test",
+  "getPSDEMSLogic" : {
+    "modelref" : true,
+    "path" : "PSMODULES/Test/PSDATAENTITIES/WORKITEM/PSDEMSLOGICS/test.json"
+  },
+  "getPSDataEntity" : {
+    "modelref" : true,
+    "path" : "PSMODULES/Test/PSDATAENTITIES/WORKITEM.json"
+  },
+  "getPSSystemModule" : {
+    "modelref" : true,
+    "path" : "PSMODULES/Test.json"
+  },
+  "predefinedType" : "DEMAINSTATE",
+  "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/PSMODULES/Test/PSCODELISTS/UsrCodeList1225513652.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSCODELISTS/UsrCodeList1225513652.json
@@ -25,7 +25,7 @@
    "modelref" : true,
    "path" : "PSMODULES/Test.json"
  },
-  "refFlag" : true,
+  "refFlag" : false,
  "systemTag" : "TrainSys",
  "codeItemValueNumber" : false,
  "enableCache" : true,

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/WORKITEM.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/WORKITEM.json
@@ -2013,6 +2013,10 @@
    "linkDEField" : true,
    "phisicalDEField" : false
  } ],
+  "getAllPSDEMSLogics" : [ {
+    "modelref" : true,
+    "path" : "PSMODULES/Test/PSDATAENTITIES/WORKITEM/PSDEMSLOGICS/test.json"
+  } ],
  "getAllPSDEMethodDTOs" : [ {
    "name" : "WORKITEMDTO",
    "getPSDEMethodDTOFields" : [ {

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/WORKITEM/PSDEMSLOGICS/test.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/WORKITEM/PSDEMSLOGICS/test.json
+{
+  "codeName" : "test",
+  "dynaModelFilePath" : "PSMODULES/Test/PSDATAENTITIES/WORKITEM/PSDEMSLOGICS/test.json",
+  "logicName" : "test",
+  "name" : "test"
+}
\ 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/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/UsrCodeList1225513652.json"
+      "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SysOperator.json"
    },
    "getPSAppDEField" : {
      "name" : "UPDATEMAN",
@@ -79,6 +79,10 @@
      "glyph" : "xf002@FontAwesome",
      "cssClass" : "fa fa-search"
    },
+    "getPSSysPFPlugin" : {
+      "pluginType" : "GRID_COLRENDER",
+      "pluginCode" : "ABBRNAME_DYICON"
+    },
    "width" : 150,
    "widthUnit" : "PX",
    "enableRowEdit" : true,
@@ -195,7 +199,7 @@
      "name" : "updateman",
      "getPSAppCodeList" : {
        "modelref" : true,
-        "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/UsrCodeList1225513652.json"
+        "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SysOperator.json"
      },
      "enableLinkView" : false
    },

--- 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/UsrCodeList1225513652.json"
+        "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SysOperator.json"
      },
      "getPSAppDEField" : {
        "name" : "UPDATEMAN",
@@ -248,6 +248,10 @@
        "glyph" : "xf002@FontAwesome",
        "cssClass" : "fa fa-search"
      },
+      "getPSSysPFPlugin" : {
+        "pluginType" : "GRID_COLRENDER",
+        "pluginCode" : "ABBRNAME_DYICON"
+      },
      "width" : 150,
      "widthUnit" : "PX",
      "enableRowEdit" : true,
@@ -364,7 +368,7 @@
        "name" : "updateman",
        "getPSAppCodeList" : {
          "modelref" : true,
-          "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/UsrCodeList1225513652.json"
+          "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SysOperator.json"
        },
        "enableLinkView" : false
      },

--- 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
@@ -688,30 +688,6 @@
      "value" : "CF"
    } ],
    "enableCache" : true
-  }, {
-    "codeListTag" : "Test__UsrCodeList1225513652",
-    "codeListType" : "STATIC",
-    "codeName" : "UsrCodeList1225513652",
-    "dynaInstMode" : 0,
-    "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPCODELISTS/UsrCodeList1225513652.json",
-    "emptyText" : "未定义",
-    "name" : "优先级测试",
-    "getPSCodeItems" : [ {
-      "codeName" : "Item_1",
-      "color" : "#0A6D1C",
-      "iconCls" : "fa fa-eye",
-      "getPSSysCss" : {
-        "cssName" : "green-span"
-      },
-      "getPSSysImage" : {
-        "glyph" : "xf06e@FontAwesome",
-        "cssClass" : "fa fa-eye"
-      },
-      "text" : "低",
-      "textCls" : "green-span",
-      "value" : "8ce5d32258df312eeb26b3832aff8ab9"
-    } ],
-    "enableCache" : true
  }, {
    "codeListTag" : "Test__ViewMsgPosition",
    "codeListType" : "STATIC",
@@ -5204,6 +5180,17 @@
    "templCode2" : "const b = 222;console.log(222)\nconsole.log(b)",
    "templCode3" : "const c = 333;console.log(333)\nconsole.log(c)",
    "templCode4" : "const d = 444;console.log(444)\nconsole.log(d)"
+  }, {
+    "name" : "名称简写动态图标",
+    "getPSSysPFPlugin" : {
+      "pluginType" : "GRID_COLRENDER",
+      "pluginCode" : "ABBRNAME_DYICON"
+    },
+    "pluginCode" : "ABBRNAME_DYICON",
+    "pluginType" : "GRID_COLRENDER",
+    "refMode" : "CONTROLITEM",
+    "refTag" : "GRID",
+    "refTag2" : "DEFGRIDCOLUMN"
  }, {
    "name" : "实体方法Delete插件",
    "getPSSysPFPlugin" : {
@@ -12453,16 +12440,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"
      }
    } ]
  }, {
@@ -12491,16 +12478,16 @@
    "codeName" : "VMGroup3",
    "name" : "视图消息类型测试",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-警告信息",
+      "name" : "消息类型-错误信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg5"
+        "id" : "ViewMsg6"
      }
    }, {
-      "name" : "消息类型-错误信息",
+      "name" : "消息类型-警告信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg6"
+        "id" : "ViewMsg5"
      }
    }, {
      "name" : "消息类型-常规信息",
@@ -12523,12 +12510,6 @@
    "codeName" : "VMGroup4",
    "name" : "视图消息位置测试",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息位置-视图上方",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg7"
-      }
-    }, {
      "name" : "消息位置-视图下方",
      "getPSAppViewMsg" : {
        "modelref" : true,
@@ -12546,72 +12527,72 @@
        "modelref" : true,
        "id" : "ViewMsg9"
      }
+    }, {
+      "name" : "消息位置-视图上方",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg7"
+      }
    } ]
  }, {
    "codeName" : "VMGroup8",
    "name" : "【静态测试】",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-默认删除-上方-错误",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg12"
-      }
-    }, {
-      "name" : "消息位置-视图下方",
+      "name" : "关闭模式-本次删除-上方-警告",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg13"
      }
    }, {
-      "name" : "消息位置-视图内容区",
+      "name" : "消息类型-错误信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg9"
-      }
+        "id" : "ViewMsg6"
+      },
+      "position" : "POPUP"
    }, {
-      "name" : "关闭模式-本次删除-上方-警告",
+      "name" : "关闭模式-无删除-上方-常规",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg13"
+        "id" : "ViewMsg11"
      }
    }, {
-      "name" : "消息类型-警告信息",
+      "name" : "消息类型-常规信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg5"
+        "id" : "ViewMsg4"
      },
      "position" : "POPUP"
    }, {
-      "name" : "消息类型-错误信息",
+      "name" : "消息位置-视图下方",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg6"
-      },
-      "position" : "POPUP"
+        "id" : "ViewMsg8"
+      }
    }, {
-      "name" : "关闭模式-无删除-上方-常规",
+      "name" : "关闭模式-默认删除-上方-错误",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg12"
      }
    }, {
-      "name" : "消息类型-常规信息",
+      "name" : "消息类型-警告信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg4"
+        "id" : "ViewMsg5"
      },
      "position" : "POPUP"
+    }, {
+      "name" : "消息位置-视图内容区",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg9"
+      }
    } ]
  }, {
    "codeName" : "VMGroup5",
    "name" : "视图消息关闭模式",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-本次删除",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg13"
-      }
-    }, {
      "name" : "关闭模式-无删除",
      "getPSAppViewMsg" : {
        "modelref" : true,
@@ -12623,21 +12604,27 @@
        "modelref" : true,
        "id" : "ViewMsg12"
      }
+    }, {
+      "name" : "关闭模式-本次删除",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg13"
+      }
    } ]
  }, {
    "codeName" : "VMGroup6",
    "name" : "视图消息动态模式测试",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "动态模式-静态内容",
+      "name" : "动态模式-实体数据集",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg15"
+        "id" : "ViewMsg14"
      }
    }, {
-      "name" : "动态模式-实体数据集",
+      "name" : "动态模式-静态内容",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg14"
+        "id" : "ViewMsg15"
      }
    } ]
  } ],
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.simple.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.simple.json
@@ -283,6 +283,17 @@
    "templCode2" : "const b = 222;console.log(222)\nconsole.log(b)",
    "templCode3" : "const c = 333;console.log(333)\nconsole.log(c)",
    "templCode4" : "const d = 444;console.log(444)\nconsole.log(d)"
+  }, {
+    "name" : "名称简写动态图标",
+    "getPSSysPFPlugin" : {
+      "pluginType" : "GRID_COLRENDER",
+      "pluginCode" : "ABBRNAME_DYICON"
+    },
+    "pluginCode" : "ABBRNAME_DYICON",
+    "pluginType" : "GRID_COLRENDER",
+    "refMode" : "CONTROLITEM",
+    "refTag" : "GRID",
+    "refTag2" : "DEFGRIDCOLUMN"
  }, {
    "name" : "实体方法Delete插件",
    "getPSSysPFPlugin" : {

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSTEM.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSTEM.json
@@ -117,6 +117,9 @@
  }, {
    "modelref" : true,
    "path" : "PSMODULES/common/PSCODELISTS/UsrCodeList0129249258.json"
+  }, {
+    "modelref" : true,
+    "path" : "PSMODULES/Test/PSCODELISTS/UsrCodeList0103432882.json"
  }, {
    "modelref" : true,
    "path" : "PSCODELISTS/CodeList34.json"
@@ -1330,6 +1333,9 @@
    }, {
      "modelref" : true,
      "path" : "PSMODULES/Test/PSCODELISTS/Booktype.json"
+    }, {
+      "modelref" : true,
+      "path" : "PSMODULES/Test/PSCODELISTS/UsrCodeList0103432882.json"
    }, {
      "modelref" : true,
      "path" : "PSMODULES/Test/PSCODELISTS/SongLanguage.json"