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

38726f75 · ibizdev · ad17a934 · 38726f75 · 38726f75 · 38726f75
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/TEST.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/TEST.json
@@ -4298,6 +4298,12 @@
    "name" : "测试实体实体移动端多数据选择视图(树)",
    "realModelSubType" : "DEMOBMPICKUPVIEW",
    "realModelType" : "PSDEVIEWBASE"
+  }, {
+    "codeName" : "SearchFormBottom",
+    "logicName" : "搜索表单下方",
+    "name" : "搜索表单下方",
+    "realModelSubType" : "DEGRIDVIEW",
+    "realModelType" : "PSDEVIEWBASE"
  }, {
    "codeName" : "Usr12EditView_9682",
    "logicName" : "测试实体实体编辑视图(功能确认-基本功能-模态左侧抽屉弹出)",
@@ -4919,6 +4925,12 @@
    "name" : "测试实体实体树视图",
    "realModelSubType" : "DETREEVIEW",
    "realModelType" : "PSDEVIEWBASE"
+  }, {
+    "codeName" : "SearchFormRight",
+    "logicName" : "搜索表单右方",
+    "name" : "搜索表单右方",
+    "realModelSubType" : "DEGRIDVIEW",
+    "realModelType" : "PSDEVIEWBASE"
  }, {
    "codeName" : "LogicEditView",
    "logicName" : "逻辑测试编辑视图",

--- 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
@@ -1481,16 +1481,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/TEST.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json
@@ -5467,6 +5467,10 @@
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr5EditView.json",
    "viewType" : "DEEDITVIEW"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTSearchFormBottom.json",
+    "viewType" : "DEGRIDVIEW"
  }, {
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTPanelDataContainerTest.json",
@@ -5835,6 +5839,10 @@
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTRemoteAggGridView.json",
    "viewType" : "DEGRIDVIEW"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTSearchFormRight.json",
+    "viewType" : "DEGRIDVIEW"
  }, {
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTFormPickupDataView.json",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTSearchFormBottom.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTSearchFormBottom.json
+{
+  "accUserMode" : 2,
+  "caption" : "搜索表单下方",
+  "codeName" : "TESTSearchFormBottom",
+  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTSearchFormBottom.json",
+  "gridRowActiveMode" : 2,
+  "name" : "TESTSearchFormBottom",
+  "getPSAppDataEntity" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
+  },
+  "getPSAppModule" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPMODULES/Test.json"
+  },
+  "getPSAppViewEngines" : [ {
+    "engineCat" : "VIEW",
+    "engineType" : "GridView",
+    "name" : "engine"
+  } ],
+  "getPSAppViewLogics" : [ {
+    "logicTrigger" : "CUSTOM",
+    "logicType" : "APPUILOGIC",
+    "name" : "newdata",
+    "getPSAppUILogic" : {
+      "actionAfterWizard" : "DEFAULT",
+      "logicType" : "PREDEFINED",
+      "name" : "新建数据",
+      "getNewDataPSAppView" : {
+        "getRefPSAppView" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTEditView.json",
+          "viewType" : "DEEDITVIEW"
+        }
+      },
+      "getPSAppUILogicRefViews" : [ {
+        "getRefPSAppView" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTEditView.json",
+          "viewType" : "DEEDITVIEW"
+        }
+      } ],
+      "viewLogicType" : "APP_NEWDATA",
+      "batchAddOnly" : false,
+      "enableBatchAdd" : false,
+      "enableWizardAdd" : false
+    }
+  }, {
+    "logicTrigger" : "CUSTOM",
+    "logicType" : "APPUILOGIC",
+    "name" : "opendata",
+    "getPSAppUILogic" : {
+      "logicType" : "PREDEFINED",
+      "name" : "打开数据",
+      "getOpenDataPSAppView" : {
+        "getRefPSAppView" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTEditView.json",
+          "viewType" : "DEEDITVIEW"
+        }
+      },
+      "getPSAppUILogicRefViews" : [ {
+        "getRefPSAppView" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTEditView.json",
+          "viewType" : "DEEDITVIEW"
+        }
+      } ],
+      "viewLogicType" : "APP_OPENDATA",
+      "editMode" : true
+    }
+  } ],
+  "getPSAppViewRefs" : [ {
+    "name" : "NEWDATA",
+    "realTitle" : "测试实体编辑视图",
+    "getRefPSAppView" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTEditView.json",
+      "viewType" : "DEEDITVIEW"
+    }
+  }, {
+    "name" : "EDITDATA",
+    "realTitle" : "测试实体编辑视图",
+    "getRefPSAppView" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTEditView.json",
+      "viewType" : "DEEDITVIEW"
+    }
+  } ],
+  "getPSControls" : [ {
+    "controlType" : "SEARCHBAR",
+    "name" : "searchbar",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
+    },
+    "getPSControlParam" : {
+      "id" : "searchbar"
+    },
+    "quickGroupCount" : -1,
+    "quickSearchMode" : 1,
+    "quickSearchWidth" : 0,
+    "enableFilter" : false,
+    "enableGroup" : false,
+    "enableQuickSearch" : true,
+    "mobileSearchBar" : false
+  }, {
+    "caption" : "搜索表单下方",
+    "codeName" : "SearchFormBottomcaptionbar",
+    "controlType" : "CAPTIONBAR",
+    "name" : "captionbar",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
+    },
+    "getPSControlParam" : { }
+  } ],
+  "getPSDEViewCodeName" : "SearchFormBottom",
+  "getPSDEViewId" : "255728B0-728E-465E-822A-0E11DF6479B9",
+  "getPSViewLayoutPanel" : {
+    "codeName" : "Layoutpanel",
+    "controlStyle" : "APPDEGRIDVIEW",
+    "controlType" : "VIEWLAYOUTPANEL",
+    "name" : "layoutpanel",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
+    },
+    "getPSControlParam" : { },
+    "layoutBodyOnly" : true,
+    "layoutPanel" : true,
+    "useDefaultLayout" : true
+  },
+  "refFlag" : false,
+  "title" : "搜索表单下方",
+  "viewStyle" : "DEFAULT",
+  "viewType" : "DEGRIDVIEW",
+  "xDataControlName" : "grid",
+  "xDataPSControl" : "视图[Test.TESTSearchFormBottom]无法获取部件[grid]",
+  "enableDP" : true,
+  "enableExport" : true,
+  "enableFilter" : true,
+  "enableImport" : true,
+  "enableQuickSearch" : true,
+  "enableRowEdit" : false,
+  "enableSearch" : true,
+  "rowEditDefault" : false,
+  "modelid" : "22ffb572f8e78fa0f41d9b509153eac3",
+  "modeltype" : "PSAPPDEVIEW"
+}
\ No newline at end of file
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTSearchFormRight.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTSearchFormRight.json
--- 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
@@ -4115,7 +4115,7 @@
    },
    "pluginCode" : "CodeListGridColumn",
    "pluginType" : "GRID_COLRENDER",
