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

1e5e8e71 · ibizdev · b22324a6 · 1e5e8e71 · 1e5e8e71 · 1e5e8e71
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSSYSAPP.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSSYSAPP.json
@@ -87,6 +87,15 @@
      "value" : "kp"
    } ],
    "enableCache" : true
+  }, {
+    "codeListTag" : "ModelRepository__UsrCodeList0411260431",
+    "codeListType" : "DYNAMIC",
+    "codeName" : "ModelRepository__UsrCodeList0411260431",
+    "dynaInstMode" : 0,
+    "dynaModelFilePath" : "PSSYSAPPS/Mob/PSAPPCODELISTS/ModelRepository__UsrCodeList0411260431.json",
+    "emptyText" : "未定义",
+    "name" : "song动态",
+    "enableCache" : true
  }, {
    "codeListTag" : "Runtime1",
    "codeListType" : "DYNAMIC",
@@ -8841,11 +8850,13 @@
                "itemType" : "FIELD",
                "name" : "field_text_dynamic1",
                "getPSEditor" : {
-                  "editorType" : "SPAN",
+                  "editorParams" : {
+                    "template" : "template内容：{{data.testname}}"
+                  },
+                  "editorType" : "RAW",
                  "name" : "field_text_dynamic1",
                  "predefinedType" : "FIELD_TEXT_DYNAMIC",
-                  "renderMode" : "TEXT_DYNAMIC",
-                  "enableLinkView" : false
+                  "template" : "template内容：{{data.testname}}"
                },
                "getPSLayoutPos" : {
                  "colMD" : 24,
@@ -8884,6 +8895,26 @@
            "width" : 400.0,
            "hidden" : false,
            "showCaption" : false
+          }, {
+            "caption" : "标签",
+            "contentType" : "RAW",
+            "itemStyle" : "DEFAULT",
+            "itemType" : "RAWITEM",
+            "name" : "static_label",
+            "getPSLayoutPos" : {
+              "colMD" : 24,
+              "layout" : "TABLE_24COL",
+              "widthMode" : "FULL"
+            },
+            "getPSRawItem" : {
+              "caption" : "测试面板直接内容",
+              "contentType" : "RAW",
+              "name" : "static_label",
+              "predefinedType" : "STATIC_LABEL",
+              "renderMode" : "PARAGRAPH"
+            },
+            "rawContent" : "测试面板直接内容",
+            "showCaption" : true
          }, {
            "caption" : "文本框",
            "contentHeight" : 100.0,
@@ -8935,6 +8966,25 @@
            "viewFieldName" : "TESTNAME",
            "hidden" : false,
            "showCaption" : false
+          }, {
+            "caption" : "文本",
+            "contentType" : "RAW",
+            "itemStyle" : "DEFAULT",
+            "itemType" : "RAWITEM",
+            "name" : "static_text",
+            "getPSLayoutPos" : {
+              "colMD" : 24,
+              "layout" : "TABLE_24COL"
+            },
+            "getPSRawItem" : {
+              "caption" : "文本内容",
+              "contentType" : "RAW",
+              "name" : "static_text",
+              "predefinedType" : "STATIC_TEXT",
+              "renderMode" : "TEXT"
+            },
+            "rawContent" : "文本内容",
+            "showCaption" : true
          } ],
          "modelid" : "01B1D530-723C-4CB4-A877-5F5E3CFC11AF",
          "modeltype" : "PSSYSVIEWPANEL"
@@ -24460,6 +24510,54 @@
          "modelref" : true,
          "id" : "Begin"
        }
