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

1c4a79fc · ibizdev · f8dea56f · 1c4a79fc · 1c4a79fc · 1c4a79fc
--- 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
@@ -1432,16 +1432,16 @@
    "codeName" : "VMGroup2",
    "name" : "视图消息组2",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息",
+      "name" : "视图消息2",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
      }
    }, {
-      "name" : "视图消息2",
+      "name" : "视图消息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
      }
    } ]
  }, {

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSFORMS/Main_4.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSFORMS/Main_4.json
@@ -219,6 +219,12 @@
      "name" : "FIELD5",
      "codeName" : "Field5"
    }
+  }, {
+    "id" : "formitem11",
+    "dataType" : 25
+  }, {
+    "id" : "formitem12",
+    "dataType" : 25
  }, {
    "id" : "bookid",
    "hidden" : true,
@@ -1115,6 +1121,93 @@
      "allowEmpty" : true,
      "needCodeListConfig" : true,
      "showCaption" : true
+    }, {
+      "caption" : "YYYY-MM-DD",
+      "codeName" : "formitem11",
+      "dataType" : 25,
+      "detailStyle" : "DEFAULT",
+      "detailType" : "FORMITEM",
+      "enableCond" : 3,
+      "ignoreInput" : 0,
+      "itemWidth" : 230.0,
+      "labelPos" : "LEFT",
+      "labelWidth" : 130,
+      "name" : "formitem11",
+      "noPrivDisplayMode" : 1,
+      "getPSEditor" : {
+        "dateTimeFormat" : "YYYY-MM-DD",
+        "editorParams" : {
+          "TIMEFMT" : "YYYY-MM-DD"
+        },
+        "editorType" : "DATEPICKEREX_NOTIME",
+        "editorWidth" : 100.0,
+        "name" : "formitem11"
+      },
+      "getPSLayoutPos" : {
+        "colMD" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "allowEmpty" : true,
+      "showCaption" : true
+    }, {
+      "caption" : "数据选择(下拉，数据链接)",
+      "codeName" : "formitem12",
+      "dataType" : 25,
+      "detailStyle" : "DEFAULT",
+      "detailType" : "FORMITEM",
+      "enableCond" : 3,
+      "ignoreInput" : 0,
+      "labelPos" : "LEFT",
+      "labelWidth" : 130,
+      "name" : "formitem12",
+      "noPrivDisplayMode" : 1,
+      "getPSEditor" : {
+        "editorParams" : {
+          "OBJECTNAMEFIELD" : "bookname",
+          "OBJECTVALUEFIELD" : "test",
+          "LINKVIEW" : "TRUE",
+          "AC" : "TRUE",
+          "TRIGGER" : "TRUE",
+          "OBJECTIDFIELD" : "bookid",
+          "VALUETYPE" : "OBJECT",
+          "PICKUPVIEW" : "FALSE"
+        },
+        "editorType" : "PICKEREX_TRIGGER_LINK",
+        "name" : "formitem12",
+        "objectIdField" : "bookid",
+        "objectNameField" : "bookname",
+        "objectValueField" : "test",
+        "getPSAppDEACMode" : {
+          "modelref" : true,
+          "id" : "Default"
+        },
+        "getPSAppDEDataSet" : {
+          "modelref" : true,
+          "id" : "FetchDefault"
+        },
+        "getPSAppDataEntity" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BookType.json"
+        },
+        "getPSEditorItems" : [ {
+          "name" : "field"
+        } ],
+        "valueItemName" : "field",
+        "valueType" : "OBJECT",
+        "enableAC" : true,
+        "enableLinkView" : true,
+        "enablePickupView" : false,
+        "forceSelection" : true,
+        "showTrigger" : true,
+        "singleSelect" : true
+      },
+      "getPSLayoutPos" : {
+        "colMD" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "valueItemName" : "field",
+      "allowEmpty" : true,
+      "showCaption" : true
    } ],
    "getPSLayout" : {
      "childColLG" : -1,

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTTestMEditView9.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTTestMEditView9.json
@@ -249,6 +249,69 @@
    "getPSControlParam" : {
      "id" : "TOOLBAR"
    },
+    "getPSDEToolbarItems" : [ {
+      "getCapPSLanguageRes" : {
+        "defaultContent" : "新建",
+        "lanResTag" : "TBB.TEXT.*.NEW",
+        "lanResType" : "TBB.TEXT",
+        "name" : "工具栏按钮文本[*.NEW]",
+        "refFlag" : true
+      },
+      "caption" : "新建",
+      "groupExtractMode" : "ITEM",
+      "itemType" : "DEUIACTION",
+      "name" : "deuiaction1",
+      "noPrivDisplayMode" : 2,
+      "getPSAppViewUIAction" : {
+        "modelref" : true,
+        "id" : "toolbar_deuiaction1"
+      },
+      "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
+      },
+      "tooltip" : "新建",
+      "getTooltipPSLanguageRes" : {
+        "defaultContent" : "新建",
+        "lanResTag" : "TBB.TOOLTIP.*.NEW",
+        "lanResType" : "TBB.TOOLTIP",
+        "name" : "工具栏按钮提示[*.NEW]",
+        "refFlag" : true
+      },
+      "showCaption" : true,
+      "showIcon" : true
+    } ],
    "modelid" : "38FCDC1B-DC14-4D2A-BC77-4C23C79F64B8",
    "modeltype" : "PSDETOOLBAR"
  }, {

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr10EditView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr10EditView.json
@@ -35,6 +35,69 @@
    "getPSControlParam" : {
      "id" : "TOOLBAR"
    },
+    "getPSDEToolbarItems" : [ {
+      "getCapPSLanguageRes" : {
+        "defaultContent" : "新建",
+        "lanResTag" : "TBB.TEXT.*.NEW",
+        "lanResType" : "TBB.TEXT",
+        "name" : "工具栏按钮文本[*.NEW]",
+        "refFlag" : true
+      },
+      "caption" : "新建",
+      "groupExtractMode" : "ITEM",
+      "itemType" : "DEUIACTION",
+      "name" : "deuiaction1",
+      "noPrivDisplayMode" : 2,
+      "getPSAppViewUIAction" : {
+        "modelref" : true,
+        "id" : "toolbar_deuiaction1"
+      },
+      "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
+      },
+      "tooltip" : "新建",
+      "getTooltipPSLanguageRes" : {
+        "defaultContent" : "新建",
+        "lanResTag" : "TBB.TOOLTIP.*.NEW",
+        "lanResType" : "TBB.TOOLTIP",
+        "name" : "工具栏按钮提示[*.NEW]",
+        "refFlag" : true
+      },
+      "showCaption" : true,
+      "showIcon" : true
+    } ],
    "xDataControlName" : "form",
    "modelid" : "38FCDC1B-DC14-4D2A-BC77-4C23C79F64B8",
    "modeltype" : "PSDETOOLBAR"

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr10EditView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr10EditView.json
@@ -336,6 +336,12 @@
        "name" : "FIELD5",
        "codeName" : "Field5"
      }
