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

ce6697e7 · ibizdev · 446914dc · ce6697e7 · ce6697e7 · ce6697e7
--- 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,9 +5,6 @@
  }, {
    "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/PSDATAENTITIES/WORKITEM.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/WORKITEM.json
@@ -2013,10 +2013,6 @@
    "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/PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST/PSDATAVIEWS/KanbanCodelist.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST/PSDATAVIEWS/KanbanCodelist.json
@@ -48,7 +48,7 @@
      "path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.json"
    }
  },
-  "groupLayout" : "ROW",
+  "groupLayout" : "COLUMN",
  "groupMode" : "CODELIST",
  "getGroupPSAppDEField" : {
    "name" : "TESTNAME",
@@ -95,6 +95,16 @@
    }
  } ],
  "getPSDEDataViewItems" : [ {
+    "caption" : "测试实体名称",
+    "dataItemName" : "testname",
+    "itemType" : "DATAITEM",
+    "name" : "TESTNAME",
+    "getPSAppDEField" : {
+      "name" : "TESTNAME",
+      "codeName" : "TESTName"
+    },
+    "enableSort" : true
+  }, {
    "cLConvertMode" : "FRONT",
    "caption" : "类型",
    "dataItemName" : "type",
@@ -241,16 +251,6 @@
      "uniqueTag" : "TEST__A6913ed9bd0c3e7d614"
    },
    "enableSort" : true
-  }, {
-    "caption" : "测试实体名称",
-    "dataItemName" : "testname",
-    "itemType" : "DATAITEM",
-    "name" : "TESTNAME",
-    "getPSAppDEField" : {
-      "name" : "TESTNAME",
-      "codeName" : "TESTName"
-    },
-    "enableSort" : true
  } ],
  "pagingSize" : 20,
  "getRemovePSControlAction" : {

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDEVIEWS/TESTMobDataView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDEVIEWS/TESTMobDataView.json
@@ -125,7 +125,7 @@
        "path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.json"
      }
    },
-    "groupLayout" : "ROW",
+    "groupLayout" : "COLUMN",
    "groupMode" : "CODELIST",
    "getGroupPSAppDEField" : {
      "name" : "TESTNAME",
@@ -246,6 +246,16 @@
      }
    } ],
    "getPSDEDataViewItems" : [ {
+      "caption" : "测试实体名称",
+      "dataItemName" : "testname",
+      "itemType" : "DATAITEM",
+      "name" : "TESTNAME",
+      "getPSAppDEField" : {
+        "name" : "TESTNAME",
+        "codeName" : "TESTName"
+      },
+      "enableSort" : true
+    }, {
      "cLConvertMode" : "FRONT",
      "caption" : "类型",
      "dataItemName" : "type",
@@ -392,16 +402,6 @@
        "uniqueTag" : "TEST__A6913ed9bd0c3e7d614"
      },
      "enableSort" : true
-    }, {
-      "caption" : "测试实体名称",
-      "dataItemName" : "testname",
-      "itemType" : "DATAITEM",
-      "name" : "TESTNAME",
-      "getPSAppDEField" : {
-        "name" : "TESTNAME",
-        "codeName" : "TESTName"
-      },
-      "enableSort" : true
    } ],
    "pagingSize" : 20,
    "getRemovePSControlAction" : {

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSKANBANS/KanbanCodelist.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSKANBANS/KanbanCodelist.json
@@ -48,7 +48,7 @@
      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
    }
  },
-  "groupLayout" : "ROW",
+  "groupLayout" : "COLUMN",
  "groupMode" : "CODELIST",
  "getGroupPSAppDEField" : {
    "name" : "TESTNAME",
@@ -95,6 +95,16 @@
    }
  } ],
  "getPSDEDataViewItems" : [ {
+    "caption" : "测试实体名称",
+    "dataItemName" : "testname",
+    "itemType" : "DATAITEM",
+    "name" : "TESTNAME",
+    "getPSAppDEField" : {
+      "name" : "TESTNAME",
+      "codeName" : "TESTName"
+    },
+    "enableSort" : true
+  }, {
    "cLConvertMode" : "FRONT",
    "caption" : "类型",
    "dataItemName" : "type",
@@ -241,16 +251,6 @@
      "uniqueTag" : "TEST__A6913ed9bd0c3e7d614"
    },
    "enableSort" : true
-  }, {
-    "caption" : "测试实体名称",
-    "dataItemName" : "testname",
-    "itemType" : "DATAITEM",
-    "name" : "TESTNAME",
-    "getPSAppDEField" : {
-      "name" : "TESTNAME",
-      "codeName" : "TESTName"
-    },
-    "enableSort" : true
  } ],
  "pagingSize" : 20,
  "getRemovePSControlAction" : {

--- 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
@@ -81,7 +81,7 @@
    },
    "getPSSysPFPlugin" : {
      "pluginType" : "GRID_COLRENDER",
-      "pluginCode" : "ABBRNAME_DYICON"
+      "pluginCode" : "ABBR_NAME_ICON"
    },
    "width" : 150,
    "widthUnit" : "PX",

