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

32db7ee8 · ibizdev · cca3484a · 32db7ee8 · 32db7ee8 · 32db7ee8
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSDASHBOARDS/Usr03227416DashboardView_Dashboard.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSDASHBOARDS/Usr03227416DashboardView_Dashboard.json
@@ -1093,12 +1093,86 @@
          "showBusyIndicator" : true,
          "id" : "SEARCHFORM"
        },
+        "getPSDEFormItems" : [ {
+          "id" : "n_testname_like",
+          "dataType" : 25,
+          "getPSAppDEField" : {
+            "name" : "TESTNAME",
+            "codeName" : "TESTName"
+          }
+        }, {
+          "id" : "n_type_eq",
+          "dataType" : 25,
+          "getPSAppDEField" : {
+            "name" : "TYPE",
+            "codeName" : "Type"
+          }
+        } ],
        "getPSDEFormPages" : [ {
          "caption" : "常规条件",
          "codeName" : "formpage1",
          "detailStyle" : "DEFAULT",
          "detailType" : "FORMPAGE",
          "name" : "formpage1",
+          "getPSDEFormDetails" : [ {
+            "caption" : "测试实体名称",
+            "codeName" : "n_testname_like",
+            "dataType" : 25,
+            "detailStyle" : "DEFAULT",
+            "detailType" : "FORMITEM",
+            "enableCond" : 3,
+            "ignoreInput" : 0,
+            "labelPos" : "LEFT",
+            "labelWidth" : 130,
+            "name" : "n_testname_like",
+            "noPrivDisplayMode" : 1,
+            "getPSAppDEField" : {
+              "name" : "TESTNAME",
+              "codeName" : "TESTName"
+            },
+            "getPSEditor" : {
+              "editorType" : "TEXTBOX",
+              "name" : "n_testname_like"
+            },
+            "getPSLayoutPos" : {
+              "colMD" : 24,
+              "layout" : "TABLE_24COL"
+            },
+            "allowEmpty" : true,
+            "showCaption" : true
+          }, {
+            "caption" : "类型",
+            "codeName" : "n_type_eq",
+            "dataType" : 25,
+            "detailStyle" : "DEFAULT",
+            "detailType" : "FORMITEM",
+            "enableCond" : 3,
+            "ignoreInput" : 0,
+            "labelPos" : "LEFT",
+            "labelWidth" : 130,
+            "name" : "n_type_eq",
+            "noPrivDisplayMode" : 1,
+            "getPSAppDEField" : {
+              "name" : "TYPE",
+              "codeName" : "Type"
+            },
+            "getPSEditor" : {
+              "editorType" : "DROPDOWNLIST",
+              "name" : "n_type_eq",
+              "getPSAppCodeList" : {
+                "modelref" : true,
+                "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/Test__TestType.json"
+              },
+              "singleSelect" : true
+            },
+            "getPSLayoutPos" : {
+              "colMD" : 24,
+              "layout" : "TABLE_24COL"
+            },
+            "allowEmpty" : true,
+            "needCodeListConfig" : true,
+            "showCaption" : true
+          } ],
          "getPSLayout" : {
            "childColLG" : -1,
            "childColMD" : 24,

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSSEARCHFORMS/Usr03221685GridView_SearchForm.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSSEARCHFORMS/Usr03221685GridView_SearchForm.json
@@ -8,12 +8,86 @@
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
  },
+  "getPSDEFormItems" : [ {
+    "id" : "n_testname_like",
+    "dataType" : 25,
+    "getPSAppDEField" : {
+      "name" : "TESTNAME",
+      "codeName" : "TESTName"
+    }
+  }, {
+    "id" : "n_type_eq",
+    "dataType" : 25,
+    "getPSAppDEField" : {
+      "name" : "TYPE",
+      "codeName" : "Type"
+    }
+  } ],
  "getPSDEFormPages" : [ {
    "caption" : "常规条件",
    "codeName" : "formpage1",
    "detailStyle" : "DEFAULT",
    "detailType" : "FORMPAGE",
    "name" : "formpage1",
+    "getPSDEFormDetails" : [ {
+      "caption" : "测试实体名称",
+      "codeName" : "n_testname_like",
+      "dataType" : 25,
+      "detailStyle" : "DEFAULT",
+      "detailType" : "FORMITEM",
+      "enableCond" : 3,
+      "ignoreInput" : 0,
+      "labelPos" : "LEFT",
+      "labelWidth" : 130,
+      "name" : "n_testname_like",
+      "noPrivDisplayMode" : 1,
+      "getPSAppDEField" : {
+        "name" : "TESTNAME",
+        "codeName" : "TESTName"
+      },
+      "getPSEditor" : {
+        "editorType" : "TEXTBOX",
+        "name" : "n_testname_like"
+      },
+      "getPSLayoutPos" : {
+        "colMD" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "allowEmpty" : true,
+      "showCaption" : true
+    }, {
+      "caption" : "类型",
+      "codeName" : "n_type_eq",
+      "dataType" : 25,
+      "detailStyle" : "DEFAULT",
+      "detailType" : "FORMITEM",
+      "enableCond" : 3,
+      "ignoreInput" : 0,
+      "labelPos" : "LEFT",
+      "labelWidth" : 130,
+      "name" : "n_type_eq",
+      "noPrivDisplayMode" : 1,
+      "getPSAppDEField" : {
+        "name" : "TYPE",
+        "codeName" : "Type"
+      },
+      "getPSEditor" : {
+        "editorType" : "DROPDOWNLIST",
+        "name" : "n_type_eq",
+        "getPSAppCodeList" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/Test__TestType.json"
+        },
+        "singleSelect" : true
+      },
+      "getPSLayoutPos" : {
+        "colMD" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "allowEmpty" : true,
+      "needCodeListConfig" : true,
+      "showCaption" : true
+    } ],
    "getPSLayout" : {
      "childColLG" : -1,
      "childColMD" : 24,

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTCRMTabSearchView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTCRMTabSearchView.json
@@ -61,21 +61,20 @@
          "caption" : "容器",
          "itemStyle" : "DEFAULT",
          "itemType" : "CONTAINER",
-          "name" : "view_captionbar",
+          "name" : "view_searchbar",
          "getPSLayout" : {
-            "align" : "center",
            "layout" : "FLEX"
          },
          "getPSLayoutPos" : {
            "grow" : -1,
-            "heightMode" : "FULL",
-            "layout" : "FLEX"
+            "layout" : "FLEX",
+            "shrink" : 0
          },
          "getPSPanelItems" : [ {
-            "caption" : "页面标题",
+            "caption" : "搜索栏",
            "itemStyle" : "DEFAULT",
            "itemType" : "CTRLPOS",
-            "name" : "captionbar",
+            "name" : "searchbar",
            "getPSLayoutPos" : {
              "grow" : -1,
              "layout" : "FLEX"
@@ -160,6 +159,7 @@
      "itemType" : "CONTAINER",
      "name" : "view_content",
      "getPSLayout" : {
+        "dir" : "row",
        "layout" : "FLEX"
      },
      "getPSLayoutPos" : {
@@ -168,6 +168,7 @@
      },
      "getPSPanelItems" : [ {
        "caption" : "容器",
+        "contentWidth" : 20.0,
        "itemStyle" : "DEFAULT",
        "itemType" : "CONTAINER",
        "name" : "view_searchform",
@@ -177,7 +178,9 @@
        "getPSLayoutPos" : {
          "grow" : -1,
          "layout" : "FLEX",
-          "shrink" : 0
+          "shrink" : 0,
+          "width" : 20,
+          "widthMode" : "PERCENTAGE"
        },
        "getPSPanelItems" : [ {
          "caption" : "搜索表单",
@@ -189,31 +192,8 @@
            "layout" : "FLEX"
          },
          "showCaption" : true
-        } ]
-      }, {
-        "caption" : "容器",
-        "itemStyle" : "DEFAULT",
-        "itemType" : "CONTAINER",
-        "name" : "view_searchbar",
-        "getPSLayout" : {
-          "layout" : "FLEX"
-        },
-        "getPSLayoutPos" : {
-          "grow" : -1,
-          "layout" : "FLEX",
-          "shrink" : 0
-        },
-        "getPSPanelItems" : [ {
-          "caption" : "搜索栏",
-          "itemStyle" : "DEFAULT",
-          "itemType" : "CTRLPOS",
-          "name" : "searchbar",
-          "getPSLayoutPos" : {
-            "grow" : -1,
-            "layout" : "FLEX"
-          },
-          "showCaption" : true
-        } ]
+        } ],
+        "width" : 20.0
      }, {
        "caption" : "容器",
        "itemStyle" : "DEFAULT",
@@ -612,6 +592,166 @@
      } ],
      "modelid" : "59A640CD-E28E-448B-9613-AB4A2F3174D5",
      "modeltype" : "PSDETOOLBAR"
+    }, {
+      "codeName" : "Usr03221685GridView_SearchForm",
+      "controlType" : "SEARCHFORM",
+      "defaultLabelWidth" : 130,
+      "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSSEARCHFORMS/Usr03221685GridView_SearchForm.json",
+      "logicName" : "表格测试修改1_搜索表单",
+      "getPSAppDataEntity" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
+      },
+      "getPSControlHandler" : {
+        "getPSHandlerActions" : [ {
+          "actionType" : "FILTERACTION",
+          "name" : "load",
+          "getPSAppDEMethod" : {
+            "modelref" : true,
+            "id" : "FilterGet"
+          },
+          "getPSAppDataEntity" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
+          }
+        }, {
+          "actionType" : "FILTERACTION",
+          "name" : "loaddraft",
+          "getPSAppDEMethod" : {
+            "modelref" : true,
+            "id" : "FilterGetDraft"
+          },
+          "getPSAppDataEntity" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
+          }
+        }, {
+          "actionType" : "FILTERACTION",
+          "name" : "search",
+          "getPSAppDEMethod" : {
+            "modelref" : true,
+            "id" : "FilterSearch"
+          },
+          "getPSAppDataEntity" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
+          }
+        } ],
+        "enableDEFieldPrivilege" : false,
+        "id" : "搜索表单处理器"
+      },
+      "getPSControlParam" : {
+        "autoLoad" : true,
+        "showBusyIndicator" : true,
+        "id" : "SEARCHFORM"
+      },
+      "getPSDEFormItems" : [ {
+        "id" : "n_testname_like",
+        "dataType" : 25,
+        "getPSAppDEField" : {
+          "name" : "TESTNAME",
+          "codeName" : "TESTName"
+        }
+      }, {
+        "id" : "n_type_eq",
+        "dataType" : 25,
+        "getPSAppDEField" : {
+          "name" : "TYPE",
+          "codeName" : "Type"
+        }
+      } ],
+      "getPSDEFormPages" : [ {
+        "caption" : "常规条件",
+        "codeName" : "formpage1",
+        "detailStyle" : "DEFAULT",
+        "detailType" : "FORMPAGE",
+        "name" : "formpage1",
+        "getPSDEFormDetails" : [ {
+          "caption" : "测试实体名称",
+          "codeName" : "n_testname_like",
+          "dataType" : 25,
+          "detailStyle" : "DEFAULT",
+          "detailType" : "FORMITEM",
+          "enableCond" : 3,
+          "ignoreInput" : 0,
+          "labelPos" : "LEFT",
+          "labelWidth" : 130,
+          "name" : "n_testname_like",
+          "noPrivDisplayMode" : 1,
+          "getPSAppDEField" : {
+            "name" : "TESTNAME",
+            "codeName" : "TESTName"
+          },
+          "getPSEditor" : {
+            "editorType" : "TEXTBOX",
+            "name" : "n_testname_like"
+          },
+          "getPSLayoutPos" : {
+            "colMD" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "allowEmpty" : true,
+          "showCaption" : true
+        }, {
+          "caption" : "类型",
+          "codeName" : "n_type_eq",
+          "dataType" : 25,
+          "detailStyle" : "DEFAULT",
+          "detailType" : "FORMITEM",
+          "enableCond" : 3,
+          "ignoreInput" : 0,
+          "labelPos" : "LEFT",
+          "labelWidth" : 130,
+          "name" : "n_type_eq",
+          "noPrivDisplayMode" : 1,
+          "getPSAppDEField" : {
+            "name" : "TYPE",
+            "codeName" : "Type"
+          },
+          "getPSEditor" : {
+            "editorType" : "DROPDOWNLIST",
+            "name" : "n_type_eq",
+            "getPSAppCodeList" : {
+              "modelref" : true,
+              "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/Test__TestType.json"
+            },
+            "singleSelect" : true
+          },
+          "getPSLayoutPos" : {
+            "colMD" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "allowEmpty" : true,
+          "needCodeListConfig" : true,
+          "showCaption" : true
+        } ],
+        "getPSLayout" : {
+          "childColLG" : -1,
+          "childColMD" : 24,
+          "childColSM" : -1,
+          "childColXS" : -1,
+          "columnCount" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "infoGroupMode" : false
+      } ],
+      "getPSLayout" : {
+        "childColLG" : -1,
+        "childColMD" : 24,
+        "childColSM" : -1,
+        "childColXS" : -1,
+        "columnCount" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "searchButtonStyle" : "DEFAULT",
+      "tabHeaderPos" : "TOP",
+      "enableAdvanceSearch" : false,
+      "enableAutoSearch" : false,
+      "enableFilterSave" : false,
+      "noTabHeader" : true,
+      "name" : "searchform",
+      "modelid" : "04866463-653A-4DA2-ABE9-A109BFCA24F1",
+      "modeltype" : "PSDEFORM_SEARCHFORM"
    }, {
      "codeName" : "CRMTabSearchViewtabexppanel",
      "controlType" : "TABEXPPANEL",
@@ -1641,7 +1781,7 @@
  "viewType" : "DETABSEARCHVIEW",
  "enableDP" : true,
  "enableQuickSearch" : false,
-  "enableSearch" : false,
+  "enableSearch" : true,
  "expandSearchForm" : false,
  "loadDefault" : true,
  "showCaptionBar" : false,

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr03221685GridView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr03221685GridView.json
@@ -1052,12 +1052,86 @@
      "showBusyIndicator" : true,
      "id" : "SEARCHFORM"
    },
+    "getPSDEFormItems" : [ {
+      "id" : "n_testname_like",
+      "dataType" : 25,
+      "getPSAppDEField" : {
+        "name" : "TESTNAME",
+        "codeName" : "TESTName"
+      }
+    }, {
+      "id" : "n_type_eq",
+      "dataType" : 25,
+      "getPSAppDEField" : {
+        "name" : "TYPE",
+        "codeName" : "Type"
+      }
+    } ],
    "getPSDEFormPages" : [ {
      "caption" : "常规条件",
      "codeName" : "formpage1",
      "detailStyle" : "DEFAULT",
      "detailType" : "FORMPAGE",
      "name" : "formpage1",
+      "getPSDEFormDetails" : [ {
+        "caption" : "测试实体名称",
+        "codeName" : "n_testname_like",
+        "dataType" : 25,
+        "detailStyle" : "DEFAULT",
+        "detailType" : "FORMITEM",
+        "enableCond" : 3,
+        "ignoreInput" : 0,
+        "labelPos" : "LEFT",
+        "labelWidth" : 130,
+        "name" : "n_testname_like",
+        "noPrivDisplayMode" : 1,
+        "getPSAppDEField" : {
+          "name" : "TESTNAME",
+          "codeName" : "TESTName"
+        },
+        "getPSEditor" : {
+          "editorType" : "TEXTBOX",
+          "name" : "n_testname_like"
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "allowEmpty" : true,
+        "showCaption" : true
+      }, {
+        "caption" : "类型",
+        "codeName" : "n_type_eq",
+        "dataType" : 25,
+        "detailStyle" : "DEFAULT",
+        "detailType" : "FORMITEM",
+        "enableCond" : 3,
+        "ignoreInput" : 0,
+        "labelPos" : "LEFT",
+        "labelWidth" : 130,
+        "name" : "n_type_eq",
+        "noPrivDisplayMode" : 1,
+        "getPSAppDEField" : {
+          "name" : "TYPE",
+          "codeName" : "Type"
+        },
+        "getPSEditor" : {
+          "editorType" : "DROPDOWNLIST",
+          "name" : "n_type_eq",
+          "getPSAppCodeList" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/Test__TestType.json"
+          },
+          "singleSelect" : true
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "allowEmpty" : true,
+        "needCodeListConfig" : true,
+        "showCaption" : true
+      } ],
      "getPSLayout" : {
        "childColLG" : -1,
        "childColMD" : 24,

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr03227416DashboardView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr03227416DashboardView.json
@@ -1121,12 +1121,86 @@
            "showBusyIndicator" : true,
            "id" : "SEARCHFORM"
          },
+          "getPSDEFormItems" : [ {
+            "id" : "n_testname_like",
+            "dataType" : 25,
+            "getPSAppDEField" : {
+              "name" : "TESTNAME",
+              "codeName" : "TESTName"
+            }
+          }, {
+            "id" : "n_type_eq",
+            "dataType" : 25,
+            "getPSAppDEField" : {
+              "name" : "TYPE",
+              "codeName" : "Type"
+            }
+          } ],
          "getPSDEFormPages" : [ {
            "caption" : "常规条件",
            "codeName" : "formpage1",
            "detailStyle" : "DEFAULT",
            "detailType" : "FORMPAGE",
            "name" : "formpage1",
+            "getPSDEFormDetails" : [ {
+              "caption" : "测试实体名称",
+              "codeName" : "n_testname_like",
+              "dataType" : 25,
+              "detailStyle" : "DEFAULT",
+              "detailType" : "FORMITEM",
+              "enableCond" : 3,
+              "ignoreInput" : 0,
+              "labelPos" : "LEFT",
+              "labelWidth" : 130,
+              "name" : "n_testname_like",
+              "noPrivDisplayMode" : 1,
+              "getPSAppDEField" : {
+                "name" : "TESTNAME",
+                "codeName" : "TESTName"
+              },
+              "getPSEditor" : {
+                "editorType" : "TEXTBOX",
+                "name" : "n_testname_like"
+              },
+              "getPSLayoutPos" : {
+                "colMD" : 24,
+                "layout" : "TABLE_24COL"
+              },
+              "allowEmpty" : true,
+              "showCaption" : true
+            }, {
+              "caption" : "类型",
+              "codeName" : "n_type_eq",
+              "dataType" : 25,
+              "detailStyle" : "DEFAULT",
+              "detailType" : "FORMITEM",
+              "enableCond" : 3,
+              "ignoreInput" : 0,
+              "labelPos" : "LEFT",
+              "labelWidth" : 130,
+              "name" : "n_type_eq",
+              "noPrivDisplayMode" : 1,
+              "getPSAppDEField" : {
+                "name" : "TYPE",
+                "codeName" : "Type"
+              },
+              "getPSEditor" : {
+                "editorType" : "DROPDOWNLIST",
+                "name" : "n_type_eq",
+                "getPSAppCodeList" : {
+                  "modelref" : true,
+                  "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/Test__TestType.json"
+                },
+                "singleSelect" : true
+              },
+              "getPSLayoutPos" : {
+                "colMD" : 24,
+                "layout" : "TABLE_24COL"
+              },
+              "allowEmpty" : true,
+              "needCodeListConfig" : true,
+              "showCaption" : true
+            } ],
            "getPSLayout" : {
              "childColLG" : -1,
              "childColMD" : 24,

--- 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