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

app_Web/swarm.yaml

@@ -3,7 +3,7 @@ services:
   trainsys-app-web:
     image: dstimage
     ports:
-      - "50100:80"
+      - "80:80"
     networks:
       - agent_network
     environment:

config.xml

@@ -55,12 +55,6 @@
 	  git clone -b master $para2 trainsys/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd trainsys/
-      mvn clean package -Ptrainsys
-      mvn install -Ptrainsys
-      cd trainsys-provider
-      mvn -Ptrainsys docker:build
-      mvn -Ptrainsys docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/trainsys-provider-trainsys.yaml ebsx --with-registry-auth      
       </command>
     </hudson.tasks.Shell>
   </builders>

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

@@ -1519,16 +1519,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"
       }
     } ],
     "uniqueTag" : "VMGroup2"

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSSEARCHBARS/filterSearchBar.json

@@ -314,6 +314,38 @@
     "name" : "group12",
     "width" : 0.0,
     "addSeparator" : false
+  }, {
+    "caption" : "上周新建",
+    "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[]}]}}",
+    "itemType" : "GROUP",
+    "name" : "public1",
+    "userTag" : "public",
+    "width" : 0.0,
+    "addSeparator" : false
+  }, {
+    "caption" : "我的客户",
+    "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[]}]}}",
+    "itemType" : "GROUP",
+    "name" : "public2",
+    "userTag" : "public",
+    "width" : 0.0,
+    "addSeparator" : false,
+    "defaultGroup" : true
+  }, {
+    "caption" : "所有客户",
+    "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[]}]}}",
+    "itemType" : "GROUP",
+    "name" : "public3",
+    "userTag" : "public",
+    "width" : 0.0,
+    "addSeparator" : false
+  }, {
+    "caption" : "本周新建",
+    "itemType" : "GROUP",
+    "name" : "public4",
+    "userTag" : "public",
+    "width" : 0.0,
+    "addSeparator" : false
   } ],
   "getPSSysPFPlugin" : {
     "pluginType" : "CUSTOM",

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

@@ -120,14 +120,27 @@
             "tooltip" : "过滤",
             "uIActionTarget" : "SINGLEDATA"
           }, {
-            "caption" : "搜索栏",
+            "caption" : "文本",
+            "contentType" : "RAW",
             "itemStyle" : "DEFAULT",
-            "itemType" : "CTRLPOS",
-            "name" : "groupsearchbar",
+            "itemType" : "RAWITEM",
+            "name" : "static_text",
             "getPSLayoutPos" : {
               "grow" : -1,
               "layout" : "FLEX"
             },
+            "getPSRawItem" : {
+              "caption" : "文本内容",
+              "contentType" : "RAW",
+              "name" : "static_text",
+              "predefinedType" : "STATIC_TEXT",
+              "renderMode" : "TEXT"
+            },
+            "getPSSysPFPlugin" : {
+              "pluginType" : "CUSTOM",
+              "pluginCode" : "GROUP_SEARCHBAR"
+            },
+            "rawContent" : "文本内容",
             "showCaption" : true
           } ]
         } ]
