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

06a481ba · ibizdev · 0738bd10 · 06a481ba · 06a481ba · 06a481ba
--- 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" : "视图消息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/Book/PSFORMS/Main_4.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSFORMS/Main_4.json
@@ -232,6 +232,16 @@
      "name" : "FIELD3",
      "codeName" : "Field3"
    }
+  }, {
+    "id" : "formitem14",
+    "dataType" : 25
+  }, {
+    "id" : "formitem15",
+    "dataType" : 25
+  }, {
+    "id" : "formitem16",
+    "dataType" : 25,
+    "createDV" : "test112233"
  }, {
    "id" : "bookid",
    "hidden" : true,
@@ -1244,6 +1254,133 @@
      "allowEmpty" : true,
      "needCodeListConfig" : true,
      "showCaption" : true
+    }, {
+      "caption" : "数据选择（链接）",
+      "codeName" : "formitem14",
+      "dataType" : 25,
+      "detailStyle" : "DEFAULT",
+      "detailType" : "FORMITEM",
+      "enableCond" : 3,
+      "ignoreInput" : 0,
+      "labelPos" : "LEFT",
+      "labelWidth" : 130,
+      "name" : "formitem14",
+      "noPrivDisplayMode" : 1,
+      "getPSEditor" : {
+        "editorParams" : {
+          "LINKVIEW" : "TRUE",
+          "AC" : "TRUE",
+          "TRIGGER" : "FALSE",
+          "PICKUPVIEW" : "TRUE"
+        },
+        "editorType" : "PICKEREX_LINK",
+        "name" : "formitem14",
+        "enableAC" : true,
+        "enableLinkView" : true,
+        "enablePickupView" : true,
+        "forceSelection" : true,
+        "showTrigger" : false,
+        "singleSelect" : true
+      },
+      "getPSLayoutPos" : {
+        "colMD" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "allowEmpty" : true,
+      "showCaption" : true
+    }, {
+      "caption" : "地址栏（选择）",
+      "codeName" : "formitem15",
+      "dataType" : 25,
+      "detailStyle" : "DEFAULT",
+      "detailType" : "FORMITEM",
+      "enableCond" : 3,
+      "ignoreInput" : 0,
+      "labelPos" : "LEFT",
+      "labelWidth" : 130,
+      "name" : "formitem15",
+      "noPrivDisplayMode" : 1,
+      "getPSEditor" : {
+        "editorParams" : {
+          "PICKUPVIEW" : "TRUE"
+        },
+        "editorType" : "ADDRESSPICKUP",
+        "name" : "formitem15",
+        "getPSAppDEACMode" : {
+          "modelref" : true,
+          "id" : "Default"
+        },
+        "getPSAppDEDataSet" : {
+          "modelref" : true,
+          "id" : "FetchDefault"
+        },
+        "getPSAppDataEntity" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD.json"
+        },
+        "getPSEditorItems" : [ {
+          "name" : "field16"
+        } ],
+        "getPickupPSAppView" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ExpenseSheetMPickupView.json",
+          "viewType" : "DEMPICKUPVIEW"
+        },
+        "valueItemName" : "field16",
+        "enableAC" : false,
+        "enablePickupView" : true,
+        "forceSelection" : true,
+        "showTrigger" : true
+      },
+      "getPSLayoutPos" : {
+        "colMD" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "valueItemName" : "field16",
+      "allowEmpty" : true,
+      "showCaption" : true
+    }, {
+      "caption" : "数据链接",
+      "codeName" : "formitem16",
+      "createDV" : "test112233",
+      "dataType" : 25,
+      "detailStyle" : "DEFAULT",
+      "detailType" : "FORMITEM",
+      "enableCond" : 3,
+      "ignoreInput" : 0,
+      "labelPos" : "LEFT",
+      "labelWidth" : 130,
+      "name" : "formitem16",
+      "noPrivDisplayMode" : 1,
+      "getPSEditor" : {
+        "editorParams" : {
+          "EDITABLE" : "FALSE",
+          "LINKVIEW" : "TRUE",
+          "AC" : "FALSE",
+          "TRIGGER" : "FALSE",
+          "PICKUPVIEW" : "FALSE"
+        },
+        "editorType" : "PICKEREX_LINKONLY",
+        "getLinkPSAppView" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/BookTypeGridView.json",
+          "viewType" : "DEGRIDVIEW"
+        },
+        "name" : "formitem16",
+        "editable" : false,
+        "enableAC" : false,
+        "enableLinkView" : true,
+        "enablePickupView" : false,
+        "forceSelection" : true,
+        "showTrigger" : false,
+        "singleSelect" : true
+      },
+      "getPSLayoutPos" : {
+        "colMD" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "allowEmpty" : true,
+      "showCaption" : true
    } ],
    "getPSLayout" : {
      "childColLG" : -1,

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/ExpenseSheet.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/ExpenseSheet.json
@@ -1110,6 +1110,14 @@
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ExpenseSheetEditView_9011.json",
    "viewType" : "DEEDITVIEW"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ExpenseSheetMPickupView.json",
+    "viewType" : "DEMPICKUPVIEW"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ExpenseSheetPickupGridView.json",
+    "viewType" : "DEPICKUPGRIDVIEW"
  } ],
  "getAllPSDEOPPrivs" : [ {
    "logicName" : "建立",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/ExpenseSheetMPickupView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/ExpenseSheetMPickupView.json
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/ExpenseSheetPickupGridView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/ExpenseSheetPickupGridView.json
--- 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
@@ -349,6 +349,16 @@
        "name" : "FIELD3",
        "codeName" : "Field3"
      }
+    }, {
+      "id" : "formitem14",
+      "dataType" : 25
+    }, {
+      "id" : "formitem15",
+      "dataType" : 25
+    }, {
+      "id" : "formitem16",
+      "dataType" : 25,
+      "createDV" : "test112233"
    }, {
      "id" : "bookid",
      "hidden" : true,
@@ -1361,6 +1371,133 @@
        "allowEmpty" : true,
        "needCodeListConfig" : true,
        "showCaption" : true
+      }, {
+        "caption" : "数据选择（链接）",
+        "codeName" : "formitem14",
+        "dataType" : 25,
+        "detailStyle" : "DEFAULT",
+        "detailType" : "FORMITEM",
+        "enableCond" : 3,
+        "ignoreInput" : 0,
+        "labelPos" : "LEFT",
+        "labelWidth" : 130,
+        "name" : "formitem14",
+        "noPrivDisplayMode" : 1,
+        "getPSEditor" : {
+          "editorParams" : {
+            "LINKVIEW" : "TRUE",
+            "AC" : "TRUE",
+            "TRIGGER" : "FALSE",
+            "PICKUPVIEW" : "TRUE"
+          },
+          "editorType" : "PICKEREX_LINK",
+          "name" : "formitem14",
+          "enableAC" : true,
+          "enableLinkView" : true,
+          "enablePickupView" : true,
+          "forceSelection" : true,
+          "showTrigger" : false,
+          "singleSelect" : true
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "allowEmpty" : true,
+        "showCaption" : true
+      }, {
+        "caption" : "地址栏（选择）",
+        "codeName" : "formitem15",
+        "dataType" : 25,
+        "detailStyle" : "DEFAULT",
+        "detailType" : "FORMITEM",
+        "enableCond" : 3,
+        "ignoreInput" : 0,
+        "labelPos" : "LEFT",
+        "labelWidth" : 130,
+        "name" : "formitem15",
+        "noPrivDisplayMode" : 1,
+        "getPSEditor" : {
+          "editorParams" : {
+            "PICKUPVIEW" : "TRUE"
+          },
+          "editorType" : "ADDRESSPICKUP",
+          "name" : "formitem15",
+          "getPSAppDEACMode" : {
+            "modelref" : true,
+            "id" : "Default"
+          },
+          "getPSAppDEDataSet" : {
+            "modelref" : true,
+            "id" : "FetchDefault"
+          },
+          "getPSAppDataEntity" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD.json"
+          },
+          "getPSEditorItems" : [ {
+            "name" : "field16"
+          } ],
+          "getPickupPSAppView" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ExpenseSheetMPickupView.json",
+            "viewType" : "DEMPICKUPVIEW"
+          },
+          "valueItemName" : "field16",
+          "enableAC" : false,
+          "enablePickupView" : true,
+          "forceSelection" : true,
+          "showTrigger" : true
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "valueItemName" : "field16",
+        "allowEmpty" : true,
+        "showCaption" : true
+      }, {
+        "caption" : "数据链接",
+        "codeName" : "formitem16",
+        "createDV" : "test112233",
+        "dataType" : 25,
+        "detailStyle" : "DEFAULT",
+        "detailType" : "FORMITEM",
+        "enableCond" : 3,
+        "ignoreInput" : 0,
+        "labelPos" : "LEFT",
+        "labelWidth" : 130,
+        "name" : "formitem16",
+        "noPrivDisplayMode" : 1,
+        "getPSEditor" : {
+          "editorParams" : {
+            "EDITABLE" : "FALSE",
+            "LINKVIEW" : "TRUE",
+            "AC" : "FALSE",
+            "TRIGGER" : "FALSE",
+            "PICKUPVIEW" : "FALSE"
+          },
+          "editorType" : "PICKEREX_LINKONLY",
+          "getLinkPSAppView" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/BookTypeGridView.json",
+            "viewType" : "DEGRIDVIEW"
+          },
+          "name" : "formitem16",
+          "editable" : false,
+          "enableAC" : false,
+          "enableLinkView" : true,
+          "enablePickupView" : false,
+          "forceSelection" : true,
+          "showTrigger" : false,
+          "singleSelect" : true
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "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" : "视图消息2",
+      "name" : "视图消息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
      }
    }, {
-      "name" : "视图消息",
+      "name" : "视图消息2",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
      }
    } ]
  }, {
@@ -9795,59 +9795,46 @@
    "codeName" : "VMGroup4",
    "name" : "视图消息位置测试",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息位置-视图上方",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg7"
-      }
-    }, {
      "name" : "消息位置-弹出",
      "getPSAppViewMsg" : {
        "modelref" : true,
        "id" : "ViewMsg10"
      }
-    }, {
-      "name" : "消息位置-视图下方",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg8"
-      }
    }, {
      "name" : "消息位置-视图内容区",
      "getPSAppViewMsg" : {
        "modelref" : true,
        "id" : "ViewMsg9"
      }
-    } ]
    }, {
-    "codeName" : "VMGroup8",
-    "name" : "【静态测试】",
-    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息位置-视图下方",
+      "name" : "消息位置-视图上方",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg7"
      }
    }, {
-      "name" : "关闭模式-本次删除-上方-警告",
+      "name" : "消息位置-视图下方",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg13"
+        "id" : "ViewMsg8"
      }
