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

5fbf2450 · ibizdev · 22709a56 · 5fbf2450 · 5fbf2450 · 5fbf2450
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/FILE.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/FILE.json
@@ -1771,6 +1771,12 @@
    "name" : "文件实体表格视图",
    "realModelSubType" : "DEGRIDVIEW",
    "realModelType" : "PSDEVIEWBASE"
+  }, {
+    "codeName" : "TestTreeGridExView",
+    "logicName" : "树表格视图（增强）",
+    "name" : "树表格视图（增强）",
+    "realModelSubType" : "DETREEGRIDEXVIEW",
+    "realModelType" : "PSDEVIEWBASE"
  }, {
    "codeName" : "EditView",
    "logicName" : "文件实体编辑视图",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/FILE.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/FILE.json
@@ -1533,6 +1533,10 @@
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/FILEFileExpView.json",
    "viewType" : "DETREEEXPVIEW"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/FILETestTreeGridExView.json",
+    "viewType" : "DETREEGRIDEXVIEW"
  }, {
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/FILEEditView.json",
@@ -1545,6 +1549,10 @@
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/FILEUsr12064666TreeView.json",
    "viewType" : "DETREEVIEW"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/FILERedirectView.json",
+    "viewType" : "DEREDIRECTVIEW"
  }, {
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/FILEGridView.json",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/FILE/PSGRIDS/Main.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/FILE/PSGRIDS/Main.json
@@ -50,6 +50,12 @@
    "columnType" : "DEFGRIDCOLUMN",
    "dataItemName" : "pfilename",
    "excelCaption" : "父项文件",
+    "getLinkPSAppView" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/FILERedirectView.json",
+      "viewType" : "DEREDIRECTVIEW"
+    },
+    "linkValueItem" : "pfileid",
    "name" : "pfilename",
    "noPrivDisplayMode" : 1,
    "getPSAppDEField" : {
@@ -58,6 +64,7 @@
    },
    "width" : 100,
    "widthUnit" : "PX",
+    "enableLinkView" : true,
    "enableSort" : true
  }, {
    "align" : "LEFT",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/FILE/PSTREEGRIDICES/TestTreeGridExView_TreeGrid.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/FILE/PSTREEGRIDICES/TestTreeGridExView_TreeGrid.json
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/FILEGridView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/FILEGridView.json
@@ -227,6 +227,12 @@
      "columnType" : "DEFGRIDCOLUMN",
      "dataItemName" : "pfilename",
      "excelCaption" : "父项文件",
+      "getLinkPSAppView" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/FILERedirectView.json",
+        "viewType" : "DEREDIRECTVIEW"
+      },
+      "linkValueItem" : "pfileid",
      "name" : "pfilename",
      "noPrivDisplayMode" : 1,
      "getPSAppDEField" : {
@@ -235,6 +241,7 @@
      },
      "width" : 100,
      "widthUnit" : "PX",