@@ -276,91 +289,6 @@
     "modelid" : "14893F4E-B5BE-438B-9976-65B388370670",
     "modeltype" : "PSSYSVIEWLAYOUTPANEL",
     "getPSControls" : [ {
-      "codeName" : "groupSearchBar",
-      "controlStyle" : "GROUP_SEARCHBAR",
-      "controlType" : "SEARCHBAR",
-      "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSSEARCHBARS/groupSearchBar.json",
-      "logicName" : "分组搜索栏",
-      "getPSAppDataEntity" : {
-        "modelref" : true,
-        "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
-      },
-      "getPSControlParam" : {
-        "id" : "GROUPSEARCHBAR"
-      },
-      "getPSSearchBarGroups" : [ {
-        "caption" : "上周新建",
-        "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[{\"condtype\":\"DEFIELD\",\"fieldname\":\"time\",\"condop\":\"GT\",\"value\":\"2024-03-24\"},{\"condtype\":\"DEFIELD\",\"fieldname\":\"time\",\"condop\":\"LT\",\"value\":\"2024-04-01\"}]}]}}",
-        "itemType" : "GROUP",
-        "name" : "gorup1",
-        "width" : 0.0,
-        "addSeparator" : false
-      }, {
-        "caption" : "我的客户",
-        "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[{\"condtype\":\"DEFIELD\",\"fieldname\":\"testname\",\"condop\":\"LIKE\",\"value\":\"客户\"}]}]}}",
-        "itemType" : "GROUP",
-        "name" : "group2",
-        "width" : 0.0,
-        "addSeparator" : false,
-        "defaultGroup" : true
-      }, {
-        "caption" : "所有客户",
-        "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[{\"condtype\":\"DEFIELD\",\"fieldname\":\"testname\",\"condop\":\"LIKE\",\"value\":\"客户\"}]}]}}",
-        "itemType" : "GROUP",
-        "name" : "group3",
-        "width" : 0.0,
-        "addSeparator" : false
-      }, {
-        "caption" : "所有已锁定的客户",
-        "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[{\"condtype\":\"DEFIELD\",\"fieldname\":\"testname\",\"condop\":\"LIKE\",\"value\":\"锁定\"}]}]}}",
-        "itemType" : "GROUP",
-        "name" : "group4",
-        "width" : 0.0,
-        "addSeparator" : false
-      }, {
-        "caption" : "最近修改的客户",
-        "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[{\"condtype\":\"DEFIELD\",\"fieldname\":\"testname\",\"condop\":\"LIKE\",\"value\":\"修改\"}]}]}}",
-        "itemType" : "GROUP",
-        "name" : "group5",
-        "width" : 0.0,
-        "addSeparator" : false
-      }, {
-        "caption" : "最近创建的客户",
-        "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[]}]}}",
-        "itemType" : "GROUP",
-        "name" : "group6",
-        "width" : 0.0,
-        "addSeparator" : false
-      }, {
-        "caption" : "未读的客户",
-        "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[{\"condtype\":\"DEFIELD\",\"fieldname\":\"testname\",\"condop\":\"LIKE\",\"value\":\"未读\"}]}]}}",
-        "itemType" : "GROUP",
-        "name" : "group7",
-        "width" : 0.0,
-        "addSeparator" : false
-      }, {
-        "caption" : "本周新建",
-        "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[{\"condtype\":\"DEFIELD\",\"fieldname\":\"type\",\"condop\":\"EQ\",\"value\":\"c\"}]}]}}",
-        "itemType" : "GROUP",
-        "name" : "group8",
-        "width" : 0.0,
-        "addSeparator" : false
-      } ],
-      "getPSSysPFPlugin" : {
-        "pluginType" : "CUSTOM",
-        "pluginCode" : "GROUP_SEARCHBAR"
-      },
-      "quickGroupCount" : -1,
-      "quickSearchMode" : 1,
-      "quickSearchWidth" : 0,
-      "enableFilter" : false,
-      "enableGroup" : true,
-      "enableQuickSearch" : true,
-      "mobileSearchBar" : false,
-      "name" : "groupsearchbar",
-      "modelid" : "0F07BA2D-02D4-49AB-A037-ADB17EE00F6C",
-      "modeltype" : "PSSYSSEARCHBAR"
-    }, {
       "codeName" : "filterSearchBar",
       "controlStyle" : "FILTER_SEARCHBAR",
       "controlType" : "SEARCHBAR",
@@ -679,6 +607,38 @@
         "name" : "group12",
         "width" : 0.0,
         "addSeparator" : false
+      }, {
+        "caption" : "上周新建",
+        "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[]}]}}",
+        "itemType" : "GROUP",
+        "name" : "public1",
+        "userTag" : "public",
+        "width" : 0.0,
+        "addSeparator" : false
+      }, {
+        "caption" : "我的客户",
+        "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[]}]}}",
+        "itemType" : "GROUP",
+        "name" : "public2",
+        "userTag" : "public",
+        "width" : 0.0,
+        "addSeparator" : false,
+        "defaultGroup" : true
+      }, {
+        "caption" : "所有客户",
+        "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[]}]}}",
+        "itemType" : "GROUP",
+        "name" : "public3",
+        "userTag" : "public",
+        "width" : 0.0,
+        "addSeparator" : false
+      }, {
+        "caption" : "本周新建",
+        "itemType" : "GROUP",
+        "name" : "public4",
+        "userTag" : "public",
+        "width" : 0.0,
+        "addSeparator" : false
       } ],
       "getPSSysPFPlugin" : {
         "pluginType" : "CUSTOM",

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

@@ -5875,8 +5875,9 @@
     },
     "pluginCode" : "GROUP_SEARCHBAR",
     "pluginType" : "CUSTOM",