+      }, {
+        "codeName" : "indexBtnOpenMenu",
+        "defaultParamName" : "Default",
+        "logicName" : "首页按钮打开对应菜单",
+        "name" : "首页按钮打开对应菜单",
+        "getPSDEUILogicNodes" : [ {
+          "codeName" : "Begin",
+          "leftPos" : 200,
+          "logicNodeType" : "BEGIN",
+          "name" : "开始",
+          "getPSDEUILogicLinks" : [ {
+            "getDstPSDEUILogicNode" : {
+              "modelref" : true,
+              "id" : "RAWJSCODE1"
+            },
+            "linkMode" : 0,
+            "name" : "连接名称",
+            "getSrcPSDEUILogicNode" : {
+              "modelref" : true,
+              "id" : "Begin"
+            }
+          } ],
+          "topPos" : 200,
+          "parallelOutput" : true
+        }, {
+          "code" : "console.log('打开对应菜单')",
+          "codeName" : "RAWJSCODE1",
+          "leftPos" : 396,
+          "logicNodeType" : "RAWJSCODE",
+          "name" : "注入脚本代码",
+          "topPos" : 208
+        } ],
+        "getPSDEUILogicParams" : [ {
+          "codeName" : "index_setting",
+          "logicName" : "触发按钮",
+          "name" : "触发按钮",
+          "ctrlParam" : true
+        }, {
+          "codeName" : "Default",
+          "logicName" : "传入变量",
+          "name" : "传入变量",
+          "default" : true,
+          "entityParam" : true
+        } ],
+        "getStartPSDEUILogicNode" : {
+          "modelref" : true,
+          "id" : "Begin"
+        }
      }, {
        "codeName" : "testviewlogic",
        "defaultParamName" : "Default",
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSFORMS/EditorTest.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSFORMS/EditorTest.json
@@ -117,12 +117,12 @@
      "name" : "field8"
    }, {
      "name" : "field17"
+    }, {
+      "name" : "field14"
    }, {
      "name" : "field13"
    }, {
      "name" : "field11"
-    }, {
-      "name" : "field14"
    } ]
  } ],
  "getPSDEFormItemVRs" : [ {
@@ -1840,6 +1840,7 @@
          },
          "getPSEditor" : {
            "editorParams" : {
+              "overflowMode" : "ellipsis",
              "AC" : "TRUE",
              "PICKUPVIEW" : "TRUE"
            },
@@ -2082,6 +2083,7 @@
          },
          "getPSEditor" : {
            "editorParams" : {
+              "overflowMode" : "ellipsis",
              "AC" : "TRUE",
              "TRIGGER" : "TRUE",
              "PICKUPVIEW" : "FALSE"
@@ -2198,6 +2200,7 @@
          },
          "getPSEditor" : {
            "editorParams" : {
+              "overflowMode" : "ellipsis",
              "PICKUPVIEW" : "TRUE"
            },
            "editorType" : "ADDRESSPICKUP",
@@ -2724,6 +2727,7 @@
          "getPSEditor" : {
            "editorParams" : {
              "FORCESELECTION" : "FALSE",
+              "overflowMode" : "ellipsis",
              "TRIGGER" : "TRUE"
            },
            "editorType" : "AC",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookBookEditViewEditorTest.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookBookEditViewEditorTest.json
@@ -235,12 +235,12 @@
        "name" : "field8"
      }, {
        "name" : "field17"
+      }, {
+        "name" : "field14"
      }, {
        "name" : "field13"
      }, {
        "name" : "field11"
-      }, {
-        "name" : "field14"
      } ]
    } ],
    "getPSDEFormItemVRs" : [ {
@@ -1958,6 +1958,7 @@
            },
            "getPSEditor" : {
              "editorParams" : {
+                "overflowMode" : "ellipsis",
                "AC" : "TRUE",
                "PICKUPVIEW" : "TRUE"
              },
@@ -2200,6 +2201,7 @@
            },
            "getPSEditor" : {
              "editorParams" : {
+                "overflowMode" : "ellipsis",
                "AC" : "TRUE",
                "TRIGGER" : "TRUE",
                "PICKUPVIEW" : "FALSE"
@@ -2316,6 +2318,7 @@
            },
            "getPSEditor" : {
              "editorParams" : {
+                "overflowMode" : "ellipsis",
                "PICKUPVIEW" : "TRUE"
              },
              "editorType" : "ADDRESSPICKUP",
@@ -2842,6 +2845,7 @@
            "getPSEditor" : {
              "editorParams" : {
                "FORCESELECTION" : "FALSE",
+                "overflowMode" : "ellipsis",
                "TRIGGER" : "TRUE"
              },
              "editorType" : "AC",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookHoverEditView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookHoverEditView.json
@@ -713,12 +713,12 @@
        "name" : "field8"
      }, {
        "name" : "field17"
+      }, {
+        "name" : "field14"
      }, {
        "name" : "field13"
      }, {
        "name" : "field11"
-      }, {
-        "name" : "field14"
      } ]
    } ],
    "getPSDEFormItemVRs" : [ {
@@ -2436,6 +2436,7 @@
            },
            "getPSEditor" : {
              "editorParams" : {
+                "overflowMode" : "ellipsis",
                "AC" : "TRUE",
                "PICKUPVIEW" : "TRUE"
              },
@@ -2678,6 +2679,7 @@
            },
            "getPSEditor" : {
              "editorParams" : {
+                "overflowMode" : "ellipsis",
                "AC" : "TRUE",
                "TRIGGER" : "TRUE",
                "PICKUPVIEW" : "FALSE"
@@ -2794,6 +2796,7 @@
            },
            "getPSEditor" : {
              "editorParams" : {
+                "overflowMode" : "ellipsis",
                "PICKUPVIEW" : "TRUE"
              },
              "editorType" : "ADDRESSPICKUP",
@@ -3320,6 +3323,7 @@
            "getPSEditor" : {
              "editorParams" : {
                "FORCESELECTION" : "FALSE",
+                "overflowMode" : "ellipsis",
                "TRIGGER" : "TRUE"
              },
              "editorType" : "AC",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPUTILVIEWS/AppDataUploadView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPUTILVIEWS/AppDataUploadView.json
@@ -153,7 +153,7 @@
        }, {
          "caption" : "文本",
          "contentType" : "HTML",
-          "htmlContent" : "<p>点击此处&lt;a&gt;<a>上传文件&lt;/a&gt;</a></p>",
+          "htmlContent" : "<p>点击此处&nbsp; &lt;a&gt;<a>上传文件&lt;/a&gt;</a></p>",
          "itemStyle" : "DEFAULT",
          "itemType" : "RAWITEM",
          "name" : "upload_raw",
@@ -162,7 +162,7 @@
            "layout" : "FLEX"
          },
          "getPSRawItem" : {
-            "content" : "<p>点击此处&lt;a&gt;<a>上传文件&lt;/a&gt;</a></p>",
+            "content" : "<p>点击此处&nbsp; &lt;a&gt;<a>上传文件&lt;/a&gt;</a></p>",
            "contentType" : "HTML",
            "name" : "upload_raw",
            "predefinedType" : "STATIC_TEXT"