+      "enableLinkView" : true,
      "enableSort" : true
    }, {
      "align" : "LEFT",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/FILERedirectView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/FILERedirectView.json
+{
+  "accUserMode" : 2,
+  "caption" : "文件",
+  "codeName" : "FILERedirectView",
+  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDEVIEWS/FILERedirectView.json",
+  "funcViewMode" : "REDIRECTVIEW",
+  "memo" : "系统自动添加",
+  "name" : "FILERedirectView",
+  "getPSAppDataEntity" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/FILE.json"
+  },
+  "getPSAppModule" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPMODULES/Test.json"
+  },
+  "getPSControls" : [ {
+    "caption" : "文件",
+    "codeName" : "RedirectViewcaptionbar",
+    "controlType" : "CAPTIONBAR",
+    "name" : "captionbar",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/FILE.json"
+    },
+    "getPSControlParam" : { }
+  } ],
+  "getPSDEViewCodeName" : "RedirectView",
+  "getPSDEViewId" : "020bdc4d021cb52314b84e50b92ae2a9",
+  "getPSViewLayoutPanel" : {
+    "codeName" : "Layoutpanel",
+    "controlStyle" : "APPDEREDIRECTVIEW",
+    "controlType" : "VIEWLAYOUTPANEL",
+    "name" : "layoutpanel",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/FILE.json"
+    },
+    "getPSControlParam" : { },
+    "layoutBodyOnly" : true,
+    "layoutPanel" : true,
+    "useDefaultLayout" : true
+  },
+  "getRedirectPSAppViewRefs" : [ {
+    "name" : "FILE:EDITVIEW",
+    "realTitle" : "文件编辑视图",
+    "getRefPSAppView" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/FILEEditView.json",
+      "viewType" : "DEEDITVIEW"
+    }
+  }, {
+    "name" : "EDITVIEW",
+    "realTitle" : "文件编辑视图",
+    "getRefPSAppView" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/FILEEditView.json",
+      "viewType" : "DEEDITVIEW"
+    }
+  } ],
+  "refFlag" : false,
+  "title" : "文件数据重定向视图",
+  "viewStyle" : "DEFAULT",
+  "viewType" : "DEREDIRECTVIEW",
+  "enableCustomGetDataAction" : false,
+  "enableDP" : true,
+  "enableWorkflow" : true,
+  "redirectView" : true,
+  "modelid" : "c97a5c5908b935bc8a4de3b09081aaa0",
+  "modeltype" : "PSAPPDEVIEW"
+}
\ No newline at end of file
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/FILETestTreeGridExView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/FILETestTreeGridExView.json
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.hubsubapp.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.hubsubapp.json
@@ -217,6 +217,148 @@
      "showIcon" : true
    } ],
    "uniqueTag" : "WORKITEM__Usr1214766333"