+    }, {
+      "id" : "formitem11",
+      "dataType" : 25
+    }, {
+      "id" : "formitem12",
+      "dataType" : 25
    }, {
      "id" : "bookid",
      "hidden" : true,
@@ -1232,6 +1238,93 @@
        "allowEmpty" : true,
        "needCodeListConfig" : true,
        "showCaption" : true
+      }, {
+        "caption" : "YYYY-MM-DD",
+        "codeName" : "formitem11",
+        "dataType" : 25,
+        "detailStyle" : "DEFAULT",
+        "detailType" : "FORMITEM",
+        "enableCond" : 3,
+        "ignoreInput" : 0,
+        "itemWidth" : 230.0,
+        "labelPos" : "LEFT",
+        "labelWidth" : 130,
+        "name" : "formitem11",
+        "noPrivDisplayMode" : 1,
+        "getPSEditor" : {
+          "dateTimeFormat" : "YYYY-MM-DD",
+          "editorParams" : {
+            "TIMEFMT" : "YYYY-MM-DD"
+          },
+          "editorType" : "DATEPICKEREX_NOTIME",
+          "editorWidth" : 100.0,
+          "name" : "formitem11"
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "allowEmpty" : true,
+        "showCaption" : true
+      }, {
+        "caption" : "数据选择(下拉，数据链接)",
+        "codeName" : "formitem12",
+        "dataType" : 25,
+        "detailStyle" : "DEFAULT",
+        "detailType" : "FORMITEM",
+        "enableCond" : 3,
+        "ignoreInput" : 0,
+        "labelPos" : "LEFT",
+        "labelWidth" : 130,
+        "name" : "formitem12",
+        "noPrivDisplayMode" : 1,
+        "getPSEditor" : {
+          "editorParams" : {
+            "OBJECTNAMEFIELD" : "bookname",
+            "OBJECTVALUEFIELD" : "test",
+            "LINKVIEW" : "TRUE",
+            "AC" : "TRUE",
+            "TRIGGER" : "TRUE",
+            "OBJECTIDFIELD" : "bookid",
+            "VALUETYPE" : "OBJECT",
+            "PICKUPVIEW" : "FALSE"
+          },
+          "editorType" : "PICKEREX_TRIGGER_LINK",
+          "name" : "formitem12",
+          "objectIdField" : "bookid",
+          "objectNameField" : "bookname",
+          "objectValueField" : "test",
+          "getPSAppDEACMode" : {
+            "modelref" : true,
+            "id" : "Default"
+          },
+          "getPSAppDEDataSet" : {
+            "modelref" : true,
+            "id" : "FetchDefault"
+          },
+          "getPSAppDataEntity" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BookType.json"
+          },
+          "getPSEditorItems" : [ {
+            "name" : "field"
+          } ],
+          "valueItemName" : "field",
+          "valueType" : "OBJECT",
+          "enableAC" : true,
+          "enableLinkView" : true,
+          "enablePickupView" : false,
+          "forceSelection" : true,
+          "showTrigger" : true,
+          "singleSelect" : true
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "valueItemName" : "field",
+        "allowEmpty" : true,
+        "showCaption" : true
      } ],
      "getPSLayout" : {
        "childColLG" : -1,

--- 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
@@ -9725,16 +9725,16 @@
    "codeName" : "VMGroup2",
    "name" : "视图消息组2",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息",
+      "name" : "视图消息2",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
      }
    }, {
-      "name" : "视图消息2",
+      "name" : "视图消息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
      }
    } ]
  }, {
@@ -9763,16 +9763,16 @@
    "codeName" : "VMGroup3",
    "name" : "视图消息类型测试",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-警告信息",
+      "name" : "消息类型-错误信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg5"
+        "id" : "ViewMsg6"
      }
    }, {
-      "name" : "消息类型-错误信息",
+      "name" : "消息类型-警告信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg6"
+        "id" : "ViewMsg5"
      }
    }, {
      "name" : "消息类型-常规信息",
@@ -9801,16 +9801,16 @@
        "id" : "ViewMsg7"
      }
    }, {
-      "name" : "消息位置-视图下方",
+      "name" : "消息位置-弹出",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg10"
      }
    }, {
-      "name" : "消息位置-弹出",
+      "name" : "消息位置-视图下方",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg10"
+        "id" : "ViewMsg8"
      }
    }, {
      "name" : "消息位置-视图内容区",
@@ -9823,16 +9823,16 @@
    "codeName" : "VMGroup8",
    "name" : "【静态测试】",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息位置-视图内容区",
+      "name" : "消息位置-视图下方",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg9"
+        "id" : "ViewMsg8"
      }
    }, {
-      "name" : "关闭模式-默认删除-上方-错误",
+      "name" : "关闭模式-本次删除-上方-警告",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg12"
+        "id" : "ViewMsg13"
      }
    }, {
      "name" : "消息类型-警告信息",
@@ -9841,12 +9841,6 @@
        "id" : "ViewMsg5"
      },
      "position" : "POPUP"
