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

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/BXD2.json

@@ -1883,6 +1883,12 @@
     "name" : "报销单2实体编辑视图（左右关系）",
     "realModelSubType" : "DEEDITVIEW2",
     "realModelType" : "PSDEVIEWBASE"
+  }, {
+    "codeName" : "LayoutTest",
+    "logicName" : "布局测试",
+    "name" : "布局测试",
+    "realModelSubType" : "DEGRIDVIEW",
+    "realModelType" : "PSDEVIEWBASE"
   }, {
     "codeName" : "RedirectView_Test",
     "logicName" : "RedirectView_Test",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDATAENTITIES/Book.json

@@ -4310,7 +4310,7 @@
       "getPSDEUILogicLinks" : [ {
         "getDstPSDEUILogicNode" : {
           "modelref" : true,
-          "id" : "PREPAREJSPARAM1"
+          "id" : "RAWJSCODE1"
         },
         "linkMode" : 0,
         "name" : "连接名称",
@@ -4322,42 +4322,15 @@
       "topPos" : 200,
       "parallelOutput" : true
     }, {
-      "codeName" : "PREPAREJSPARAM1",
-      "leftPos" : 385,
-      "logicNodeType" : "PREPAREJSPARAM",
-      "name" : "准备参数",
-      "getPSDEUILogicLinks" : [ {
-        "getDstPSDEUILogicNode" : {
-          "modelref" : true,
-          "id" : "RAWJSCODE1"
-        },
-        "linkMode" : 0,
-        "name" : "连接名称",
-        "getSrcPSDEUILogicNode" : {
-          "modelref" : true,
-          "id" : "PREPAREJSPARAM1"
-        }
-      } ],
-      "getPSDEUILogicNodeParams" : [ {
-        "dstFieldName" : "_id",
-        "getDstPSDEUILogicParam" : {
-          "modelref" : true,
-          "id" : "form_id"
-        },
-        "name" : "Default[id] ==> form_id[_id]",
-        "paramAction" : "SETPARAMVALUE",
-        "srcFieldName" : "id",
-        "getSrcPSDEUILogicParam" : {
-          "modelref" : true,
-          "id" : "Default"
-        },
-        "srcValueType" : "SRCDLPARAM"
-      } ],
-      "topPos" : 208
+      "codeName" : "END1",
+      "leftPos" : 722,
+      "logicNodeType" : "END",
+      "name" : "结束",
+      "topPos" : 200
     }, {
-      "code" : "console.log('复制脚本内容')",
+      "code" : "if (!view?.name) {\r\n    return;\r\n}\r\nconst result = ibiz.util.text.copy(view?.name);\r\nif (result) {\r\nibiz.message.success('拷贝成功!');\r\n} else {\r\nibiz.message.error('拷贝失败，浏览器copy操作不被支持或未被启用!');\r\n}",
       "codeName" : "RAWJSCODE1",
-      "leftPos" : 662,
+      "leftPos" : 462,
       "logicNodeType" : "RAWJSCODE",
       "name" : "复制表单id内容",
       "getPSDEUILogicLinks" : [ {
@@ -4373,12 +4346,6 @@
         }
       } ],
       "topPos" : 208
-    }, {
-      "codeName" : "END1",
-      "leftPos" : 942,
-      "logicNodeType" : "END",
-      "name" : "结束",
-      "topPos" : 200
     } ],
     "getPSDEUILogicParams" : [ {
       "codeName" : "form_id",
@@ -4421,7 +4388,7 @@
       "topPos" : 200,
       "parallelOutput" : true
     }, {
-      "code" : "console.log('复制页面路径');",
+      "code" : "const path = window.location.href;\r\nif (!path) {\r\n    return;\r\n}\r\nconst result = ibiz.util.text.copy(path);\r\nif (result) {\r\nibiz.message.success('拷贝成功!');\r\n} else {\r\nibiz.message.error('拷贝失败，浏览器copy操作不被支持或未被启用!');\r\n}",
       "codeName" : "RAWJSCODE1",
       "leftPos" : 379,
       "logicNodeType" : "RAWJSCODE",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/Book.json

@@ -4310,7 +4310,7 @@
       "getPSDEUILogicLinks" : [ {
         "getDstPSDEUILogicNode" : {
           "modelref" : true,
-          "id" : "PREPAREJSPARAM1"
+          "id" : "RAWJSCODE1"
         },
         "linkMode" : 0,
         "name" : "连接名称",
@@ -4322,42 +4322,15 @@
       "topPos" : 200,
       "parallelOutput" : true
     }, {
-      "codeName" : "PREPAREJSPARAM1",
-      "leftPos" : 385,
-      "logicNodeType" : "PREPAREJSPARAM",
-      "name" : "准备参数",
-      "getPSDEUILogicLinks" : [ {
-        "getDstPSDEUILogicNode" : {
-          "modelref" : true,
-          "id" : "RAWJSCODE1"
-        },
-        "linkMode" : 0,
-        "name" : "连接名称",
-        "getSrcPSDEUILogicNode" : {
-          "modelref" : true,
-          "id" : "PREPAREJSPARAM1"
-        }
-      } ],
-      "getPSDEUILogicNodeParams" : [ {
-        "dstFieldName" : "_id",
-        "getDstPSDEUILogicParam" : {
-          "modelref" : true,
-          "id" : "form_id"
-        },
-        "name" : "Default[id] ==> form_id[_id]",
-        "paramAction" : "SETPARAMVALUE",
-        "srcFieldName" : "id",
-        "getSrcPSDEUILogicParam" : {
-          "modelref" : true,
-          "id" : "Default"
-        },
-        "srcValueType" : "SRCDLPARAM"
-      } ],
-      "topPos" : 208
+      "codeName" : "END1",
+      "leftPos" : 722,
+      "logicNodeType" : "END",
+      "name" : "结束",
+      "topPos" : 200
     }, {
-      "code" : "console.log('复制脚本内容')",
+      "code" : "if (!view?.name) {\r\n    return;\r\n}\r\nconst result = ibiz.util.text.copy(view?.name);\r\nif (result) {\r\nibiz.message.success('拷贝成功!');\r\n} else {\r\nibiz.message.error('拷贝失败，浏览器copy操作不被支持或未被启用!');\r\n}",
       "codeName" : "RAWJSCODE1",
-      "leftPos" : 662,
+      "leftPos" : 462,
       "logicNodeType" : "RAWJSCODE",
       "name" : "复制表单id内容",
       "getPSDEUILogicLinks" : [ {
@@ -4373,12 +4346,6 @@
         }
       } ],
       "topPos" : 208
-    }, {
-      "codeName" : "END1",
-      "leftPos" : 942,
-      "logicNodeType" : "END",
-      "name" : "结束",
-      "topPos" : 200
     } ],
     "getPSDEUILogicParams" : [ {
       "codeName" : "form_id",
@@ -4421,7 +4388,7 @@
       "topPos" : 200,
       "parallelOutput" : true
     }, {
-      "code" : "console.log('复制页面路径');",
+      "code" : "const path = window.location.href;\r\nif (!path) {\r\n    return;\r\n}\r\nconst result = ibiz.util.text.copy(path);\r\nif (result) {\r\nibiz.message.success('拷贝成功!');\r\n} else {\r\nibiz.message.error('拷贝失败，浏览器copy操作不被支持或未被启用!');\r\n}",
       "codeName" : "RAWJSCODE1",
       "leftPos" : 379,
       "logicNodeType" : "RAWJSCODE",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSSYSAPP.json

@@ -1582,16 +1582,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"
       }
     } ]
   }, {

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD2.json

@@ -2288,6 +2288,10 @@
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/BXD2GridView.json",
     "viewType" : "DEGRIDVIEW"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/BXD2LayoutTest.json",
+    "viewType" : "DEGRIDVIEW"
   }, {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/BXD2EditView.json",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json

@@ -4641,7 +4641,7 @@
       "getPSDEUILogicLinks" : [ {
         "getDstPSDEUILogicNode" : {
           "modelref" : true,
-          "id" : "PREPAREJSPARAM1"
+          "id" : "RAWJSCODE1"
         },
         "linkMode" : 0,
         "name" : "连接名称",
@@ -4653,42 +4653,15 @@
       "topPos" : 200,
       "parallelOutput" : true
     }, {
-      "codeName" : "PREPAREJSPARAM1",
-      "leftPos" : 385,
-      "logicNodeType" : "PREPAREJSPARAM",
-      "name" : "准备参数",
-      "getPSDEUILogicLinks" : [ {
-        "getDstPSDEUILogicNode" : {
-          "modelref" : true,
-          "id" : "RAWJSCODE1"
-        },
-        "linkMode" : 0,
-        "name" : "连接名称",
-        "getSrcPSDEUILogicNode" : {
-          "modelref" : true,
-          "id" : "PREPAREJSPARAM1"
-        }
-      } ],
-      "getPSDEUILogicNodeParams" : [ {
-        "dstFieldName" : "_id",
-        "getDstPSDEUILogicParam" : {
-          "modelref" : true,
-          "id" : "form_id"
-        },
-        "name" : "Default[id] ==> form_id[_id]",
-        "paramAction" : "SETPARAMVALUE",
-        "srcFieldName" : "id",
-        "getSrcPSDEUILogicParam" : {
-          "modelref" : true,
-          "id" : "Default"
-        },
-        "srcValueType" : "SRCDLPARAM"
-      } ],
-      "topPos" : 208
+      "codeName" : "END1",
+      "leftPos" : 722,
+      "logicNodeType" : "END",
+      "name" : "结束",
+      "topPos" : 200
     }, {
-      "code" : "console.log('复制脚本内容')",
+      "code" : "if (!view?.name) {\r\n    return;\r\n}\r\nconst result = ibiz.util.text.copy(view?.name);\r\nif (result) {\r\nibiz.message.success('拷贝成功!');\r\n} else {\r\nibiz.message.error('拷贝失败，浏览器copy操作不被支持或未被启用!');\r\n}",
       "codeName" : "RAWJSCODE1",
-      "leftPos" : 662,
+      "leftPos" : 462,
       "logicNodeType" : "RAWJSCODE",
       "name" : "复制表单id内容",
       "getPSDEUILogicLinks" : [ {
@@ -4704,12 +4677,6 @@
         }
       } ],
       "topPos" : 208
-    }, {
-      "codeName" : "END1",
-      "leftPos" : 942,
-      "logicNodeType" : "END",
-      "name" : "结束",
-      "topPos" : 200
     } ],
     "getPSDEUILogicParams" : [ {
       "codeName" : "form_id",
@@ -4752,7 +4719,7 @@
       "topPos" : 200,
       "parallelOutput" : true
     }, {
-      "code" : "console.log('复制页面路径');",
+      "code" : "const path = window.location.href;\r\nif (!path) {\r\n    return;\r\n}\r\nconst result = ibiz.util.text.copy(path);\r\nif (result) {\r\nibiz.message.success('拷贝成功!');\r\n} else {\r\nibiz.message.error('拷贝失败，浏览器copy操作不被支持或未被启用!');\r\n}",
       "codeName" : "RAWJSCODE1",
       "leftPos" : 379,
       "logicNodeType" : "RAWJSCODE",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json

@@ -13506,16 +13506,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"
       }
     } ]
   }, {
@@ -13544,16 +13544,16 @@
     "codeName" : "VMGroup3",
     "name" : "视图消息类型测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-错误信息",
+      "name" : "消息类型-警告信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg6"
+        "id" : "ViewMsg5"
       }
     }, {
-      "name" : "消息类型-警告信息",
+      "name" : "消息类型-错误信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg5"
+        "id" : "ViewMsg6"
       }
     }, {
       "name" : "消息类型-常规信息",
@@ -13576,46 +13576,45 @@
     "codeName" : "VMGroup4",
     "name" : "视图消息位置测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息位置-弹出",
+      "name" : "消息位置-视图上方",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg10"
+        "id" : "ViewMsg7"
       }
     }, {
-      "name" : "消息位置-视图内容区",
+      "name" : "消息位置-视图下方",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg9"
+        "id" : "ViewMsg8"
       }
     }, {
-      "name" : "消息位置-视图上方",
+      "name" : "消息位置-弹出",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg7"
+        "id" : "ViewMsg10"
       }
     }, {
-      "name" : "消息位置-视图下方",
+      "name" : "消息位置-视图内容区",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg9"
       }
     } ]
   }, {
     "codeName" : "VMGroup8",
     "name" : "【静态测试】",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-本次删除-上方-警告",
+      "name" : "消息位置-视图内容区",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg13"
+        "id" : "ViewMsg9"
       }
     }, {
-      "name" : "消息类型-错误信息",
+      "name" : "关闭模式-默认删除-上方-错误",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg6"
-      },
-      "position" : "POPUP"
+        "id" : "ViewMsg12"
+      }
     }, {
       "name" : "消息位置-视图下方",
       "getPSAppViewMsg" : {
@@ -13623,74 +13622,75 @@
         "id" : "ViewMsg8"
       }
     }, {
-      "name" : "关闭模式-无删除-上方-常规",
+      "name" : "关闭模式-本次删除-上方-警告",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg13"
       }
     }, {
-      "name" : "消息类型-常规信息",
+      "name" : "消息类型-警告信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg4"
+        "id" : "ViewMsg5"
       },
       "position" : "POPUP"
     }, {
-      "name" : "消息类型-警告信息",
+      "name" : "消息类型-错误信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg5"
+        "id" : "ViewMsg6"
       },
       "position" : "POPUP"
     }, {
-      "name" : "关闭模式-默认删除-上方-错误",
+      "name" : "消息类型-常规信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg12"
-      }
+        "id" : "ViewMsg4"
+      },
+      "position" : "POPUP"
     }, {
-      "name" : "消息位置-视图内容区",
+      "name" : "关闭模式-无删除-上方-常规",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg9"
+        "id" : "ViewMsg11"
       }
     } ]
   }, {
     "codeName" : "VMGroup5",
     "name" : "视图消息关闭模式",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-无删除",
+      "name" : "关闭模式-本次删除",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg13"
       }
     }, {
-      "name" : "关闭模式-默认删除",
+      "name" : "关闭模式-无删除",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg12"
+        "id" : "ViewMsg11"
       }
     }, {
-      "name" : "关闭模式-本次删除",
+      "name" : "关闭模式-默认删除",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg13"
+        "id" : "ViewMsg12"
       }
     } ]
   }, {
     "codeName" : "VMGroup6",
     "name" : "视图消息动态模式测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "动态模式-实体数据集",
+      "name" : "动态模式-静态内容",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg14"
+        "id" : "ViewMsg15"
       }
     }, {
-      "name" : "动态模式-静态内容",
+      "name" : "动态模式-实体数据集",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg15"
+        "id" : "ViewMsg14"
       }
     } ]
   } ],