-    "rTObjectName" : "CodeListGridColumn",
+    "rTObjectName" : "CodeListGridColumn111",
    "rTObjectRepo" : "@ibiz-template-plugin/example@0.0.1",
    "refMode" : "CONTROLITEM",
    "refTag" : "GRID",
@@ -11221,16 +11221,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"
      }
    } ]
  }, {
@@ -11265,16 +11265,16 @@
        "id" : "ViewMsg4"
      }
    }, {
-      "name" : "消息类型-警告信息",
+      "name" : "消息类型-错误信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg5"
+        "id" : "ViewMsg6"
      }
    }, {
-      "name" : "消息类型-错误信息",
+      "name" : "消息类型-警告信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg6"
+        "id" : "ViewMsg5"
      }
    } ]
  }, {
@@ -11291,39 +11291,47 @@
    "codeName" : "VMGroup4",
    "name" : "视图消息位置测试",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息位置-视图下方",
+      "name" : "消息位置-视图上方",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg7"
      }
    }, {
-      "name" : "消息位置-视图内容区",
+      "name" : "消息位置-弹出",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg9"
+        "id" : "ViewMsg10"
      }
    }, {
-      "name" : "消息位置-视图上方",
+      "name" : "消息位置-视图下方",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg7"
+        "id" : "ViewMsg8"
      }
    }, {
-      "name" : "消息位置-弹出",
+      "name" : "消息位置-视图内容区",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg10"
+        "id" : "ViewMsg9"
      }
    } ]
  }, {
    "codeName" : "VMGroup8",
    "name" : "【静态测试】",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-无删除-上方-常规",
+      "name" : "消息类型-警告信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg11"
-      }
+        "id" : "ViewMsg5"
+      },
+      "position" : "POPUP"
+    }, {
+      "name" : "消息类型-错误信息",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg6"
+      },
+      "position" : "POPUP"
    }, {
      "name" : "消息类型-常规信息",
      "getPSAppViewMsg" : {
@@ -11332,10 +11340,10 @@
      },
      "position" : "POPUP"
    }, {
-      "name" : "关闭模式-默认删除-上方-错误",
+      "name" : "关闭模式-无删除-上方-常规",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg12"
+        "id" : "ViewMsg11"
      }
    }, {
      "name" : "消息位置-视图内容区",
@@ -11343,6 +11351,12 @@
        "modelref" : true,
        "id" : "ViewMsg9"
      }