-    "refMode" : "CONTROL",
-    "refTag" : "SEARCHBAR"
+    "refMode" : "CONTROLITEM",
+    "refTag" : "VIEWLAYOUTPANEL",
+    "refTag2" : "RAWITEM"
   }, {
     "name" : "分组树",
     "getPSSysPFPlugin" : {
@@ -16808,16 +16809,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"
       }
     } ],
     "uniqueTag" : "VMGroup2"
@@ -16849,10 +16850,10 @@
     "codeName" : "VMGroup3",
     "name" : "视图消息类型测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-常规信息",
+      "name" : "消息类型-错误信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg4"
+        "id" : "ViewMsg6"
       }
     }, {
       "name" : "消息类型-警告信息",
@@ -16861,10 +16862,10 @@
         "id" : "ViewMsg5"
       }
     }, {
-      "name" : "消息类型-错误信息",
+      "name" : "消息类型-常规信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg6"
+        "id" : "ViewMsg4"
       }
     } ],
     "uniqueTag" : "VMGroup3"
@@ -16883,28 +16884,28 @@
     "codeName" : "VMGroup4",
     "name" : "视图消息位置测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息位置-视图上方",
+      "name" : "消息位置-弹出",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg7"
+        "id" : "ViewMsg10"
       }
     }, {
-      "name" : "消息位置-弹出",
+      "name" : "消息位置-视图内容区",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg10"
+        "id" : "ViewMsg9"
       }
     }, {
-      "name" : "消息位置-视图下方",
+      "name" : "消息位置-视图上方",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg7"
       }
     }, {
-      "name" : "消息位置-视图内容区",
+      "name" : "消息位置-视图下方",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg9"
+        "id" : "ViewMsg8"
       }
     } ],
     "uniqueTag" : "VMGroup4"
@@ -16912,17 +16913,18 @@
     "codeName" : "VMGroup8",
     "name" : "【静态测试】",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息位置-视图内容区",
+      "name" : "关闭模式-本次删除-上方-警告",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg9"
+        "id" : "ViewMsg13"
       }
     }, {
-      "name" : "关闭模式-默认删除-上方-错误",
+      "name" : "消息类型-错误信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg12"
-      }
+        "id" : "ViewMsg6"
+      },
+      "position" : "POPUP"
     }, {
       "name" : "消息位置-视图下方",
       "getPSAppViewMsg" : {
@@ -16930,38 +16932,37 @@
         "id" : "ViewMsg8"
       }
     }, {
-      "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"
+        "id" : "ViewMsg5"
       },
       "position" : "POPUP"
     }, {
-      "name" : "关闭模式-无删除-上方-常规",
+      "name" : "关闭模式-默认删除-上方-错误",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg12"
       }
     }, {
-      "name" : "消息类型-常规信息",
+      "name" : "消息位置-视图内容区",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg4"
-      },
-      "position" : "POPUP"
+        "id" : "ViewMsg9"
+      }
     } ],
     "uniqueTag" : "VMGroup8"
   }, {
@@ -16974,16 +16975,16 @@
         "id" : "ViewMsg11"
       }
     }, {
-      "name" : "关闭模式-本次删除",
+      "name" : "关闭模式-默认删除",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg13"
+        "id" : "ViewMsg12"
       }
     }, {
-      "name" : "关闭模式-默认删除",
+      "name" : "关闭模式-本次删除",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg12"
+        "id" : "ViewMsg13"
       }
     } ],
     "uniqueTag" : "VMGroup5"