+    } ]
  }, {
-      "name" : "消息类型-警告信息",
+    "codeName" : "VMGroup8",
+    "name" : "【静态测试】",
+    "getPSAppViewMsgGroupDetails" : [ {
+      "name" : "消息类型-错误信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg5"
+        "id" : "ViewMsg6"
      },
      "position" : "POPUP"
    }, {
-      "name" : "消息类型-错误信息",
+      "name" : "消息位置-视图下方",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg6"
-      },
-      "position" : "POPUP"
+        "id" : "ViewMsg8"
+      }
    }, {
      "name" : "关闭模式-无删除-上方-常规",
      "getPSAppViewMsg" : {
@@ -9861,6 +9848,13 @@
        "id" : "ViewMsg4"
      },
      "position" : "POPUP"
+    }, {
+      "name" : "消息类型-警告信息",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg5"
+      },
+      "position" : "POPUP"
    }, {
      "name" : "关闭模式-默认删除-上方-错误",
      "getPSAppViewMsg" : {
@@ -9873,6 +9867,12 @@
        "modelref" : true,
        "id" : "ViewMsg9"
      }
+    }, {
+      "name" : "关闭模式-本次删除-上方-警告",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg13"
+      }
    } ]
  }, {
    "codeName" : "VMGroup5",
@@ -9884,32 +9884,32 @@
        "id" : "ViewMsg12"
      }
    }, {
-      "name" : "关闭模式-无删除",
+      "name" : "关闭模式-本次删除",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg13"
      }
    }, {
-      "name" : "关闭模式-本次删除",
+      "name" : "关闭模式-无删除",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg13"
+        "id" : "ViewMsg11"
      }
    } ]
  }, {
    "codeName" : "VMGroup6",
    "name" : "视图消息动态模式测试",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "动态模式-静态内容",
+      "name" : "动态模式-实体数据集",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg15"
+        "id" : "ViewMsg14"
      }
    }, {
-      "name" : "动态模式-实体数据集",
+      "name" : "动态模式-静态内容",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg14"
+        "id" : "ViewMsg15"
      }
    } ]
  } ],