-    }, {
-      "name" : "关闭模式-本次删除-上方-警告",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg13"
-      }
    }, {
      "name" : "消息类型-错误信息",
      "getPSAppViewMsg" : {
@@ -9855,10 +9849,10 @@
      },
      "position" : "POPUP"
    }, {
-      "name" : "消息位置-视图下方",
+      "name" : "关闭模式-无删除-上方-常规",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg11"
      }
    }, {
      "name" : "消息类型-常规信息",
@@ -9868,20 +9862,26 @@
      },
      "position" : "POPUP"
    }, {
-      "name" : "关闭模式-无删除-上方-常规",
+      "name" : "关闭模式-默认删除-上方-错误",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg12"
+      }
+    }, {
+      "name" : "消息位置-视图内容区",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg9"
      }
    } ]
  }, {
    "codeName" : "VMGroup5",
    "name" : "视图消息关闭模式",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-本次删除",
+      "name" : "关闭模式-默认删除",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg13"
+        "id" : "ViewMsg12"
      }
    }, {
      "name" : "关闭模式-无删除",
@@ -9890,10 +9890,10 @@
        "id" : "ViewMsg11"
      }
    }, {
-      "name" : "关闭模式-默认删除",
+      "name" : "关闭模式-本次删除",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg12"
+        "id" : "ViewMsg13"
      }
    } ]
  }, {