--- 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
@@ -250,7 +250,7 @@
      },
      "getPSSysPFPlugin" : {
        "pluginType" : "GRID_COLRENDER",
-        "pluginCode" : "ABBRNAME_DYICON"
+        "pluginCode" : "ABBR_NAME_ICON"
      },
      "width" : 150,
      "widthUnit" : "PX",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr2KanbanView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr2KanbanView.json
@@ -352,7 +352,7 @@
        "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
      }
    },
-    "groupLayout" : "ROW",
+    "groupLayout" : "COLUMN",
    "groupMode" : "CODELIST",
    "getGroupPSAppDEField" : {
      "name" : "TESTNAME",
@@ -486,6 +486,16 @@
      }
    } ],
    "getPSDEDataViewItems" : [ {
+      "caption" : "测试实体名称",
+      "dataItemName" : "testname",
+      "itemType" : "DATAITEM",
+      "name" : "TESTNAME",
+      "getPSAppDEField" : {
+        "name" : "TESTNAME",
+        "codeName" : "TESTName"
+      },
+      "enableSort" : true
+    }, {
      "cLConvertMode" : "FRONT",
      "caption" : "类型",
      "dataItemName" : "type",
@@ -632,16 +642,6 @@
        "uniqueTag" : "TEST__A6913ed9bd0c3e7d614"
      },
      "enableSort" : true
-    }, {
-      "caption" : "测试实体名称",
-      "dataItemName" : "testname",
-      "itemType" : "DATAITEM",
-      "name" : "TESTNAME",
-      "getPSAppDEField" : {
-        "name" : "TESTNAME",
-        "codeName" : "TESTName"
-      },
-      "enableSort" : true
    } ],
    "pagingSize" : 20,
    "getRemovePSControlAction" : {

--- 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
@@ -5181,12 +5181,12 @@
    "templCode3" : "const c = 333;console.log(333)\nconsole.log(c)",
    "templCode4" : "const d = 444;console.log(444)\nconsole.log(d)"
  }, {
-    "name" : "名称简写动态图标",
+    "name" : "名称简写图标表格列绘制",
    "getPSSysPFPlugin" : {
      "pluginType" : "GRID_COLRENDER",
-      "pluginCode" : "ABBRNAME_DYICON"
+      "pluginCode" : "ABBR_NAME_ICON"
    },
-    "pluginCode" : "ABBRNAME_DYICON",
+    "pluginCode" : "ABBR_NAME_ICON",
    "pluginType" : "GRID_COLRENDER",
    "refMode" : "CONTROLITEM",
    "refTag" : "GRID",
@@ -12484,16 +12484,16 @@
        "id" : "ViewMsg5"
      }
    }, {
-      "name" : "消息类型-常规信息",
+      "name" : "消息类型-错误信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg4"
+        "id" : "ViewMsg6"
      }
    }, {
-      "name" : "消息类型-错误信息",
+      "name" : "消息类型-常规信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg6"
+        "id" : "ViewMsg4"
      }
    } ]
  }, {
@@ -12510,121 +12510,121 @@
    "codeName" : "VMGroup4",
    "name" : "视图消息位置测试",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息位置-视图下方",
+      "name" : "消息位置-视图内容区",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg9"
      }
    }, {
-      "name" : "消息位置-弹出",
+      "name" : "消息位置-视图上方",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg10"
+        "id" : "ViewMsg7"
      }
    }, {
-      "name" : "消息位置-视图内容区",
+      "name" : "消息位置-视图下方",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg9"
+        "id" : "ViewMsg8"
      }
    }, {
-      "name" : "消息位置-视图上方",
+      "name" : "消息位置-弹出",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg7"
+        "id" : "ViewMsg10"
      }
    } ]
  }, {
    "codeName" : "VMGroup8",
    "name" : "【静态测试】",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-默认删除-上方-错误",
+      "name" : "关闭模式-无删除-上方-常规",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg12"
+        "id" : "ViewMsg11"
      }
    }, {
-      "name" : "消息位置-视图内容区",
+      "name" : "消息类型-常规信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg9"
-      }
+        "id" : "ViewMsg4"
+      },
+      "position" : "POPUP"
    }, {
-      "name" : "关闭模式-本次删除-上方-警告",
+      "name" : "消息类型-警告信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg13"
-      }
+        "id" : "ViewMsg5"
+      },
+      "position" : "POPUP"
    }, {
-      "name" : "消息位置-视图下方",
+      "name" : "消息位置-视图内容区",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg9"
      }
    }, {
-      "name" : "消息类型-错误信息",
+      "name" : "关闭模式-默认删除-上方-错误",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg6"
-      },
-      "position" : "POPUP"
+        "id" : "ViewMsg12"
+      }
    }, {
-      "name" : "关闭模式-无删除-上方-常规",
+      "name" : "关闭模式-本次删除-上方-警告",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg13"
      }
    }, {
-      "name" : "消息类型-常规信息",
+      "name" : "消息类型-错误信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg4"
+        "id" : "ViewMsg6"
      },
      "position" : "POPUP"
    }, {
-      "name" : "消息类型-警告信息",
+      "name" : "消息位置-视图下方",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg5"
-      },
-      "position" : "POPUP"
+        "id" : "ViewMsg8"
+      }
    } ]
  }, {
    "codeName" : "VMGroup5",
    "name" : "视图消息关闭模式",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-本次删除",
+      "name" : "关闭模式-默认删除",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg13"
+        "id" : "ViewMsg12"
      }
    }, {
-      "name" : "关闭模式-无删除",
+      "name" : "关闭模式-本次删除",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg13"
      }
    }, {
-      "name" : "关闭模式-默认删除",
+      "name" : "关闭模式-无删除",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg12"
+        "id" : "ViewMsg11"
      }
    } ]
  }, {
    "codeName" : "VMGroup6",
    "name" : "视图消息动态模式测试",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "动态模式-实体数据集",
+      "name" : "动态模式-静态内容",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg14"
+        "id" : "ViewMsg15"
      }
    }, {
-      "name" : "动态模式-静态内容",
+      "name" : "动态模式-实体数据集",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg15"
+        "id" : "ViewMsg14"
      }
    } ]
  } ],