@@ -11517,6 +11517,12 @@
    "viewType" : "DEEDITVIEW",
    "resource" : "ViewMsg",
    "view" : "EditView"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ExpenseSheetMPickupView.json",
+    "viewType" : "DEMPICKUPVIEW",
+    "resource" : "ExpenseSheet",
+    "view" : "MPickupView"
  }, {
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/WorkFlowWFDynaActionView.json",
@@ -12129,6 +12135,12 @@
    "viewType" : "DEEDITVIEW",
    "resource" : "Phone",
    "view" : "Usr08223555EditView"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ExpenseSheetPickupGridView.json",
+    "viewType" : "DEPICKUPGRIDVIEW",
+    "resource" : "ExpenseSheet",
+    "view" : "PickupGridView"
  }, {
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/BookTypeEditView.json",
@@ -36330,6 +36342,14 @@
        "modelref" : true,
        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ExpenseSheetEditView_9011.json",
        "viewType" : "DEEDITVIEW"
+      }, {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ExpenseSheetMPickupView.json",
+        "viewType" : "DEMPICKUPVIEW"
+      }, {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ExpenseSheetPickupGridView.json",
+        "viewType" : "DEPICKUPGRIDVIEW"
      } ],
      "getAllPSDEOPPrivs" : [ {
        "logicName" : "建立",
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSI18NS/DEFAULT.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSI18NS/DEFAULT.json
@@ -532,7 +532,8 @@
    "defaultContent" : "常规条件",
    "lanResTag" : "CONTROL.DEFORM.EXPENSESHEET.DEFAULT.FORMPAGE.FORMPAGE1",
    "lanResType" : "CONTROL",
-    "name" : "控件文本（CONTROL.*）[DEFORM.EXPENSESHEET.DEFAULT.FORMPAGE.FORMPAGE1]"
+    "name" : "控件文本（CONTROL.*）[DEFORM.EXPENSESHEET.DEFAULT.FORMPAGE.FORMPAGE1]",
+    "refFlag" : true
  }, {
    "defaultContent" : "基本信息",
    "lanResTag" : "CONTROL.DEFORM.EXPENSESHEET.MAIN.FORMPAGE.FORMPAGE1",
@@ -1155,12 +1156,14 @@
    "defaultContent" : "报销单数据多项选择视图",
    "lanResTag" : "PAGE.TITLE.EXPENSESHEET.MPICKUPVIEW",
    "lanResType" : "PAGE",
-    "name" : "界面文本（PAGE.*）[TITLE.EXPENSESHEET.MPICKUPVIEW]"
+    "name" : "界面文本（PAGE.*）[TITLE.EXPENSESHEET.MPICKUPVIEW]",
+    "refFlag" : true
  }, {
    "defaultContent" : "报销单选择表格视图",
    "lanResTag" : "PAGE.TITLE.EXPENSESHEET.PICKUPGRIDVIEW",
    "lanResType" : "PAGE",
-    "name" : "界面文本（PAGE.*）[TITLE.EXPENSESHEET.PICKUPGRIDVIEW]"
+    "name" : "界面文本（PAGE.*）[TITLE.EXPENSESHEET.PICKUPGRIDVIEW]",
+    "refFlag" : true
  }, {
    "defaultContent" : "报销单数据选择视图",
    "lanResTag" : "PAGE.TITLE.EXPENSESHEET.PICKUPVIEW",