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

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

@@ -215,53 +215,52 @@
       },
       "getPSPanelItems" : [ {
         "caption" : "容器",
+        "contentWidth" : 20.0,
         "itemStyle" : "DEFAULT",
         "itemType" : "CONTAINER",
-        "name" : "view_nav_pos",
+        "name" : "filter_searchbar",
         "getPSLayout" : {
-          "dir" : "row",
           "layout" : "FLEX"
         },
         "getPSLayoutPos" : {
           "grow" : 1,
-          "layout" : "FLEX"
+          "layout" : "FLEX",
+          "spacingRight" : "INNERMEDIUM",
+          "width" : 20,
+          "widthMode" : "PERCENTAGE"
         },
         "getPSPanelItems" : [ {
-          "caption" : "容器",
-          "contentWidth" : 20.0,
+          "caption" : "搜索栏",
           "itemStyle" : "DEFAULT",
-          "itemType" : "CONTAINER",
-          "name" : "filter_searchbar",
-          "getPSLayout" : {
-            "layout" : "FLEX"
-          },
+          "itemType" : "CTRLPOS",
+          "name" : "filtersearchbar",
           "getPSLayoutPos" : {
             "grow" : -1,
-            "layout" : "FLEX",
-            "shrink" : 0,
-            "spacingRight" : "INNERMEDIUM",
-            "width" : 20,
-            "widthMode" : "PERCENTAGE"
+            "layout" : "FLEX"
           },
-          "getPSPanelItems" : [ {
-            "caption" : "搜索栏",
-            "itemStyle" : "DEFAULT",
-            "itemType" : "CTRLPOS",
-            "name" : "filtersearchbar",
-            "getPSLayoutPos" : {
-              "grow" : 1,
-              "layout" : "FLEX"
-            },
-            "showCaption" : true
-          } ],
-          "width" : 20.0
-        }, {
+          "showCaption" : true
+        } ],
+        "width" : 20.0
+      }, {
+        "caption" : "容器",
+        "itemStyle" : "DEFAULT",
+        "itemType" : "CONTAINER",
+        "name" : "view_nav_pos",
+        "getPSLayout" : {
+          "dir" : "row",
+          "layout" : "FLEX"
+        },
+        "getPSLayoutPos" : {
+          "grow" : 1,
+          "layout" : "FLEX"
+        },
+        "getPSPanelItems" : [ {
           "caption" : "导航区占位",
           "itemStyle" : "DEFAULT",
           "itemType" : "RAWITEM",
           "name" : "nav_pos",
           "getPSLayoutPos" : {
-            "grow" : 1,
+            "grow" : -1,
             "layout" : "FLEX"
           },
           "getPSRawItem" : {

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

@@ -140,7 +140,7 @@
       },
       "getPSPanelItems" : [ {
         "caption" : "容器",
-        "contentWidth" : 300.0,
+        "contentWidth" : 260.0,
         "itemStyle" : "DEFAULT",
         "itemType" : "CONTAINER",
         "name" : "view_drbar",
@@ -152,7 +152,7 @@
           "heightMode" : "FULL",
           "layout" : "FLEX",
           "shrink" : 0,
-          "width" : 300,
+          "width" : 260,
           "widthMode" : "PX"
         },
         "getPSPanelItems" : [ {
@@ -166,7 +166,7 @@
           },
           "showCaption" : true
         } ],
-        "width" : 300.0
+        "width" : 260.0
       }, {
         "caption" : "表单",
         "itemStyle" : "DEFAULT",

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

@@ -52777,53 +52777,52 @@
           },
           "getPSPanelItems" : [ {
             "caption" : "容器",
+            "contentWidth" : 20.0,
             "itemStyle" : "DEFAULT",
             "itemType" : "CONTAINER",
-            "name" : "view_nav_pos",
+            "name" : "filter_searchbar",
             "getPSLayout" : {
-              "dir" : "row",
               "layout" : "FLEX"
             },
             "getPSLayoutPos" : {
               "grow" : 1,
-              "layout" : "FLEX"
+              "layout" : "FLEX",
+              "spacingRight" : "INNERMEDIUM",
+              "width" : 20,
+              "widthMode" : "PERCENTAGE"
             },
             "getPSPanelItems" : [ {
-              "caption" : "容器",
-              "contentWidth" : 20.0,
+              "caption" : "搜索栏",
               "itemStyle" : "DEFAULT",
-              "itemType" : "CONTAINER",
-              "name" : "filter_searchbar",
-              "getPSLayout" : {
-                "layout" : "FLEX"
-              },
+              "itemType" : "CTRLPOS",
+              "name" : "filtersearchbar",
               "getPSLayoutPos" : {
                 "grow" : -1,
-                "layout" : "FLEX",
-                "shrink" : 0,
-                "spacingRight" : "INNERMEDIUM",
-                "width" : 20,
-                "widthMode" : "PERCENTAGE"
+                "layout" : "FLEX"
               },
-              "getPSPanelItems" : [ {
-                "caption" : "搜索栏",
-                "itemStyle" : "DEFAULT",
-                "itemType" : "CTRLPOS",
-                "name" : "filtersearchbar",
-                "getPSLayoutPos" : {
-                  "grow" : 1,
-                  "layout" : "FLEX"
-                },
-                "showCaption" : true
-              } ],
-              "width" : 20.0
-            }, {
+              "showCaption" : true
+            } ],
+            "width" : 20.0
+          }, {
+            "caption" : "容器",
+            "itemStyle" : "DEFAULT",
+            "itemType" : "CONTAINER",
+            "name" : "view_nav_pos",
+            "getPSLayout" : {
+              "dir" : "row",
+              "layout" : "FLEX"
+            },
+            "getPSLayoutPos" : {
+              "grow" : 1,
+              "layout" : "FLEX"
+            },
+            "getPSPanelItems" : [ {
               "caption" : "导航区占位",
               "itemStyle" : "DEFAULT",
               "itemType" : "RAWITEM",
               "name" : "nav_pos",
               "getPSLayoutPos" : {
-                "grow" : 1,
+                "grow" : -1,
                 "layout" : "FLEX"
               },
               "getPSRawItem" : {