@@ -16991,16 +16992,16 @@
     "codeName" : "VMGroup6",
     "name" : "视图消息动态模式测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "动态模式-静态内容",
+      "name" : "动态模式-实体数据集",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg15"
+        "id" : "ViewMsg14"
       }
     }, {
-      "name" : "动态模式-实体数据集",
+      "name" : "动态模式-静态内容",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg14"
+        "id" : "ViewMsg15"
       }
     } ],
     "uniqueTag" : "VMGroup6"
@@ -52682,14 +52683,27 @@
                 "tooltip" : "过滤",
                 "uIActionTarget" : "SINGLEDATA"
               }, {
-                "caption" : "搜索栏",
+                "caption" : "文本",
+                "contentType" : "RAW",
                 "itemStyle" : "DEFAULT",
-                "itemType" : "CTRLPOS",
-                "name" : "groupsearchbar",
+                "itemType" : "RAWITEM",
+                "name" : "static_text",
                 "getPSLayoutPos" : {
                   "grow" : -1,
                   "layout" : "FLEX"
                 },
+                "getPSRawItem" : {
+                  "caption" : "文本内容",
+                  "contentType" : "RAW",
+                  "name" : "static_text",
+                  "predefinedType" : "STATIC_TEXT",
+                  "renderMode" : "TEXT"
+                },
+                "getPSSysPFPlugin" : {
+                  "pluginType" : "CUSTOM",
+                  "pluginCode" : "GROUP_SEARCHBAR"
+                },
+                "rawContent" : "文本内容",
                 "showCaption" : true
               } ]
             } ]
