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

f68b32e3 · ibizdev · 753e6677 · f68b32e3 · f68b32e3 · f68b32e3
--- 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
@@ -1582,16 +1582,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/Student/PSSEARCHBARS/Usr0201345542.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Student/PSSEARCHBARS/Usr0201345542.json
+{
+  "codeName" : "Usr0201345542",
+  "controlType" : "SEARCHBAR",
+  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Student/PSSEARCHBARS/Usr0201345542.json",
+  "logicName" : "表格树搜索栏",
+  "getPSAppDataEntity" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Student.json"
+  },
+  "getPSSearchBarFilters" : [ {
+    "dataType" : 25,
+    "itemType" : "FILTER",
+    "labelPos" : "NONE",
+    "labelWidth" : 0,
+    "name" : "name",
+    "getPSAppDEField" : {
+      "name" : "STUDENTNAME",
+      "codeName" : "StudentName"
+    },
+    "getPSEditor" : {
+      "editorType" : "TEXTBOX",
+      "name" : "name"
+    },
+    "allowEmpty" : true,
+    "emptyCaption" : false,
+    "hidden" : false,
+    "showCaption" : false
+  }, {
+    "dataType" : 9,
+    "itemType" : "FILTER",
+    "labelPos" : "NONE",
+    "labelWidth" : 0,
+    "name" : "age",
+    "getPSAppDEField" : {
+      "name" : "AGE",
+      "codeName" : "Age"
+    },
+    "getPSEditor" : {
+      "editorType" : "TEXTBOX",
+      "name" : "age"
+    },
+    "allowEmpty" : true,
+    "emptyCaption" : false,
+    "hidden" : false,
+    "showCaption" : false
+  } ],
+  "quickGroupCount" : -1,
+  "quickSearchMode" : 1,
+  "quickSearchWidth" : 0,
+  "enableFilter" : true,
+  "enableGroup" : false,
+  "enableQuickSearch" : true,
+  "mobileSearchBar" : false,
+  "modelid" : "DC5CD019-0B31-469D-85DE-5480C73F33BD",
+  "modeltype" : "PSSYSSEARCHBAR"
+}
\ No newline at end of file
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TESTGRID/PSLISTS/Test_List.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TESTGRID/PSLISTS/Test_List.json
@@ -115,6 +115,11 @@
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TESTGRID.json"
  },
+  "getPSControlRenders" : [ {
+    "layoutPanelModel" : "`<span>部件绘制器逻辑</span>`",
+    "name" : "LOGICP",
+    "renderType" : "LAYOUTPANEL_MODEL"
+  } ],
  "getPSDEListDataItems" : [ {
    "dataType" : 25,
    "name" : "srfkey",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTGRIDUsr12216129TestCustomView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTGRIDUsr12216129TestCustomView.json
@@ -158,11 +158,6 @@
      "itemStyle" : "DEFAULT",
      "itemType" : "CTRLPOS",
      "name" : "list1",
-      "getPSControlRenders" : [ {
-        "layoutPanelModel" : "`<span>测试列表部件绘制</span>`",
-        "name" : "logic",
-        "renderType" : "LAYOUTPANEL_MODEL"
-      } ],
      "getPSLayoutPos" : {
        "grow" : -1,
        "layout" : "FLEX"
@@ -905,6 +900,11 @@
        "showBusyIndicator" : true,
        "id" : "LIST1"
      },
+      "getPSControlRenders" : [ {
+        "layoutPanelModel" : "`<span>部件绘制器逻辑</span>`",
+        "name" : "LOGICP",
+        "renderType" : "LAYOUTPANEL_MODEL"
+      } ],
      "getPSDEListDataItems" : [ {
        "dataType" : 25,
        "name" : "srfkey",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/studentTreeGridView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/studentTreeGridView.json
@@ -65,7 +65,7 @@
    }
  } ],
  "getPSAppViewRefs" : [ {
-    "name" : "NEWDATA",
+    "name" : "EDITDATA",
    "realTitle" : "学生编辑视图",
    "getRefPSAppView" : {
      "modelref" : true,
@@ -73,7 +73,7 @@
      "viewType" : "DEEDITVIEW"
    }
  }, {
-    "name" : "EDITDATA",
+    "name" : "NEWDATA",
    "realTitle" : "学生编辑视图",
    "getRefPSAppView" : {
      "modelref" : true,
@@ -1150,22 +1150,64 @@
    "modelid" : "D0DED708-12F2-478D-B276-E609877AE63C",
    "modeltype" : "PSDEGRID"
  }, {
+    "codeName" : "Usr0201345542",
    "controlType" : "SEARCHBAR",
-    "name" : "searchbar",
+    "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Student/PSSEARCHBARS/Usr0201345542.json",
+    "logicName" : "表格树搜索栏",
    "getPSAppDataEntity" : {
      "modelref" : true,
      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Student.json"
    },
    "getPSControlParam" : {
-      "id" : "searchbar"
+      "id" : "SEARCHBAR"
    },
+    "getPSSearchBarFilters" : [ {
+      "dataType" : 25,
+      "itemType" : "FILTER",
+      "labelPos" : "NONE",
+      "labelWidth" : 0,
+      "name" : "name",
+      "getPSAppDEField" : {
+        "name" : "STUDENTNAME",
+        "codeName" : "StudentName"
+      },
+      "getPSEditor" : {
+        "editorType" : "TEXTBOX",
+        "name" : "name"
+      },
+      "allowEmpty" : true,
+      "emptyCaption" : false,
+      "hidden" : false,
+      "showCaption" : false
+    }, {
+      "dataType" : 9,
+      "itemType" : "FILTER",
+      "labelPos" : "NONE",
+      "labelWidth" : 0,
+      "name" : "age",
+      "getPSAppDEField" : {
+        "name" : "AGE",
+        "codeName" : "Age"
+      },
+      "getPSEditor" : {
+        "editorType" : "TEXTBOX",
+        "name" : "age"
+      },
+      "allowEmpty" : true,
+      "emptyCaption" : false,
+      "hidden" : false,
+      "showCaption" : false
+    } ],
    "quickGroupCount" : -1,
    "quickSearchMode" : 1,
    "quickSearchWidth" : 0,
-    "enableFilter" : false,
+    "enableFilter" : true,
    "enableGroup" : false,
    "enableQuickSearch" : true,
-    "mobileSearchBar" : false
+    "mobileSearchBar" : false,
+    "name" : "searchbar",
+    "modelid" : "DC5CD019-0B31-469D-85DE-5480C73F33BD",
+    "modeltype" : "PSSYSSEARCHBAR"
  }, {
    "caption" : "学生",
    "codeName" : "TreeGridViewcaptionbar",

--- 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
@@ -5494,7 +5494,7 @@
    "pluginCode" : "formulaEditor",
    "pluginType" : "EDITOR_CUSTOMSTYLE",
    "rTObjectName" : "IBizFormulaEditor",
-    "rTObjectRepo" : "@ibiz-template-plugins/formula-editor@0.0.1-dev.8",
+    "rTObjectRepo" : "@ibiz-template-plugins/formula-editor@0.0.1-dev.9",
    "refMode" : "EDITORSTYPE",
    "runtimeObject" : true
  }, {
@@ -13428,16 +13428,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"
      }
    } ]
  }, {
@@ -13466,12 +13466,6 @@
    "codeName" : "VMGroup3",
    "name" : "视图消息类型测试",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-常规信息",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg4"
-      }
-    }, {
      "name" : "消息类型-警告信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
@@ -13483,6 +13477,12 @@
        "modelref" : true,
        "id" : "ViewMsg6"
      }