+  }, {
+    "codeName" : "Usr1204038815",
+    "name" : "树节点界面行为组",
+    "getPSUIActionGroupDetails" : [ {
+      "getCapPSLanguageRes" : {
+        "defaultContent" : "新建",
+        "lanResTag" : "TBB.TEXT.*.NEW",
+        "lanResType" : "TBB.TEXT",
+        "name" : "工具栏按钮文本[*.NEW]",
+        "refFlag" : true
+      },
+      "caption" : "新建",
+      "detailType" : "DEUIACTION",
+      "name" : "u1f9bc8c",
+      "getPSSysImage" : {
+        "glyph" : "xf0f6@FontAwesome",
+        "cssClass" : "fa fa-file-text-o"
+      },
+      "getPSUIAction" : {
+        "getCapPSLanguageRes" : {
+          "defaultContent" : "新建",
+          "lanResTag" : "TBB.TEXT.*.NEW",
+          "lanResType" : "TBB.TEXT",
+          "name" : "工具栏按钮文本[*.NEW]",
+          "refFlag" : true
+        },
+        "caption" : "新建",
+        "codeName" : "New",
+        "fullCodeName" : "New",
+        "name" : "表格界面_新建操作",
+        "getPSSysImage" : {
+          "glyph" : "xf0f6@FontAwesome",
+          "cssClass" : "fa fa-file-text-o"
+        },
+        "predefinedType" : "GRIDVIEW_NEWACTION",
+        "refreshMode" : 1,
+        "timeout" : 60000,
+        "getTooltipPSLanguageRes" : {
+          "defaultContent" : "新建",
+          "lanResTag" : "TBB.TOOLTIP.*.NEW",
+          "lanResType" : "TBB.TOOLTIP",
+          "name" : "工具栏按钮提示[*.NEW]",
+          "refFlag" : true
+        },
+        "uIActionMode" : "SYS",
+        "uIActionTag" : "New",
+        "uIActionType" : "DEUIACTION",
+        "reloadData" : true
+      },
+      "getTooltipPSLanguageRes" : {
+        "defaultContent" : "新建",
+        "lanResTag" : "TBB.TOOLTIP.*.NEW",
+        "lanResType" : "TBB.TOOLTIP",
+        "name" : "工具栏按钮提示[*.NEW]",
+        "refFlag" : true
+      },
+      "addSeparator" : false,
+      "showCaption" : true,
+      "showIcon" : true
+    }, {
+      "getCapPSLanguageRes" : {
+        "defaultContent" : "删除",
+        "lanResTag" : "TBB.TEXT.*.REMOVE",
+        "lanResType" : "TBB.TEXT",
+        "name" : "工具栏按钮文本[*.REMOVE]",
+        "refFlag" : true
+      },
+      "caption" : "删除",
+      "detailType" : "DEUIACTION",
+      "name" : "u4f3fd82",
+      "getPSSysImage" : {
+        "glyph" : "xf00d@FontAwesome",
+        "cssClass" : "fa fa-remove"
+      },
+      "getPSUIAction" : {
+        "actionTarget" : "MULTIKEY",
+        "getCapPSLanguageRes" : {
+          "defaultContent" : "删除",
+          "lanResTag" : "TBB.TEXT.*.REMOVE",
+          "lanResType" : "TBB.TEXT",
+          "name" : "工具栏按钮文本[*.REMOVE]",
+          "refFlag" : true
+        },
+        "caption" : "删除",
+        "codeName" : "Remove",
+        "fullCodeName" : "Remove",
+        "name" : "表格界面_删除操作",
+        "getPSSysImage" : {
+          "glyph" : "xf00d@FontAwesome",
+          "cssClass" : "fa fa-remove"
+        },
+        "predefinedType" : "GRIDVIEW_REMOVEACTION",
+        "timeout" : 60000,
+        "getTooltipPSLanguageRes" : {
+          "defaultContent" : "删除",
+          "lanResTag" : "TBB.TOOLTIP.*.REMOVE",
+          "lanResType" : "TBB.TOOLTIP",
+          "name" : "工具栏按钮提示[*.REMOVE]",
+          "refFlag" : true
+        },
+        "uIActionMode" : "SYS",
+        "uIActionTag" : "Remove",
+        "uIActionType" : "DEUIACTION"
+      },
+      "getTooltipPSLanguageRes" : {
+        "defaultContent" : "删除",
+        "lanResTag" : "TBB.TOOLTIP.*.REMOVE",
+        "lanResType" : "TBB.TOOLTIP",
+        "name" : "工具栏按钮提示[*.REMOVE]",
+        "refFlag" : true
+      },
+      "addSeparator" : false,
+      "showCaption" : true,
+      "showIcon" : true
+    }, {
+      "caption" : "保存行",
+      "detailType" : "DEUIACTION",
+      "name" : "u8fa4302",
+      "getPSSysImage" : {
+        "glyph" : "xf0c7@FontAwesome",
+        "cssClass" : "fa fa-save"
+      },
+      "getPSUIAction" : {
+        "caption" : "保存行",
+        "codeName" : "SaveRow",
+        "fullCodeName" : "SaveRow",
+        "name" : "表格界面_保存行",
+        "getPSSysImage" : {
+          "glyph" : "xf0c7@FontAwesome",
+          "cssClass" : "fa fa-save"
+        },
+        "predefinedType" : "GRIDVIEW_SAVEROWACTION",
+        "timeout" : 60000,
+        "uIActionMode" : "SYS",
+        "uIActionTag" : "SaveRow",
+        "uIActionType" : "DEUIACTION"
+      },
+      "addSeparator" : false,
+      "showCaption" : true,
+      "showIcon" : true
+    } ],
+    "uniqueTag" : "FILE__Usr1204038815"
  }, {
    "codeName" : "Usr1218345969",
    "name" : "界面行为组",

--- 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
@@ -12191,22 +12191,22 @@
    "codeName" : "VMGroup3",
    "name" : "视图消息类型测试",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-错误信息",
+      "name" : "消息类型-常规信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg6"
+        "id" : "ViewMsg4"
      }
    }, {
-      "name" : "消息类型-警告信息",
+      "name" : "消息类型-错误信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg5"
+        "id" : "ViewMsg6"
      }
    }, {
-      "name" : "消息类型-常规信息",
+      "name" : "消息类型-警告信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg4"
+        "id" : "ViewMsg5"
      }
    } ]
  }, {
@@ -12223,12 +12223,6 @@
    "codeName" : "VMGroup4",
    "name" : "视图消息位置测试",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息位置-视图下方",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg8"
-      }
-    }, {
      "name" : "消息位置-弹出",
      "getPSAppViewMsg" : {
        "modelref" : true,
@@ -12246,29 +12240,17 @@
        "modelref" : true,
        "id" : "ViewMsg7"
      }
+    }, {
+      "name" : "消息位置-视图下方",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg8"
+      }
    } ]
  }, {
    "codeName" : "VMGroup8",
    "name" : "【静态测试】",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-默认删除-上方-错误",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg12"
-      }
-    }, {
-      "name" : "消息位置-视图内容区",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg9"
-      }
-    }, {
-      "name" : "关闭模式-本次删除-上方-警告",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg13"
-      }
-    }, {
      "name" : "消息类型-错误信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
@@ -12281,12 +12263,6 @@
        "modelref" : true,
        "id" : "ViewMsg8"
      }