@@ -52838,91 +52852,6 @@
         "modelid" : "14893F4E-B5BE-438B-9976-65B388370670",
         "modeltype" : "PSSYSVIEWLAYOUTPANEL",
         "getPSControls" : [ {
-          "codeName" : "groupSearchBar",
-          "controlStyle" : "GROUP_SEARCHBAR",
-          "controlType" : "SEARCHBAR",
-          "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSSEARCHBARS/groupSearchBar.json",
-          "logicName" : "分组搜索栏",
-          "getPSAppDataEntity" : {
-            "modelref" : true,
-            "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
-          },
-          "getPSControlParam" : {
-            "id" : "GROUPSEARCHBAR"
-          },
-          "getPSSearchBarGroups" : [ {
-            "caption" : "上周新建",
-            "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[{\"condtype\":\"DEFIELD\",\"fieldname\":\"time\",\"condop\":\"GT\",\"value\":\"2024-03-24\"},{\"condtype\":\"DEFIELD\",\"fieldname\":\"time\",\"condop\":\"LT\",\"value\":\"2024-04-01\"}]}]}}",
-            "itemType" : "GROUP",
-            "name" : "gorup1",
-            "width" : 0.0,
-            "addSeparator" : false
-          }, {
-            "caption" : "我的客户",
-            "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[{\"condtype\":\"DEFIELD\",\"fieldname\":\"testname\",\"condop\":\"LIKE\",\"value\":\"客户\"}]}]}}",
-            "itemType" : "GROUP",
-            "name" : "group2",
-            "width" : 0.0,
-            "addSeparator" : false,
-            "defaultGroup" : true
-          }, {
-            "caption" : "所有客户",
-            "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[{\"condtype\":\"DEFIELD\",\"fieldname\":\"testname\",\"condop\":\"LIKE\",\"value\":\"客户\"}]}]}}",
-            "itemType" : "GROUP",
-            "name" : "group3",
-            "width" : 0.0,
-            "addSeparator" : false
-          }, {
-            "caption" : "所有已锁定的客户",
-            "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[{\"condtype\":\"DEFIELD\",\"fieldname\":\"testname\",\"condop\":\"LIKE\",\"value\":\"锁定\"}]}]}}",
-            "itemType" : "GROUP",
-            "name" : "group4",
-            "width" : 0.0,
-            "addSeparator" : false
-          }, {
-            "caption" : "最近修改的客户",
-            "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[{\"condtype\":\"DEFIELD\",\"fieldname\":\"testname\",\"condop\":\"LIKE\",\"value\":\"修改\"}]}]}}",
-            "itemType" : "GROUP",
-            "name" : "group5",
-            "width" : 0.0,
-            "addSeparator" : false
-          }, {
-            "caption" : "最近创建的客户",
-            "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[]}]}}",
-            "itemType" : "GROUP",
-            "name" : "group6",
-            "width" : 0.0,
-            "addSeparator" : false
-          }, {
-            "caption" : "未读的客户",
-            "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[{\"condtype\":\"DEFIELD\",\"fieldname\":\"testname\",\"condop\":\"LIKE\",\"value\":\"未读\"}]}]}}",
-            "itemType" : "GROUP",
-            "name" : "group7",
-            "width" : 0.0,
-            "addSeparator" : false
-          }, {
-            "caption" : "本周新建",
-            "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[{\"condtype\":\"DEFIELD\",\"fieldname\":\"type\",\"condop\":\"EQ\",\"value\":\"c\"}]}]}}",
-            "itemType" : "GROUP",
-            "name" : "group8",
-            "width" : 0.0,
-            "addSeparator" : false
-          } ],
-          "getPSSysPFPlugin" : {
-            "pluginType" : "CUSTOM",
-            "pluginCode" : "GROUP_SEARCHBAR"
-          },
-          "quickGroupCount" : -1,
-          "quickSearchMode" : 1,
-          "quickSearchWidth" : 0,
-          "enableFilter" : false,
-          "enableGroup" : true,
-          "enableQuickSearch" : true,
-          "mobileSearchBar" : false,
-          "name" : "groupsearchbar",
-          "modelid" : "0F07BA2D-02D4-49AB-A037-ADB17EE00F6C",
-          "modeltype" : "PSSYSSEARCHBAR"
-        }, {
           "codeName" : "filterSearchBar",
           "controlStyle" : "FILTER_SEARCHBAR",
           "controlType" : "SEARCHBAR",
@@ -53241,6 +53170,38 @@
             "name" : "group12",
             "width" : 0.0,
             "addSeparator" : false
+          }, {
+            "caption" : "上周新建",
+            "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[]}]}}",
+            "itemType" : "GROUP",
+            "name" : "public1",
+            "userTag" : "public",
+            "width" : 0.0,
+            "addSeparator" : false
+          }, {
+            "caption" : "我的客户",
+            "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[]}]}}",
+            "itemType" : "GROUP",
+            "name" : "public2",
+            "userTag" : "public",
+            "width" : 0.0,
+            "addSeparator" : false,
+            "defaultGroup" : true
+          }, {
+            "caption" : "所有客户",
+            "data" : "{\"theme_model\":{\"searchconds\":[{\"condtype\":\"GROUP\",\"condop\":\"AND\",\"bnotmode\":false,\"searchconds\":[]}]}}",
+            "itemType" : "GROUP",
+            "name" : "public3",
+            "userTag" : "public",
+            "width" : 0.0,
+            "addSeparator" : false
+          }, {
+            "caption" : "本周新建",
+            "itemType" : "GROUP",
+            "name" : "public4",
+            "userTag" : "public",
+            "width" : 0.0,
+            "addSeparator" : false
           } ],
           "getPSSysPFPlugin" : {
             "pluginType" : "CUSTOM",

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

@@ -342,8 +342,9 @@
     },
     "pluginCode" : "GROUP_SEARCHBAR",
     "pluginType" : "CUSTOM",