+    }, {
+      "name" : "关闭模式-默认删除-上方-错误",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg12"
+      }
    }, {
      "name" : "消息位置-视图下方",
      "getPSAppViewMsg" : {
@@ -11355,20 +11369,6 @@
        "modelref" : true,
        "id" : "ViewMsg13"
      }
-    }, {
-      "name" : "消息类型-警告信息",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg5"
-      },
-      "position" : "POPUP"
-    }, {
-      "name" : "消息类型-错误信息",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg6"
-      },
-      "position" : "POPUP"
    } ]
  }, {
    "codeName" : "VMGroup5",
@@ -11884,6 +11884,12 @@
    "viewType" : "DEDATAVIEWEXPVIEW",
    "resource" : "ViewLayoutModelRepository",
    "view" : "DEDataViewExpViewLayout"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTSearchFormBottom.json",
+    "viewType" : "DEGRIDVIEW",
+    "resource" : "TEST",
+    "view" : "SearchFormBottom"
  }, {
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr6EditView.json",
@@ -13738,6 +13744,12 @@
    "viewType" : "DEGRIDVIEW",
    "resource" : "TEST",
    "view" : "RemoteAggGridView"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTSearchFormRight.json",
+    "viewType" : "DEGRIDVIEW",
+    "resource" : "TEST",
+    "view" : "SearchFormRight"
  }, {
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/WorkFlowGridView.json",
@@ -54359,6 +54371,10 @@
        "modelref" : true,
        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr5EditView.json",
        "viewType" : "DEEDITVIEW"
+      }, {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTSearchFormBottom.json",
+        "viewType" : "DEGRIDVIEW"
      }, {
        "modelref" : true,
        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTPanelDataContainerTest.json",
@@ -54727,6 +54743,10 @@
        "modelref" : true,
        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTRemoteAggGridView.json",
        "viewType" : "DEGRIDVIEW"
+      }, {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTSearchFormRight.json",
+        "viewType" : "DEGRIDVIEW"
      }, {
        "modelref" : true,
        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTFormPickupDataView.json",
--- 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
@@ -98,7 +98,7 @@
    },
    "pluginCode" : "CodeListGridColumn",
    "pluginType" : "GRID_COLRENDER",
-    "rTObjectName" : "CodeListGridColumn",
+    "rTObjectName" : "CodeListGridColumn111",
    "rTObjectRepo" : "@ibiz-template-plugin/example@0.0.1",
    "refMode" : "CONTROLITEM",
    "refTag" : "GRID",