+    }, {
+      "name" : "消息类型-常规信息",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg4"
+      }
    } ]
  }, {
    "codeName" : "VMGroup7",
@@ -13498,10 +13498,10 @@
    "codeName" : "VMGroup4",
    "name" : "视图消息位置测试",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息位置-弹出",
+      "name" : "消息位置-视图内容区",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg10"
+        "id" : "ViewMsg9"
      }
    }, {
      "name" : "消息位置-视图上方",
@@ -13510,27 +13510,41 @@
        "id" : "ViewMsg7"
      }
    }, {
-      "name" : "消息位置-视图内容区",
+      "name" : "消息位置-视图下方",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg9"
+        "id" : "ViewMsg8"
      }
    }, {
-      "name" : "消息位置-视图下方",
+      "name" : "消息位置-弹出",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg10"
      }
    } ]
  }, {
    "codeName" : "VMGroup8",
    "name" : "【静态测试】",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-默认删除-上方-错误",
+      "name" : "关闭模式-无删除-上方-常规",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg12"
+        "id" : "ViewMsg11"
      }
+    }, {
+      "name" : "消息类型-常规信息",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg4"
+      },
+      "position" : "POPUP"
+    }, {
+      "name" : "消息类型-警告信息",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg5"
+      },
+      "position" : "POPUP"
    }, {
      "name" : "消息位置-视图内容区",
      "getPSAppViewMsg" : {
@@ -13538,16 +13552,16 @@
        "id" : "ViewMsg9"
      }
    }, {
-      "name" : "关闭模式-本次删除-上方-警告",
+      "name" : "关闭模式-默认删除-上方-错误",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg13"
+        "id" : "ViewMsg12"
      }
    }, {
-      "name" : "消息位置-视图下方",
+      "name" : "关闭模式-本次删除-上方-警告",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg13"
      }
    }, {
      "name" : "消息类型-错误信息",
@@ -13557,62 +13571,48 @@
      },
      "position" : "POPUP"
    }, {
-      "name" : "消息类型-警告信息",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg5"
-      },
-      "position" : "POPUP"
-    }, {
-      "name" : "关闭模式-无删除-上方-常规",
+      "name" : "消息位置-视图下方",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg8"
      }
-    }, {
-      "name" : "消息类型-常规信息",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg4"
-      },
-      "position" : "POPUP"
    } ]
  }, {
    "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
@@ -95,7 +95,7 @@
    "pluginCode" : "formulaEditor",
    "pluginType" : "EDITOR_CUSTOMSTYLE",
    "rTObjectName" : "IBizFormulaEditor",
-    "rTObjectRepo" : "@ibiz-template-plugins/formula-editor@0.0.1-dev.8",
+    "rTObjectRepo" : "@ibiz-template-plugins/formula-editor@0.0.1-dev.9",
    "refMode" : "EDITORSTYPE",
    "runtimeObject" : true
  }, {