@@ -14276,6 +14276,12 @@
     "viewType" : "DEGRIDVIEW",
     "resource" : "TEST",
     "view" : "SearchFormCustomLayout"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/BXD2LayoutTest.json",
+    "viewType" : "DEGRIDVIEW",
+    "resource" : "BXD2",
+    "view" : "LayoutTest"
   }, {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookTestCtrlPlugCalendarView.json",
@@ -55118,7 +55124,7 @@
           "getPSDEUILogicLinks" : [ {
             "getDstPSDEUILogicNode" : {
               "modelref" : true,
-              "id" : "PREPAREJSPARAM1"
+              "id" : "RAWJSCODE1"
             },
             "linkMode" : 0,
             "name" : "连接名称",
@@ -55130,42 +55136,15 @@
           "topPos" : 200,
           "parallelOutput" : true
         }, {
-          "codeName" : "PREPAREJSPARAM1",
-          "leftPos" : 385,
-          "logicNodeType" : "PREPAREJSPARAM",
-          "name" : "准备参数",
-          "getPSDEUILogicLinks" : [ {
-            "getDstPSDEUILogicNode" : {
-              "modelref" : true,
-              "id" : "RAWJSCODE1"
-            },
-            "linkMode" : 0,
-            "name" : "连接名称",
-            "getSrcPSDEUILogicNode" : {
-              "modelref" : true,
-              "id" : "PREPAREJSPARAM1"
-            }
-          } ],
-          "getPSDEUILogicNodeParams" : [ {
-            "dstFieldName" : "_id",
-            "getDstPSDEUILogicParam" : {
-              "modelref" : true,
-              "id" : "form_id"
-            },
-            "name" : "Default[id] ==> form_id[_id]",
-            "paramAction" : "SETPARAMVALUE",
-            "srcFieldName" : "id",
-            "getSrcPSDEUILogicParam" : {
-              "modelref" : true,
-              "id" : "Default"
-            },
-            "srcValueType" : "SRCDLPARAM"
-          } ],
-          "topPos" : 208
+          "codeName" : "END1",
+          "leftPos" : 722,
+          "logicNodeType" : "END",
+          "name" : "结束",
+          "topPos" : 200
         }, {
-          "code" : "console.log('复制脚本内容')",
+          "code" : "if (!view?.name) {\r\n    return;\r\n}\r\nconst result = ibiz.util.text.copy(view?.name);\r\nif (result) {\r\nibiz.message.success('拷贝成功!');\r\n} else {\r\nibiz.message.error('拷贝失败，浏览器copy操作不被支持或未被启用!');\r\n}",
           "codeName" : "RAWJSCODE1",
-          "leftPos" : 662,
+          "leftPos" : 462,
           "logicNodeType" : "RAWJSCODE",
           "name" : "复制表单id内容",
           "getPSDEUILogicLinks" : [ {
@@ -55181,12 +55160,6 @@
             }
           } ],
           "topPos" : 208
-        }, {
-          "codeName" : "END1",
-          "leftPos" : 942,
-          "logicNodeType" : "END",
-          "name" : "结束",
-          "topPos" : 200
         } ],
         "getPSDEUILogicParams" : [ {
           "codeName" : "form_id",
@@ -55229,7 +55202,7 @@
           "topPos" : 200,
           "parallelOutput" : true
         }, {
-          "code" : "console.log('复制页面路径');",
+          "code" : "const path = window.location.href;\r\nif (!path) {\r\n    return;\r\n}\r\nconst result = ibiz.util.text.copy(path);\r\nif (result) {\r\nibiz.message.success('拷贝成功!');\r\n} else {\r\nibiz.message.error('拷贝失败，浏览器copy操作不被支持或未被启用!');\r\n}",
           "codeName" : "RAWJSCODE1",
           "leftPos" : 379,
           "logicNodeType" : "RAWJSCODE",
@@ -66785,6 +66758,10 @@
         "modelref" : true,
         "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/BXD2GridView.json",
         "viewType" : "DEGRIDVIEW"
+      }, {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/BXD2LayoutTest.json",
+        "viewType" : "DEGRIDVIEW"
       }, {
         "modelref" : true,
         "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/BXD2EditView.json",