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

ea44b99f · ibizdev · 81fd616d · ea44b99f · ea44b99f · ea44b99f
--- 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
@@ -3671,6 +3671,20 @@
    "builtinMethod" : false
  } ],
  "getAllPSAppDEUIActions" : [ {
+    "caption" : "表格新建（自定义）",
+    "codeName" : "CustomGridNew",
+    "fullCodeName" : "CustomGridNew",
+    "name" : "表格新建（自定义）",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
+    },
+    "predefinedType" : "GRIDVIEW_NEWACTION",
+    "timeout" : 60000,
+    "uIActionMode" : "SYS",
+    "uIActionTag" : "CustomGridNew",
+    "uIActionType" : "DEUIACTION"
+  }, {
    "actionTarget" : "SINGLEDATA",
    "caption" : "DE属性脚本",
    "codeName" : "DELogicFieldScript",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTDataViewExpView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTDataViewExpView.json
@@ -332,7 +332,7 @@
    }, {
      "codeName" : "DataViewExpViewdataviewexpbar_toolbar",
      "controlType" : "TOOLBAR",
-      "logicName" : "工具栏模板（默认表格界面）",
+      "logicName" : "卡片导航工具栏",
      "name" : "dataviewexpbar_toolbar",
      "getPSAppDataEntity" : {
        "modelref" : true,
@@ -349,14 +349,14 @@
          "name" : "工具栏按钮文本[*.NEW]",
          "refFlag" : true
        },
-        "caption" : "新建",
+        "caption" : "原生表格新建",
        "groupExtractMode" : "ITEM",
        "itemType" : "DEUIACTION",
-        "name" : "tbitem3",
+        "name" : "deuiaction1",
        "noPrivDisplayMode" : 2,
        "getPSAppViewUIAction" : {
          "modelref" : true,
-          "id" : "dataviewexpbar_toolbar_tbitem3"
+          "id" : "dataviewexpbar_toolbar_deuiaction1"
        },
        "getPSSysImage" : {
          "glyph" : "xf0f6@FontAwesome",
@@ -393,7 +393,7 @@
          "uIActionType" : "DEUIACTION",
          "reloadData" : true
        },
-        "tooltip" : "新建",
+        "tooltip" : "原生表格新建",
        "getTooltipPSLanguageRes" : {
          "defaultContent" : "新建",
          "lanResTag" : "TBB.TOOLTIP.*.NEW",
@@ -404,317 +404,35 @@
        "showCaption" : true,
        "showIcon" : true
      }, {
-        "getCapPSLanguageRes" : {
-          "defaultContent" : "编辑",
-          "lanResTag" : "TBB.TEXT.*.EDIT",
-          "lanResType" : "TBB.TEXT",
-          "name" : "工具栏按钮文本[*.EDIT]",
-          "refFlag" : true
-        },
-        "caption" : "编辑",
-        "groupExtractMode" : "ITEM",
-        "itemType" : "DEUIACTION",
-        "name" : "tbitem4",
-        "noPrivDisplayMode" : 2,
-        "getPSAppViewUIAction" : {
-          "modelref" : true,
-          "id" : "dataviewexpbar_toolbar_tbitem4"
-        },
-        "getPSSysImage" : {
-          "glyph" : "xf044@FontAwesome",
-          "cssClass" : "fa fa-edit"
-        },
-        "getPSUIAction" : {
-          "actionTarget" : "SINGLEKEY",
-          "getCapPSLanguageRes" : {
-            "defaultContent" : "编辑",
-            "lanResTag" : "TBB.TEXT.*.EDIT",
-            "lanResType" : "TBB.TEXT",
-            "name" : "工具栏按钮文本[*.EDIT]",
-            "refFlag" : true
-          },
-          "caption" : "编辑",
-          "codeName" : "Edit",
-          "fullCodeName" : "Edit",
-          "name" : "表格界面_编辑操作",
-          "getPSSysImage" : {
-            "glyph" : "xf044@FontAwesome",
-            "cssClass" : "fa fa-edit"
-          },
-          "predefinedType" : "GRIDVIEW_EDITACTION",
-          "timeout" : 60000,
-          "getTooltipPSLanguageRes" : {
-            "defaultContent" : "编辑",
-            "lanResTag" : "TBB.TOOLTIP.*.EDIT",
-            "lanResType" : "TBB.TOOLTIP",
-            "name" : "工具栏按钮提示[*.EDIT]",
-            "refFlag" : true
-          },
-          "uIActionMode" : "SYS",
-          "uIActionTag" : "Edit",
-          "uIActionType" : "DEUIACTION"
-        },
-        "tooltip" : "编辑",
-        "getTooltipPSLanguageRes" : {
-          "defaultContent" : "编辑",
-          "lanResTag" : "TBB.TOOLTIP.*.EDIT",
-          "lanResType" : "TBB.TOOLTIP",
-          "name" : "工具栏按钮提示[*.EDIT]",
-          "refFlag" : true
-        },
-        "uIActionTarget" : "SINGLEKEY",
-        "showCaption" : true,
-        "showIcon" : true
-      }, {
-        "getCapPSLanguageRes" : {
-          "defaultContent" : "拷贝",
-          "lanResTag" : "TBB.TEXT.*.COPY",
-          "lanResType" : "TBB.TEXT",
-          "name" : "工具栏按钮文本[*.COPY]",
-          "refFlag" : true
-        },
-        "caption" : "拷贝",
-        "groupExtractMode" : "ITEM",
-        "itemType" : "DEUIACTION",
-        "name" : "tbitem6",
-        "noPrivDisplayMode" : 2,
-        "getPSAppViewUIAction" : {
-          "modelref" : true,
-          "id" : "dataviewexpbar_toolbar_tbitem6"
-        },
-        "getPSSysImage" : {
-          "glyph" : "xf0c5@FontAwesome",
-          "cssClass" : "fa fa-copy"
-        },
-        "getPSUIAction" : {
-          "actionTarget" : "SINGLEKEY",
-          "getCapPSLanguageRes" : {
-            "defaultContent" : "拷贝",
-            "lanResTag" : "TBB.TEXT.*.COPY",
-            "lanResType" : "TBB.TEXT",
-            "name" : "工具栏按钮文本[*.COPY]",
-            "refFlag" : true
-          },
-          "caption" : "拷贝",
-          "codeName" : "Copy",
-          "fullCodeName" : "Copy",
-          "name" : "表格界面_拷贝操作",
-          "getPSSysImage" : {
-            "glyph" : "xf0c5@FontAwesome",
-            "cssClass" : "fa fa-copy"
-          },
-          "predefinedType" : "GRIDVIEW_COPYACTION",
-          "timeout" : 60000,
-          "getTooltipPSLanguageRes" : {
-            "defaultContent" : "拷贝",
-            "lanResTag" : "TBB.TOOLTIP.*.COPY",
-            "lanResType" : "TBB.TOOLTIP",
-            "name" : "工具栏按钮提示[*.COPY]",
-            "refFlag" : true
-          },
-          "uIActionMode" : "SYS",
-          "uIActionTag" : "Copy",
-          "uIActionType" : "DEUIACTION"
-        },
-        "tooltip" : "拷贝",
-        "getTooltipPSLanguageRes" : {
-          "defaultContent" : "拷贝",
-          "lanResTag" : "TBB.TOOLTIP.*.COPY",
-          "lanResType" : "TBB.TOOLTIP",
-          "name" : "工具栏按钮提示[*.COPY]",
-          "refFlag" : true
-        },
-        "uIActionTarget" : "SINGLEKEY",
-        "showCaption" : true,
-        "showIcon" : true
-      }, {
-        "itemType" : "SEPERATOR",
-        "name" : "tbitem7",
-        "spanMode" : false
-      }, {
-        "getCapPSLanguageRes" : {
-          "defaultContent" : "删除",
-          "lanResTag" : "TBB.TEXT.*.REMOVE",
-          "lanResType" : "TBB.TEXT",
-          "name" : "工具栏按钮文本[*.REMOVE]",
-          "refFlag" : true
-        },
-        "caption" : "删除",
+        "caption" : "表格新建（自定义）",
        "groupExtractMode" : "ITEM",
        "itemType" : "DEUIACTION",
-        "name" : "tbitem8",
+        "name" : "deuiaction2",
        "noPrivDisplayMode" : 2,
        "getPSAppViewUIAction" : {
          "modelref" : true,
-          "id" : "dataviewexpbar_toolbar_tbitem8"
-        },
-        "getPSSysImage" : {
-          "glyph" : "xf00d@FontAwesome",
-          "cssClass" : "fa fa-remove"
+          "id" : "dataviewexpbar_toolbar_deuiaction2"
        },
        "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"
-        },
-        "tooltip" : "删除",
-        "getTooltipPSLanguageRes" : {
-          "defaultContent" : "删除",
-          "lanResTag" : "TBB.TOOLTIP.*.REMOVE",
-          "lanResType" : "TBB.TOOLTIP",
-          "name" : "工具栏按钮提示[*.REMOVE]",
-          "refFlag" : true
-        },
-        "uIActionTarget" : "MULTIKEY",
-        "showCaption" : true,
-        "showIcon" : true
-      }, {
-        "itemType" : "SEPERATOR",
-        "name" : "tbitem9",
-        "spanMode" : false
-      }, {
-        "caption" : "其它",
-        "itemType" : "ITEMS",
-        "name" : "tbitem16",
-        "getPSDEToolbarItems" : [ {
-          "getCapPSLanguageRes" : {
-            "lanResTag" : "MENUITEM.CAPTION.*.EXPORTSRF",
-            "lanResType" : "MENUITEM.CAPTION",
-            "name" : "菜单项文本[*.EXPORTSRF]",
-            "refFlag" : true
-          },
-          "caption" : "导出数据模型test",
-          "groupExtractMode" : "ITEM",
-          "itemType" : "DEUIACTION",
-          "name" : "tbitem21",
-          "noPrivDisplayMode" : 2,
-          "getPSAppViewUIAction" : {
+          "caption" : "表格新建（自定义）",
+          "codeName" : "CustomGridNew",
+          "fullCodeName" : "CustomGridNew",
+          "name" : "表格新建（自定义）",
+          "getPSAppDataEntity" : {
            "modelref" : true,
-            "id" : "dataviewexpbar_toolbar_tbitem21"
-          },
-          "getPSSysImage" : {
-            "glyph" : "xf019@FontAwesome",
-            "cssClass" : "fa fa-download"
-          },
-          "getPSUIAction" : {
-            "getCapPSLanguageRes" : {
-              "lanResTag" : "MENUITEM.CAPTION.*.EXPORTSRF",
-              "lanResType" : "MENUITEM.CAPTION",
-              "name" : "菜单项文本[*.EXPORTSRF]",
-              "refFlag" : true
-            },
-            "caption" : "导出数据模型",
-            "codeName" : "ExportModel",
-            "fullCodeName" : "ExportModel",
-            "name" : "表格界面_导出数据模型",
-            "getPSSysImage" : {
-              "glyph" : "xf019@FontAwesome",
-              "cssClass" : "fa fa-download"
-            },
-            "predefinedType" : "GRIDVIEW_EXPORTXMLACTION",
-            "timeout" : 60000,
-            "uIActionMode" : "SYS",
-            "uIActionTag" : "ExportModel",
-            "uIActionType" : "DEUIACTION"
-          },
-          "tooltip" : "导出数据模型test",
-          "showCaption" : true,
-          "showIcon" : true
-        } ],
-        "tooltip" : "其它",
-        "showCaption" : true,
-        "showIcon" : true
-      }, {
-        "itemType" : "SEPERATOR",
-        "name" : "tbitem17",
-        "spanMode" : false
-      }, {
-        "getCapPSLanguageRes" : {
-          "defaultContent" : "帮助",
-          "lanResTag" : "TBB.TEXT.*.HELP",
-          "lanResType" : "TBB.TEXT",
-          "name" : "工具栏按钮文本[*.HELP]",
-          "refFlag" : true
-        },
-        "caption" : "帮助",
-        "groupExtractMode" : "ITEM",
-        "itemType" : "DEUIACTION",
-        "name" : "tbitem18",
-        "noPrivDisplayMode" : 2,
-        "getPSAppViewUIAction" : {
-          "modelref" : true,
-          "id" : "dataviewexpbar_toolbar_tbitem18"
-        },
-        "getPSSysImage" : {
-          "glyph" : "xf128@FontAwesome",
-          "cssClass" : "fa fa-question"
-        },
-        "getPSUIAction" : {
-          "getCapPSLanguageRes" : {
-            "defaultContent" : "帮助",
-            "lanResTag" : "TBB.TEXT.*.HELP",
-            "lanResType" : "TBB.TEXT",
-            "name" : "工具栏按钮文本[*.HELP]",
-            "refFlag" : true
-          },
-          "caption" : "帮助",
-          "codeName" : "Help",
-          "fullCodeName" : "Help",
-          "name" : "表格界面_帮助操作",
-          "getPSSysImage" : {
-            "glyph" : "xf128@FontAwesome",
-            "cssClass" : "fa fa-question"
+            "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
          },
-          "predefinedType" : "GRIDVIEW_HELPACTION",
+          "predefinedType" : "GRIDVIEW_NEWACTION",
          "timeout" : 60000,
-          "getTooltipPSLanguageRes" : {
-            "defaultContent" : "帮助",
-            "lanResTag" : "TBB.TOOLTIP.*.HELP",
-            "lanResType" : "TBB.TOOLTIP",
-            "name" : "工具栏按钮提示[*.HELP]",
-            "refFlag" : true
-          },
          "uIActionMode" : "SYS",
-          "uIActionTag" : "Help",
+          "uIActionTag" : "CustomGridNew",
          "uIActionType" : "DEUIACTION"
        },
-        "tooltip" : "帮助",
-        "getTooltipPSLanguageRes" : {
-          "defaultContent" : "帮助",
-          "lanResTag" : "TBB.TOOLTIP.*.HELP",
-          "lanResType" : "TBB.TOOLTIP",
-          "name" : "工具栏按钮提示[*.HELP]",
-          "refFlag" : true
-        },
+        "tooltip" : "表格新建（自定义）",
        "showCaption" : true,
        "showIcon" : true
      } ],