--- 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
@@ -284,12 +284,12 @@
    "templCode3" : "const c = 333;console.log(333)\nconsole.log(c)",
    "templCode4" : "const d = 444;console.log(444)\nconsole.log(d)"
  }, {
-    "name" : "名称简写动态图标",
+    "name" : "名称简写图标表格列绘制",
    "getPSSysPFPlugin" : {
      "pluginType" : "GRID_COLRENDER",
-      "pluginCode" : "ABBRNAME_DYICON"
+      "pluginCode" : "ABBR_NAME_ICON"
    },
-    "pluginCode" : "ABBRNAME_DYICON",
+    "pluginCode" : "ABBR_NAME_ICON",
    "pluginType" : "GRID_COLRENDER",
    "refMode" : "CONTROLITEM",
    "refTag" : "GRID",

--- 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,9 +117,6 @@
  }, {
    "modelref" : true,
    "path" : "PSMODULES/common/PSCODELISTS/UsrCodeList0129249258.json"
-  }, {
-    "modelref" : true,
-    "path" : "PSMODULES/Test/PSCODELISTS/UsrCodeList0103432882.json"
  }, {
    "modelref" : true,
    "path" : "PSCODELISTS/CodeList34.json"
@@ -1333,9 +1330,6 @@
    }, {
      "modelref" : true,
      "path" : "PSMODULES/Test/PSCODELISTS/Booktype.json"
-    }, {
-      "modelref" : true,
-      "path" : "PSMODULES/Test/PSCODELISTS/UsrCodeList0103432882.json"
    }, {
      "modelref" : true,
      "path" : "PSMODULES/Test/PSCODELISTS/SongLanguage.json"