-    }, {
-      "name" : "关闭模式-无删除-上方-常规",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg11"
-      }
    }, {
      "name" : "消息类型-常规信息",
      "getPSAppViewMsg" : {
@@ -12294,6 +12270,12 @@
        "id" : "ViewMsg4"
      },
      "position" : "POPUP"
+    }, {
+      "name" : "关闭模式-无删除-上方-常规",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg11"
+      }
    }, {
      "name" : "消息类型-警告信息",
      "getPSAppViewMsg" : {
@@ -12301,17 +12283,29 @@
        "id" : "ViewMsg5"
      },
      "position" : "POPUP"
+    }, {
+      "name" : "消息位置-视图内容区",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg9"
+      }
+    }, {
+      "name" : "关闭模式-默认删除-上方-错误",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg12"
+      }
+    }, {
+      "name" : "关闭模式-本次删除-上方-警告",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg13"
+      }
    } ]
  }, {
    "codeName" : "VMGroup5",
    "name" : "视图消息关闭模式",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-本次删除",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg13"
-      }
-    }, {
      "name" : "关闭模式-无删除",
      "getPSAppViewMsg" : {
        "modelref" : true,
@@ -12323,6 +12317,12 @@
        "modelref" : true,
        "id" : "ViewMsg12"
      }
+    }, {
+      "name" : "关闭模式-本次删除",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg13"
+      }
    } ]
  }, {
    "codeName" : "VMGroup6",
@@ -13326,6 +13326,12 @@
    "viewType" : "DEDATAVIEW",
    "resource" : "Book",
    "view" : "DefaultDataView"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/FILETestTreeGridExView.json",
+    "viewType" : "DETREEGRIDEXVIEW",
+    "resource" : "FILE",
+    "view" : "TestTreeGridExView"
  }, {
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr2RedirectView.json",
@@ -14559,6 +14565,12 @@
    "viewType" : "DEMEDITVIEW9",
    "resource" : "Phone",
    "view" : "MEditView9"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/FILERedirectView.json",
+    "viewType" : "DEREDIRECTVIEW",
+    "resource" : "FILE",
+    "view" : "RedirectView"
  }, {
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoUsr2DataView.json",
@@ -66385,6 +66397,10 @@
        "modelref" : true,
        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/FILEFileExpView.json",
        "viewType" : "DETREEEXPVIEW"
+      }, {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/FILETestTreeGridExView.json",
+        "viewType" : "DETREEGRIDEXVIEW"
      }, {
        "modelref" : true,
        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/FILEEditView.json",
@@ -66397,6 +66413,10 @@
        "modelref" : true,
        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/FILEUsr12064666TreeView.json",
        "viewType" : "DETREEVIEW"
+      }, {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/FILERedirectView.json",
+        "viewType" : "DEREDIRECTVIEW"
      }, {
        "modelref" : true,
        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/FILEGridView.json",