-      "modelid" : "b912ff540f5614f63914a38067d84728",
+      "modelid" : "E6AA8F1C-B58B-4942-8FED-3A822FF8FC99",
      "modeltype" : "PSDETOOLBAR"
    } ],
    "title" : "标题",

--- 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
@@ -11925,10 +11925,10 @@
    "codeName" : "VMGroup3",
    "name" : "视图消息类型测试",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-常规信息",
+      "name" : "消息类型-错误信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg4"
+        "id" : "ViewMsg6"
      }
    }, {
      "name" : "消息类型-警告信息",
@@ -11937,10 +11937,10 @@
        "id" : "ViewMsg5"
      }
    }, {
-      "name" : "消息类型-错误信息",
+      "name" : "消息类型-常规信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg6"
+        "id" : "ViewMsg4"
      }
    } ]
  }, {
@@ -11957,16 +11957,16 @@
    "codeName" : "VMGroup4",
    "name" : "视图消息位置测试",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息位置-弹出",
+      "name" : "消息位置-视图下方",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg10"
+        "id" : "ViewMsg8"
      }
    }, {
-      "name" : "消息位置-视图下方",
+      "name" : "消息位置-弹出",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg10"
      }
    }, {
      "name" : "消息位置-视图内容区",
@@ -11985,18 +11985,18 @@
    "codeName" : "VMGroup8",
    "name" : "【静态测试】",
    "getPSAppViewMsgGroupDetails" : [ {
+      "name" : "关闭模式-本次删除-上方-警告",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg13"
+      }
+    }, {
      "name" : "消息类型-错误信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
        "id" : "ViewMsg6"
      },
      "position" : "POPUP"
-    }, {
-      "name" : "关闭模式-无删除-上方-常规",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg11"
-      }
    }, {
      "name" : "消息类型-常规信息",
      "getPSAppViewMsg" : {
@@ -12005,28 +12005,28 @@
      },
      "position" : "POPUP"
    }, {
-      "name" : "消息位置-视图内容区",
+      "name" : "关闭模式-无删除-上方-常规",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg9"
+        "id" : "ViewMsg11"
      }
    }, {
-      "name" : "关闭模式-默认删除-上方-错误",
+      "name" : "消息位置-视图下方",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg12"
+        "id" : "ViewMsg8"
      }
    }, {
-      "name" : "消息位置-视图下方",
+      "name" : "消息位置-视图内容区",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg9"
      }
    }, {
-      "name" : "关闭模式-本次删除-上方-警告",
+      "name" : "关闭模式-默认删除-上方-错误",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg13"
+        "id" : "ViewMsg12"
      }
    }, {
      "name" : "消息类型-警告信息",
@@ -12040,16 +12040,16 @@
    "codeName" : "VMGroup5",
    "name" : "视图消息关闭模式",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-默认删除",
+      "name" : "关闭模式-无删除",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg12"
+        "id" : "ViewMsg11"
      }
    }, {
-      "name" : "关闭模式-无删除",
+      "name" : "关闭模式-默认删除",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg12"
      }
    }, {
      "name" : "关闭模式-本次删除",
@@ -53537,6 +53537,20 @@
        "builtinMethod" : false
      } ],
      "getAllPSAppDEUIActions" : [ {
+        "caption" : "表格新建（自定义）",
+        "codeName" : "CustomGridNew",
+        "fullCodeName" : "CustomGridNew",
+        "name" : "表格新建（自定义）",
+        "getPSAppDataEntity" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
+        },
+        "predefinedType" : "GRIDVIEW_NEWACTION",
+        "timeout" : 60000,
+        "uIActionMode" : "SYS",
+        "uIActionTag" : "CustomGridNew",
+        "uIActionType" : "DEUIACTION"
+      }, {
        "actionTarget" : "SINGLEDATA",
        "caption" : "DE属性脚本",
        "codeName" : "DELogicFieldScript",