-    "refMode" : "CONTROL",
-    "refTag" : "SEARCHBAR"
+    "refMode" : "CONTROLITEM",
+    "refTag" : "VIEWLAYOUTPANEL",
+    "refTag2" : "RAWITEM"
   }, {
     "name" : "分组树",
     "getPSSysPFPlugin" : {

trainsys-provider/pom.xml

@@ -33,7 +33,7 @@
 
     <profiles>
         <profile>
-            <id>trainsys</id>
+            <id>runtime</id>
             <build>
                 <resources>
                     <resource>

trainsys-provider/src/main/docker/Dockerfile

@@ -10,6 +10,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Duser.timezone=$TZ -Djava.security.egd=file:/dev/./urandom -jar /trainsys-provider.jar
 
-EXPOSE 50000
+EXPOSE 8081
 
 ADD trainsys-provider.jar /trainsys-provider.jar

trainsys-provider/src/main/docker/trainsys-provider-trainsys-k8s.yaml

@@ -22,32 +22,7 @@ spec:
         image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
         imagePullPolicy: Always
         ports:
-        - containerPort: 50000
-        env:
-        - name: SPRING_CLOUD_NACOS_DISCOVERY_IP
-          value: "172.16.240.140"      
-        - name: SERVER_PORT
-          value: "50000"
-        - name: SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR
-          value: "172.16.240.140:8848"
-        - name: SPRING_REDIS_HOST
-          value: "127.0.0.1"
-        - name: SPRING_REDIS_PORT
-          value: "6379"
-        - name: SPRING_REDIS_DATABASE
-          value: "0"
-        - name: SPRING_DATASOURCE_USERNAME
-          value: "a_LAB01_d23cc850e"
-        - name: SPRING_DATASOURCE_PASSWORD
-          value: "f9Df4556"
-        - name: SPRING_DATASOURCE_URL
-          value: "jdbc:mysql://172.16.186.185:3306/a_LAB01_d23cc850e?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&serverTimezone=Asia/Shanghai&allowMultiQueries=true&serverTimezone=GMT%2B8"
-        - name: SPRING_DATASOURCE_DRIVER-CLASS-NAME
-          value: "com.mysql.jdbc.Driver"
-        - name: SPRING_DATASOURCE_DEFAULTSCHEMA
-          value: "a_LAB01_d23cc850e"
-        - name: NACOS
-          value: "172.16.240.140:8848"      
+        - containerPort: 8081
 
 ---
 apiVersion: v1
@@ -60,9 +35,9 @@ spec:
   type: NodePort
   ports:
   - name: http
-    port: 50000
-    targetPort: 50000
-    nodePort: 50000
+    port: 8081
+    targetPort: 8081
+    nodePort: 8081
     protocol: TCP
   selector:
     app: trainsys-provider

trainsys-provider/src/main/docker/trainsys-provider-trainsys.yaml

@@ -3,23 +3,9 @@ services:
   trainsys-provider:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
     ports:
-      - "50000:50000"
+      - "8081:8081"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.140
-      - SERVER_PORT=50000
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.140:8848
-      - SPRING_CLOUD_NACOS_CONFIG_SERVER-ADDR=172.16.240.140:8848
-      - SPRING_REDIS_HOST=127.0.0.1
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_LAB01_d23cc850e
-      - SPRING_DATASOURCE_PASSWORD=f9Df4556
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_d23cc850e?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&serverTimezone=Asia/Shanghai&allowMultiQueries=true&serverTimezone=GMT%2B8
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_d23cc850e
-      - NACOS=172.16.240.140:8848
     deploy:
       resources:
            limits: