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

d97598c7 · ibizdev · 311bf394 · d97598c7 · d97598c7 · d97598c7
--- a/app_Web/swarm.yaml
+++ b/app_Web/swarm.yaml
@@ -3,7 +3,7 @@ services:
  trainsys-app-web:
    image: dstimage
    ports:
-      - "50100:80"
+      - "80:80"
    networks:
      - agent_network
    environment:

--- a/config.xml
+++ b/config.xml
@@ -55,15 +55,6 @@
 	  git clone -b master $para2 trainsys/
      export NODE_OPTIONS=--max-old-space-size=4096
      cd trainsys/
-      mkdir -p /var/lib/jenkins/appcache/A3064A91-F42D-4D7F-BC1C-4173A4F5772C
-      if [ -e app_Web/.dynamic ]
-      then
-          cd app_Web
-      else
-          cd app_Web/app
-      fi
-      sed -i "s#dstimage#registry.cn-shanghai.aliyuncs.com/ibizsys/ibizcloud-standardsys-app-webapp:2022.09.01.001#g" swarm.yaml
-      docker -H $para1 stack deploy --compose-file=swarm.yaml ebsx --with-registry-auth    
      </command>
    </hudson.tasks.Shell>
  </builders>

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDATAENTITIES/RawMaterial.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDATAENTITIES/RawMaterial.json
 {
  "getAllPSAppDEACModes" : [ {
    "codeName" : "Default",
+    "getItemPSLayoutPanel" : {
+      "getAllPSPanelFields" : [ {
+        "id" : "rawmaterialname",
+        "viewFieldName" : "rawmaterialname"
+      } ],
+      "codeName" : "Usr0115766933",
+      "controlType" : "PANEL",
+      "dynaModelFilePath" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/RawMaterial/PSPANELS/Usr0115766933.json",
+      "layoutMode" : "Flex",
+      "logicName" : "自填模式布局面板测试",
+      "getPSAppDataEntity" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/RawMaterial.json"
+      },
+      "getPSControlParam" : {
+        "id" : "panel"
+      },
+      "getPSLayout" : {
+        "layout" : "FLEX"
+      },
+      "getRootPSPanelItems" : [ {
+        "caption" : "容器",
+        "itemStyle" : "DEFAULT",
+        "itemType" : "CONTAINER",
+        "name" : "container",
+        "getPSLayout" : {
+          "align" : "space-between",
+          "dir" : "row",
+          "layout" : "FLEX",
+          "vAlign" : "center"
+        },
+        "getPSLayoutPos" : {
+          "grow" : -1,
+          "layout" : "FLEX"
+        },
+        "getPSPanelItems" : [ {
+          "caption" : "文本(动态)",
+          "itemStyle" : "DEFAULT",
+          "itemType" : "FIELD",
+          "name" : "rawmaterialname",
+          "getPSEditor" : {
+            "editorType" : "SPAN",
+            "name" : "rawmaterialname",
+            "predefinedType" : "FIELD_TEXT_DYNAMIC",
+            "renderMode" : "TEXT_DYNAMIC",
+            "enableLinkView" : false
+          },
+          "getPSLayoutPos" : {
+            "grow" : -1,
+            "layout" : "FLEX"
+          },
+          "viewFieldName" : "rawmaterialname",
+          "hidden" : false,
+          "showCaption" : false
+        }, {
+          "caption" : "图片",
+          "contentType" : "IMAGE",
+          "itemStyle" : "DEFAULT",
+          "itemType" : "RAWITEM",
+          "name" : "static_image",
+          "getPSLayoutPos" : {
+            "grow" : -1,
+            "layout" : "FLEX"
+          },
+          "getPSRawItem" : {
+            "contentType" : "IMAGE",
+            "name" : "static_image",
+            "getPSSysImage" : {
+              "glyph" : "xf1b2@FontAwesome",
+              "cssClass" : "fa fa-cube"
+            },
+            "predefinedType" : "STATIC_IMAGE"
+          },
+          "getPSSysImage" : {
+            "glyph" : "xf1b2@FontAwesome",
+            "cssClass" : "fa fa-cube"
+          },
+          "showCaption" : true
+        } ]
+      } ],
+      "layoutPanel" : true,
+      "name" : "panel",
+      "modelid" : "4C7D1B54-3AA3-43CF-BD4D-2AE6BC447449",
+      "modeltype" : "PSSYSVIEWPANEL"
+    },
    "logicName" : "DEFAULT",
    "name" : "DEFAULT",
    "getPSDEACModeDataItems" : [ {

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDATAENTITIES/RawMaterial/PSPANELS/Usr0115766933.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDATAENTITIES/RawMaterial/PSPANELS/Usr0115766933.json
+{
+  "getAllPSPanelFields" : [ {
+    "id" : "rawmaterialname",
+    "viewFieldName" : "rawmaterialname"
+  } ],
+  "codeName" : "Usr0115766933",
+  "controlType" : "PANEL",
+  "dynaModelFilePath" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/RawMaterial/PSPANELS/Usr0115766933.json",
+  "layoutMode" : "Flex",
+  "logicName" : "自填模式布局面板测试",
+  "getPSAppDataEntity" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/RawMaterial.json"
+  },
+  "getPSLayout" : {
+    "layout" : "FLEX"
+  },
+  "getRootPSPanelItems" : [ {
+    "caption" : "容器",
+    "itemStyle" : "DEFAULT",
+    "itemType" : "CONTAINER",
+    "name" : "container",
+    "getPSLayout" : {
+      "align" : "space-between",
+      "dir" : "row",
+      "layout" : "FLEX",
+      "vAlign" : "center"
+    },
+    "getPSLayoutPos" : {
+      "grow" : -1,
+      "layout" : "FLEX"
+    },
+    "getPSPanelItems" : [ {
+      "caption" : "文本(动态)",
+      "itemStyle" : "DEFAULT",
+      "itemType" : "FIELD",
+      "name" : "rawmaterialname",
+      "getPSEditor" : {
+        "editorType" : "SPAN",
+        "name" : "rawmaterialname",
+        "predefinedType" : "FIELD_TEXT_DYNAMIC",
+        "renderMode" : "TEXT_DYNAMIC",
+        "enableLinkView" : false
+      },
+      "getPSLayoutPos" : {
+        "grow" : -1,
+        "layout" : "FLEX"
+      },
+      "viewFieldName" : "rawmaterialname",
+      "hidden" : false,
+      "showCaption" : false
+    }, {
+      "caption" : "图片",
+      "contentType" : "IMAGE",
+      "itemStyle" : "DEFAULT",
+      "itemType" : "RAWITEM",
+      "name" : "static_image",
+      "getPSLayoutPos" : {
+        "grow" : -1,
+        "layout" : "FLEX"
+      },
+      "getPSRawItem" : {
+        "contentType" : "IMAGE",
+        "name" : "static_image",
+        "getPSSysImage" : {
+          "glyph" : "xf1b2@FontAwesome",
+          "cssClass" : "fa fa-cube"
+        },
+        "predefinedType" : "STATIC_IMAGE"
+      },
+      "getPSSysImage" : {
+        "glyph" : "xf1b2@FontAwesome",
+        "cssClass" : "fa fa-cube"
+      },
+      "showCaption" : true
+    } ]
+  } ],
+  "layoutPanel" : true,
+  "modelid" : "4C7D1B54-3AA3-43CF-BD4D-2AE6BC447449",
+  "modeltype" : "PSSYSVIEWPANEL"
+}
\ No newline at end of file
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/RawMaterial.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/RawMaterial.json
 {
  "getAllPSAppDEACModes" : [ {
    "codeName" : "Default",
+    "getItemPSLayoutPanel" : {
+      "getAllPSPanelFields" : [ {
+        "id" : "rawmaterialname",
+        "viewFieldName" : "rawmaterialname"
+      } ],
+      "codeName" : "Usr0115766933",
+      "controlType" : "PANEL",
+      "dynaModelFilePath" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/RawMaterial/PSPANELS/Usr0115766933.json",
+      "layoutMode" : "Flex",
+      "logicName" : "自填模式布局面板测试",
+      "getPSAppDataEntity" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/RawMaterial.json"
+      },
+      "getPSControlParam" : {
+        "id" : "panel"
+      },
+      "getPSLayout" : {
+        "layout" : "FLEX"
+      },
+      "getRootPSPanelItems" : [ {
+        "caption" : "容器",
+        "itemStyle" : "DEFAULT",
+        "itemType" : "CONTAINER",
+        "name" : "container",
+        "getPSLayout" : {
+          "align" : "space-between",
+          "dir" : "row",
+          "layout" : "FLEX",
+          "vAlign" : "center"
+        },
+        "getPSLayoutPos" : {
+          "grow" : -1,
+          "layout" : "FLEX"
+        },
+        "getPSPanelItems" : [ {
+          "caption" : "文本(动态)",
+          "itemStyle" : "DEFAULT",
+          "itemType" : "FIELD",
+          "name" : "rawmaterialname",
+          "getPSEditor" : {
+            "editorType" : "SPAN",
+            "name" : "rawmaterialname",
+            "predefinedType" : "FIELD_TEXT_DYNAMIC",
+            "renderMode" : "TEXT_DYNAMIC",
+            "enableLinkView" : false
+          },
+          "getPSLayoutPos" : {
+            "grow" : -1,
+            "layout" : "FLEX"
+          },
+          "viewFieldName" : "rawmaterialname",
+          "hidden" : false,
+          "showCaption" : false
+        }, {
+          "caption" : "图片",
+          "contentType" : "IMAGE",
+          "itemStyle" : "DEFAULT",
+          "itemType" : "RAWITEM",
+          "name" : "static_image",
+          "getPSLayoutPos" : {
+            "grow" : -1,
+            "layout" : "FLEX"
+          },
+          "getPSRawItem" : {
+            "contentType" : "IMAGE",
+            "name" : "static_image",
+            "getPSSysImage" : {
+              "glyph" : "xf1b2@FontAwesome",
+              "cssClass" : "fa fa-cube"
+            },
+            "predefinedType" : "STATIC_IMAGE"
+          },
+          "getPSSysImage" : {
+            "glyph" : "xf1b2@FontAwesome",
+            "cssClass" : "fa fa-cube"
+          },
+          "showCaption" : true
+        } ]
+      } ],
+      "layoutPanel" : true,
+      "name" : "panel",
+      "modelid" : "4C7D1B54-3AA3-43CF-BD4D-2AE6BC447449",
+      "modeltype" : "PSSYSVIEWPANEL"
+    },
    "logicName" : "DEFAULT",
    "name" : "DEFAULT",
    "getPSDEACModeDataItems" : [ {

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/RawMaterial/PSPANELS/Usr0115766933.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/RawMaterial/PSPANELS/Usr0115766933.json
+{
+  "getAllPSPanelFields" : [ {
+    "id" : "rawmaterialname",
+    "viewFieldName" : "rawmaterialname"
+  } ],
+  "codeName" : "Usr0115766933",
+  "controlType" : "PANEL",
+  "dynaModelFilePath" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/RawMaterial/PSPANELS/Usr0115766933.json",
+  "layoutMode" : "Flex",
+  "logicName" : "自填模式布局面板测试",
+  "getPSAppDataEntity" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/RawMaterial.json"
+  },
+  "getPSLayout" : {
+    "layout" : "FLEX"
+  },
+  "getRootPSPanelItems" : [ {
+    "caption" : "容器",
+    "itemStyle" : "DEFAULT",
+    "itemType" : "CONTAINER",
+    "name" : "container",
+    "getPSLayout" : {
+      "align" : "space-between",
+      "dir" : "row",
+      "layout" : "FLEX",
+      "vAlign" : "center"
+    },
+    "getPSLayoutPos" : {
+      "grow" : -1,
+      "layout" : "FLEX"
+    },
+    "getPSPanelItems" : [ {
+      "caption" : "文本(动态)",
+      "itemStyle" : "DEFAULT",
+      "itemType" : "FIELD",
+      "name" : "rawmaterialname",
+      "getPSEditor" : {
+        "editorType" : "SPAN",
+        "name" : "rawmaterialname",
+        "predefinedType" : "FIELD_TEXT_DYNAMIC",
+        "renderMode" : "TEXT_DYNAMIC",
+        "enableLinkView" : false
+      },
+      "getPSLayoutPos" : {
+        "grow" : -1,
+        "layout" : "FLEX"
+      },
+      "viewFieldName" : "rawmaterialname",
+      "hidden" : false,
+      "showCaption" : false
+    }, {
+      "caption" : "图片",
+      "contentType" : "IMAGE",
+      "itemStyle" : "DEFAULT",
+      "itemType" : "RAWITEM",
+      "name" : "static_image",
+      "getPSLayoutPos" : {
+        "grow" : -1,
+        "layout" : "FLEX"
+      },
+      "getPSRawItem" : {
+        "contentType" : "IMAGE",
+        "name" : "static_image",
+        "getPSSysImage" : {
+          "glyph" : "xf1b2@FontAwesome",
+          "cssClass" : "fa fa-cube"
+        },
+        "predefinedType" : "STATIC_IMAGE"
+      },
+      "getPSSysImage" : {
+        "glyph" : "xf1b2@FontAwesome",
+        "cssClass" : "fa fa-cube"
+      },
+      "showCaption" : true
+    } ]
+  } ],
+  "layoutPanel" : true,
+  "modelid" : "4C7D1B54-3AA3-43CF-BD4D-2AE6BC447449",
+  "modeltype" : "PSSYSVIEWPANEL"
+}
\ No newline at end of file
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSFORMS/EditorTest.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSFORMS/EditorTest.json
@@ -76,17 +76,17 @@
      "id" : "Get"
    },
    "getPSDEFIUpdateDetails" : [ {
-      "name" : "field11"
-    }, {
-      "name" : "field13"
-    }, {
      "name" : "field17"
+    }, {
+      "name" : "field11"
    }, {
      "name" : "field8"
    }, {
      "name" : "type"
    }, {
      "name" : "field14"
+    }, {
+      "name" : "field13"
    } ]
  } ],
  "getPSDEFormItemVRs" : [ {
@@ -1815,6 +1815,7 @@
              "AC" : "TRUE",
              "PICKUPVIEW" : "TRUE"
            },
+            "editorStyle" : "MANAGE",
            "editorType" : "PICKER",
            "handlerType" : "PickupText",
            "getLinkPSAppView" : {
@@ -1838,6 +1839,11 @@
            "getPSEditorItems" : [ {
              "name" : "field16"
            } ],
+            "getPSSysPFPlugin" : {
+              "pluginType" : "EDITOR_CUSTOMSTYLE",
+              "pluginCode" : "MANAGE",
+              "runtimeObject" : true
+            },
            "getPickupPSAppView" : {
              "modelref" : true,
              "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/BXDPickupView.json",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSGRIDS/AutoGropuGridView_Grid.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSGRIDS/AutoGropuGridView_Grid.json
@@ -3,7 +3,6 @@
  "codeName" : "AutoGropuGridView_Grid",
  "columnEnableFilter" : 2,
  "columnEnableLink" : 2,
-  "controlStyle" : "GROUP_GRID",
  "controlType" : "GRID",
  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSGRIDS/AutoGropuGridView_Grid.json",
  "getFetchPSControlAction" : {
@@ -198,10 +197,6 @@
    },
    "allowEmpty" : true
  } ],
-  "getPSSysPFPlugin" : {
-    "pluginType" : "GRID_RENDER",
-    "pluginCode" : "GROUP_GRID"
-  },
  "pagingSize" : 20,
  "getRemovePSControlAction" : {
    "actionName" : "Remove",
@@ -229,7 +224,7 @@
  "forceFit" : false,
  "hideHeader" : false,
  "noSort" : false,
-  "singleSelect" : true,
+  "singleSelect" : false,
  "modelid" : "B7AFCC57-AA20-4BB0-B21A-7A6BB8F70F9E",
  "modeltype" : "PSDEGRID"
 }
\ No newline at end of file
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSGRIDS/TestEditorGrid.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSGRIDS/TestEditorGrid.json
@@ -3,7 +3,6 @@
  "codeName" : "TestEditorGrid",
  "columnEnableFilter" : 2,
  "columnEnableLink" : 2,
-  "controlStyle" : "NUMBER_GRID",
  "controlType" : "GRID",
  "getCreatePSControlAction" : {
    "actionName" : "Create",
@@ -1029,10 +1028,6 @@
    },
    "allowEmpty" : true
  } ],
-  "getPSSysPFPlugin" : {
-    "pluginType" : "GRID_RENDER",
-    "pluginCode" : "NUMBER_GRID"
-  },
  "pagingSize" : 20,
  "getRemovePSControlAction" : {
    "actionName" : "Remove",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/RawMaterial.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/RawMaterial.json
 {
  "getAllPSAppDEACModes" : [ {
    "codeName" : "Default",
+    "getItemPSLayoutPanel" : {
+      "getAllPSPanelFields" : [ {
+        "id" : "rawmaterialname",
+        "viewFieldName" : "rawmaterialname"
+      } ],
+      "codeName" : "Usr0115766933",
+      "controlType" : "PANEL",
+      "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/RawMaterial/PSPANELS/Usr0115766933.json",
+      "layoutMode" : "Flex",
+      "logicName" : "自填模式布局面板测试",
+      "getPSAppDataEntity" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/RawMaterial.json"
+      },
+      "getPSControlParam" : {
+        "id" : "panel"
+      },
+      "getPSLayout" : {
+        "layout" : "FLEX"
+      },
+      "getRootPSPanelItems" : [ {
+        "caption" : "容器",
+        "itemStyle" : "DEFAULT",
+        "itemType" : "CONTAINER",
+        "name" : "container",
+        "getPSLayout" : {
+          "align" : "space-between",
+          "dir" : "row",
+          "layout" : "FLEX",
+          "vAlign" : "center"
+        },
+        "getPSLayoutPos" : {
+          "grow" : -1,
+          "layout" : "FLEX"
+        },
+        "getPSPanelItems" : [ {
+          "caption" : "文本(动态)",
+          "itemStyle" : "DEFAULT",
+          "itemType" : "FIELD",
+          "name" : "rawmaterialname",
+          "getPSEditor" : {
+            "editorType" : "SPAN",
+            "name" : "rawmaterialname",
+            "predefinedType" : "FIELD_TEXT_DYNAMIC",
+            "renderMode" : "TEXT_DYNAMIC",
+            "enableLinkView" : false
+          },
+          "getPSLayoutPos" : {
+            "grow" : -1,
+            "layout" : "FLEX"
+          },
+          "viewFieldName" : "rawmaterialname",
+          "hidden" : false,
+          "showCaption" : false
+        }, {
+          "caption" : "图片",
+          "contentType" : "IMAGE",
+          "itemStyle" : "DEFAULT",
+          "itemType" : "RAWITEM",
+          "name" : "static_image",
+          "getPSLayoutPos" : {
+            "grow" : -1,
+            "layout" : "FLEX"
+          },
+          "getPSRawItem" : {
+            "contentType" : "IMAGE",
+            "name" : "static_image",
+            "getPSSysImage" : {
+              "glyph" : "xf1b2@FontAwesome",
+              "cssClass" : "fa fa-cube"
+            },
+            "predefinedType" : "STATIC_IMAGE"
+          },
+          "getPSSysImage" : {
+            "glyph" : "xf1b2@FontAwesome",
+            "cssClass" : "fa fa-cube"
+          },
+          "showCaption" : true
+        } ]
+      } ],
+      "layoutPanel" : true,
+      "name" : "panel",
+      "modelid" : "4C7D1B54-3AA3-43CF-BD4D-2AE6BC447449",
+      "modeltype" : "PSSYSVIEWPANEL"
+    },
    "logicName" : "DEFAULT",
    "name" : "DEFAULT",
    "getPSDEACModeDataItems" : [ {

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/RawMaterial/PSPANELS/Usr0115766933.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/RawMaterial/PSPANELS/Usr0115766933.json
+{
+  "getAllPSPanelFields" : [ {
+    "id" : "rawmaterialname",
+    "viewFieldName" : "rawmaterialname"
+  } ],
+  "codeName" : "Usr0115766933",
+  "controlType" : "PANEL",
+  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/RawMaterial/PSPANELS/Usr0115766933.json",
+  "layoutMode" : "Flex",
+  "logicName" : "自填模式布局面板测试",
+  "getPSAppDataEntity" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/RawMaterial.json"
+  },
+  "getPSLayout" : {
+    "layout" : "FLEX"
+  },
+  "getRootPSPanelItems" : [ {
+    "caption" : "容器",
+    "itemStyle" : "DEFAULT",
+    "itemType" : "CONTAINER",
+    "name" : "container",
+    "getPSLayout" : {
+      "align" : "space-between",
+      "dir" : "row",
+      "layout" : "FLEX",
+      "vAlign" : "center"
+    },
+    "getPSLayoutPos" : {
+      "grow" : -1,
+      "layout" : "FLEX"
+    },
+    "getPSPanelItems" : [ {
+      "caption" : "文本(动态)",
+      "itemStyle" : "DEFAULT",
+      "itemType" : "FIELD",
+      "name" : "rawmaterialname",
+      "getPSEditor" : {
+        "editorType" : "SPAN",
+        "name" : "rawmaterialname",
+        "predefinedType" : "FIELD_TEXT_DYNAMIC",
+        "renderMode" : "TEXT_DYNAMIC",
+        "enableLinkView" : false
+      },
+      "getPSLayoutPos" : {
+        "grow" : -1,
+        "layout" : "FLEX"
+      },
+      "viewFieldName" : "rawmaterialname",
+      "hidden" : false,
+      "showCaption" : false
+    }, {
+      "caption" : "图片",
+      "contentType" : "IMAGE",
+      "itemStyle" : "DEFAULT",
+      "itemType" : "RAWITEM",
+      "name" : "static_image",
+      "getPSLayoutPos" : {
+        "grow" : -1,
+        "layout" : "FLEX"
+      },
+      "getPSRawItem" : {
+        "contentType" : "IMAGE",
+        "name" : "static_image",
+        "getPSSysImage" : {
+          "glyph" : "xf1b2@FontAwesome",
+          "cssClass" : "fa fa-cube"
+        },
+        "predefinedType" : "STATIC_IMAGE"
+      },
+      "getPSSysImage" : {
+        "glyph" : "xf1b2@FontAwesome",
+        "cssClass" : "fa fa-cube"
+      },
+      "showCaption" : true
+    } ]
+  } ],
+  "layoutPanel" : true,
+  "modelid" : "4C7D1B54-3AA3-43CF-BD4D-2AE6BC447449",
+  "modeltype" : "PSSYSVIEWPANEL"
+}
\ No newline at end of file
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookAutoGropuGridView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookAutoGropuGridView.json
@@ -71,14 +71,6 @@
    }
  } ],
  "getPSAppViewRefs" : [ {
-    "name" : "EDITDATA",
-    "realTitle" : "书数据重定向视图",
-    "getRefPSAppView" : {
-      "modelref" : true,
-      "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookRedirectView.json",
-      "viewType" : "DEREDIRECTVIEW"
-    }
-  }, {
    "name" : "NEWDATA",
    "realTitle" : "书编辑视图",
    "getRefPSAppView" : {
@@ -86,6 +78,14 @@
      "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookEditView.json",
      "viewType" : "DEEDITVIEW"
    }
+  }, {
+    "name" : "EDITDATA",
+    "realTitle" : "书数据重定向视图",
+    "getRefPSAppView" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookRedirectView.json",
+      "viewType" : "DEREDIRECTVIEW"
+    }
  } ],
  "getPSControls" : [ {
    "codeName" : "AutoGropuGridViewtoolbar",
@@ -170,7 +170,6 @@
    "codeName" : "AutoGropuGridView_Grid",
    "columnEnableFilter" : 2,
    "columnEnableLink" : 2,
-    "controlStyle" : "GROUP_GRID",
    "controlType" : "GRID",
    "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSGRIDS/AutoGropuGridView_Grid.json",
    "getFetchPSControlAction" : {
@@ -455,10 +454,6 @@
      },
      "allowEmpty" : true
    } ],
-    "getPSSysPFPlugin" : {
-      "pluginType" : "GRID_RENDER",
-      "pluginCode" : "GROUP_GRID"
-    },
    "pagingSize" : 20,
    "getRemovePSControlAction" : {
      "actionName" : "Remove",
@@ -486,7 +481,7 @@
    "forceFit" : false,
    "hideHeader" : false,
    "noSort" : false,
-    "singleSelect" : true,
+    "singleSelect" : false,
    "name" : "grid",
    "modelid" : "B7AFCC57-AA20-4BB0-B21A-7A6BB8F70F9E",
    "modeltype" : "PSDEGRID"

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookBookEditViewEditorTest.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookBookEditViewEditorTest.json
@@ -179,17 +179,17 @@
        "id" : "Get"
      },
      "getPSDEFIUpdateDetails" : [ {
-        "name" : "field11"
-      }, {
-        "name" : "field13"
-      }, {
        "name" : "field17"
+      }, {
+        "name" : "field11"
      }, {
        "name" : "field8"
      }, {
        "name" : "type"
      }, {
        "name" : "field14"
+      }, {
+        "name" : "field13"
      } ]
    } ],
    "getPSDEFormItemVRs" : [ {
@@ -1918,6 +1918,7 @@
                "AC" : "TRUE",
                "PICKUPVIEW" : "TRUE"
              },
+              "editorStyle" : "MANAGE",
              "editorType" : "PICKER",
              "handlerType" : "PickupText",
              "getLinkPSAppView" : {
@@ -1941,6 +1942,11 @@
              "getPSEditorItems" : [ {
                "name" : "field16"
              } ],
+              "getPSSysPFPlugin" : {
+                "pluginType" : "EDITOR_CUSTOMSTYLE",
+                "pluginCode" : "MANAGE",
+                "runtimeObject" : true
+              },
              "getPickupPSAppView" : {
                "modelref" : true,
                "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/BXDPickupView.json",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr2GridView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr2GridView.json
@@ -71,7 +71,7 @@
    }
  } ],
  "getPSAppViewRefs" : [ {
-    "name" : "EDITDATA",
+    "name" : "NEWDATA",
    "realTitle" : "书编辑视图",
    "getRefPSAppView" : {
      "modelref" : true,
@@ -79,7 +79,7 @@
      "viewType" : "DEEDITVIEW"
    }
  }, {
-    "name" : "NEWDATA",
+    "name" : "EDITDATA",
    "realTitle" : "书编辑视图",
    "getRefPSAppView" : {
      "modelref" : true,
@@ -895,7 +895,6 @@
    "codeName" : "TestEditorGrid",
    "columnEnableFilter" : 2,
    "columnEnableLink" : 2,
-    "controlStyle" : "NUMBER_GRID",
    "controlType" : "GRID",
    "getCreatePSControlAction" : {
      "actionName" : "Create",
@@ -2008,10 +2007,6 @@
      },
      "allowEmpty" : true
    } ],
-    "getPSSysPFPlugin" : {
-      "pluginType" : "GRID_RENDER",
-      "pluginCode" : "NUMBER_GRID"
-    },
    "pagingSize" : 20,
    "getRemovePSControlAction" : {
      "actionName" : "Remove",

--- 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
@@ -2755,6 +2755,18 @@
    },
    "pluginCode" : "PERSONSELECT",
    "styleCode" : "EMPSELECT"
+  }, {
+    "codeName" : "MANAGE",
+    "containerType" : "FORMITEM",
+    "editorType" : "PICKER",
+    "name" : "数据选择（管理）",
+    "getPSSysPFPlugin" : {
+      "pluginType" : "EDITOR_CUSTOMSTYLE",
+      "pluginCode" : "MANAGE",
+      "runtimeObject" : true
+    },
+    "pluginCode" : "MANAGE",
+    "styleCode" : "MANAGE"
  }, {
    "codeName" : "ORGMULTIPLE",
    "containerType" : "FORMITEM",
@@ -5433,16 +5445,6 @@
    "refMode" : "CONTROL",
    "refTag" : "TREEVIEW",
    "runtimeObject" : true
-  }, {
-    "name" : "分组表格",
-    "getPSSysPFPlugin" : {
-      "pluginType" : "GRID_RENDER",
-      "pluginCode" : "GROUP_GRID"
-    },
-    "pluginCode" : "GROUP_GRID",
-    "pluginType" : "GRID_RENDER",
-    "refMode" : "CONTROL",
-    "refTag" : "GRID"
  }, {
    "name" : "前端模板插件2",
    "getPSSysPFPlugin" : {
@@ -5499,16 +5501,6 @@
    "pluginType" : "DEMETHOD",
    "refMode" : "DEMETHOD",
    "refTag" : "DEACTION"
-  }, {
-    "name" : "序号表格",
-    "getPSSysPFPlugin" : {
-      "pluginType" : "GRID_RENDER",
-      "pluginCode" : "NUMBER_GRID"
-    },
-    "pluginCode" : "NUMBER_GRID",
-    "pluginType" : "GRID_RENDER",
-    "refMode" : "CONTROL",
-    "refTag" : "GRID"
  }, {
    "name" : "数据选择自定义下拉测试",
    "getPSSysPFPlugin" : {
@@ -5518,6 +5510,19 @@
    "pluginCode" : "DATA_PICKER_CUSTOM_SELECT",
    "pluginType" : "AC_ITEM",
    "refMode" : "DEACMODE"
+  }, {
+    "name" : "数据选择（管理）",
+    "getPSSysPFPlugin" : {
+      "pluginType" : "EDITOR_CUSTOMSTYLE",
+      "pluginCode" : "MANAGE",
+      "runtimeObject" : true
+    },
+    "pluginCode" : "MANAGE",
+    "pluginType" : "EDITOR_CUSTOMSTYLE",
+    "rTObjectName" : "IBizManageMPicker",
+    "rTObjectRepo" : "@ibiz-template-plugin/manage-mpicker@0.1.2-y.1",
+    "refMode" : "EDITORSTYPE",
+    "runtimeObject" : true
  }, {
    "name" : "数据选择（路由）",
    "getPSSysPFPlugin" : {
@@ -12782,10 +12787,10 @@
    "codeName" : "VMGroup3",
    "name" : "视图消息类型测试",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-常规信息",
+      "name" : "消息类型-警告信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg4"
+        "id" : "ViewMsg5"
      }
    }, {
      "name" : "消息类型-错误信息",
@@ -12794,10 +12799,10 @@
        "id" : "ViewMsg6"
      }
    }, {
-      "name" : "消息类型-警告信息",
+      "name" : "消息类型-常规信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg5"
+        "id" : "ViewMsg4"
      }
    } ]
  }, {
@@ -12814,10 +12819,10 @@
    "codeName" : "VMGroup4",
    "name" : "视图消息位置测试",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息位置-弹出",
+      "name" : "消息位置-视图上方",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg10"
+        "id" : "ViewMsg7"
      }
    }, {
      "name" : "消息位置-视图下方",
@@ -12826,81 +12831,81 @@
        "id" : "ViewMsg8"
      }
    }, {
-      "name" : "消息位置-视图内容区",
+      "name" : "消息位置-弹出",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg9"
+        "id" : "ViewMsg10"
      }
    }, {
-      "name" : "消息位置-视图上方",
+      "name" : "消息位置-视图内容区",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg7"
+        "id" : "ViewMsg9"
      }
    } ]
  }, {
    "codeName" : "VMGroup8",
    "name" : "【静态测试】",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-错误信息",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg6"
-      },
-      "position" : "POPUP"
-    }, {
-      "name" : "消息类型-常规信息",
+      "name" : "消息位置-视图内容区",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg4"
-      },
-      "position" : "POPUP"
+        "id" : "ViewMsg9"
+      }
    }, {
-      "name" : "关闭模式-无删除-上方-常规",
+      "name" : "关闭模式-默认删除-上方-错误",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg12"
      }
    }, {
-      "name" : "消息位置-视图内容区",
+      "name" : "消息类型-警告信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg9"
-      }
+        "id" : "ViewMsg5"
+      },
+      "position" : "POPUP"
    }, {
-      "name" : "消息位置-视图下方",
+      "name" : "关闭模式-本次删除-上方-警告",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg13"
      }
    }, {
-      "name" : "关闭模式-默认删除-上方-错误",
+      "name" : "消息类型-错误信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg12"
-      }
+        "id" : "ViewMsg6"
+      },
+      "position" : "POPUP"
    }, {
-      "name" : "消息类型-警告信息",
+      "name" : "消息类型-常规信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg5"
+        "id" : "ViewMsg4"
      },
      "position" : "POPUP"
    }, {
-      "name" : "关闭模式-本次删除-上方-警告",
+      "name" : "关闭模式-无删除-上方-常规",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg13"
+        "id" : "ViewMsg11"
+      }
+    }, {
+      "name" : "消息位置-视图下方",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg8"
      }
    } ]
  }, {
    "codeName" : "VMGroup5",
    "name" : "视图消息关闭模式",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-默认删除",
+      "name" : "关闭模式-本次删除",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg12"
+        "id" : "ViewMsg13"
      }
    }, {
      "name" : "关闭模式-无删除",
@@ -12909,26 +12914,26 @@
        "id" : "ViewMsg11"
      }
    }, {
-      "name" : "关闭模式-本次删除",
+      "name" : "关闭模式-默认删除",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg13"
+        "id" : "ViewMsg12"
      }
    } ]
  }, {
    "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
@@ -248,16 +248,6 @@
    "refMode" : "CONTROL",
    "refTag" : "TREEVIEW",
    "runtimeObject" : true
-  }, {
-    "name" : "分组表格",
-    "getPSSysPFPlugin" : {
-      "pluginType" : "GRID_RENDER",
-      "pluginCode" : "GROUP_GRID"
-    },
-    "pluginCode" : "GROUP_GRID",
-    "pluginType" : "GRID_RENDER",
-    "refMode" : "CONTROL",
-    "refTag" : "GRID"
  }, {
    "name" : "前端模板插件2",
    "getPSSysPFPlugin" : {
@@ -314,16 +304,6 @@
    "pluginType" : "DEMETHOD",
    "refMode" : "DEMETHOD",
    "refTag" : "DEACTION"
-  }, {
-    "name" : "序号表格",
-    "getPSSysPFPlugin" : {
-      "pluginType" : "GRID_RENDER",
-      "pluginCode" : "NUMBER_GRID"
-    },
-    "pluginCode" : "NUMBER_GRID",
-    "pluginType" : "GRID_RENDER",
-    "refMode" : "CONTROL",
-    "refTag" : "GRID"
  }, {
    "name" : "数据选择自定义下拉测试",
    "getPSSysPFPlugin" : {
@@ -333,6 +313,19 @@
    "pluginCode" : "DATA_PICKER_CUSTOM_SELECT",
    "pluginType" : "AC_ITEM",
    "refMode" : "DEACMODE"
+  }, {
+    "name" : "数据选择（管理）",
+    "getPSSysPFPlugin" : {
+      "pluginType" : "EDITOR_CUSTOMSTYLE",
+      "pluginCode" : "MANAGE",
+      "runtimeObject" : true
+    },
+    "pluginCode" : "MANAGE",
+    "pluginType" : "EDITOR_CUSTOMSTYLE",
+    "rTObjectName" : "IBizManageMPicker",
+    "rTObjectRepo" : "@ibiz-template-plugin/manage-mpicker@0.1.2-y.1",
+    "refMode" : "EDITORSTYPE",
+    "runtimeObject" : true
  }, {
    "name" : "数据选择（路由）",
    "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
@@ -933,6 +933,20 @@
    },
    "styleCode" : "CUSTOMEDIT",
    "replaceDefault" : false
+  }, {
+    "codeName" : "MANAGE",
+    "dynaModelFilePath" : "PSSYSEDITORSTYLES/MANAGE.json",
+    "editorHeight" : -1.0,
+    "editorType" : "PICKER",
+    "editorWidth" : -1.0,
+    "name" : "数据选择（管理）",
+    "getPSSysPFPlugin" : {
+      "pluginType" : "EDITOR_CUSTOMSTYLE",
+      "pluginCode" : "MANAGE",
+      "runtimeObject" : true
+    },
+    "styleCode" : "MANAGE",
+    "replaceDefault" : false
  }, {
    "codeName" : "Auto9",
    "dynaModelFilePath" : "PSSYSEDITORSTYLES/Auto9.json",