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

eedbeeb0 · ibizdev · 5c63e772 · eedbeeb0 · eedbeeb0 · eedbeeb0
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSCODELISTS/Follow_state.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSCODELISTS/Follow_state.json
+{
+  "codeListTag" : "Follow_state",
+  "codeListType" : "STATIC",
+  "codeName" : "Follow_state",
+  "dynaInstMode" : 0,
+  "dynaModelFilePath" : "PSCODELISTS/Follow_state.json",
+  "emptyText" : "未定义",
+  "name" : "关注状态",
+  "getPSCodeItems" : [ {
+    "codeName" : "Item_10",
+    "text" : "不关注",
+    "tooltip" : "不关注，只有当评论中有人@提及时接收通知",
+    "userData" : "0",
+    "value" : "10"
+  }, {
+    "codeName" : "Item_20",
+    "text" : "关注",
+    "tooltip" : "保持关注并接收所有的通知",
+    "value" : "20"
+  } ],
+  "refFlag" : true,
+  "systemTag" : "TrainSys",
+  "codeItemValueNumber" : false,
+  "enableCache" : true,
+  "subSysAsCloud" : false,
+  "subSysCodeList" : false,
+  "userScope" : false
+}
\ No newline at end of file
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test.json
@@ -23,9 +23,6 @@
  }, {
    "modelref" : true,
    "path" : "PSMODULES/Test/PSCODELISTS/CodeList120.json"
-  }, {
-    "modelref" : true,
-    "path" : "PSMODULES/Test/PSCODELISTS/UsrCodeList0218851772.json"
  }, {
    "modelref" : true,
    "path" : "PSMODULES/Test/PSCODELISTS/WFStatus.json"

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPCODELISTS/Follow_state.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPCODELISTS/Follow_state.json
+{
+  "codeListTag" : "Follow_state",
+  "codeListType" : "STATIC",
+  "codeName" : "Follow_state",
+  "dynaInstMode" : 0,
+  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPCODELISTS/Follow_state.json",
+  "emptyText" : "未定义",
+  "name" : "关注状态",
+  "getPSCodeItems" : [ {
+    "codeName" : "Item_10",
+    "text" : "不关注",
+    "tooltip" : "不关注，只有当评论中有人@提及时接收通知",
+    "userData" : "0",
+    "value" : "10"
+  }, {
+    "codeName" : "Item_20",
+    "text" : "关注",
+    "tooltip" : "保持关注并接收所有的通知",
+    "value" : "20"
+  } ],
+  "enableCache" : true
+}
\ No newline at end of file
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSDATAVIEWS/Usr09211294DataView_DataView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSDATAVIEWS/Usr09211294DataView_DataView.json
@@ -403,6 +403,34 @@
        "viewFieldName" : "TYPE",
        "hidden" : false,
        "showCaption" : false
+      }, {
+        "actionType" : "NONE",
+        "buttonStyle" : "SUCCESS",
+        "caption" : "按钮1",
+        "itemStyle" : "SUCCESS",
+        "itemType" : "BUTTON",
+        "name" : "button_calluilogic",
+        "getPSLayoutPos" : {
+          "grow" : -1,
+          "layout" : "FLEX"
+        },
+        "tooltip" : "按钮1",
+        "uIActionTarget" : "NONE",
+        "showCaption" : true
+      }, {
+        "actionType" : "NONE",
+        "buttonStyle" : "STYLE2",
+        "caption" : "按钮2",
+        "itemStyle" : "STYLE2",
+        "itemType" : "BUTTON",
+        "name" : "button_calluilogic1",
+        "getPSLayoutPos" : {
+          "grow" : -1,
+          "layout" : "FLEX"
+        },
+        "tooltip" : "按钮2",
+        "uIActionTarget" : "NONE",
+        "showCaption" : true
      } ]
    } ],
    "name" : "itemlayoutpanel",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSFORMS/EditorPluginForm.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSFORMS/EditorPluginForm.json
@@ -192,6 +192,42 @@
        },
        "allowEmpty" : false,
        "showCaption" : true
+      }, {
+        "actionType" : "UIACTION",
+        "caption" : "111",
+        "codeName" : "button1",
+        "detailStyle" : "STYLE2",
+        "detailType" : "BUTTON",
+        "name" : "button1",
+        "getPSAppViewUIAction" : {
+          "modelref" : true,
+          "id" : "form_button1"
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "getPSUIAction" : {
+          "actionTarget" : "NONE",
+          "caption" : "百度",
+          "codeName" : "openBaidu",
+          "counterId" : "openBaidu",
+          "frontProcessType" : "OPENHTMLPAGE",
+          "fullCodeName" : "openBaidu",
+          "htmlPageUrl" : "https://www.baidu.com/",
+          "name" : "百度",
+          "getPSAppCounter" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPCOUNTERS/UIActionCounter.json"
+          },
+          "timeout" : 60000,
+          "uIActionMode" : "FRONT",
+          "uIActionTag" : "openBaidu",
+          "uIActionType" : "DEUIACTION"
+        },
+        "tooltip" : "111",
+        "uIActionTarget" : "NONE",
+        "showCaption" : true
      } ],
      "getPSLayout" : {
        "childColLG" : -1,

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSPANELS/Usr0921642315.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSPANELS/Usr0921642315.json
@@ -190,6 +190,34 @@
      "viewFieldName" : "TYPE",
      "hidden" : false,
      "showCaption" : false
+    }, {
+      "actionType" : "NONE",
+      "buttonStyle" : "SUCCESS",
+      "caption" : "按钮1",
+      "itemStyle" : "SUCCESS",
+      "itemType" : "BUTTON",
+      "name" : "button_calluilogic",
+      "getPSLayoutPos" : {
+        "grow" : -1,
+        "layout" : "FLEX"
+      },
+      "tooltip" : "按钮1",
+      "uIActionTarget" : "NONE",
+      "showCaption" : true
+    }, {
+      "actionType" : "NONE",
+      "buttonStyle" : "STYLE2",
+      "caption" : "按钮2",
+      "itemStyle" : "STYLE2",
+      "itemType" : "BUTTON",
+      "name" : "button_calluilogic1",
+      "getPSLayoutPos" : {
+        "grow" : -1,
+        "layout" : "FLEX"
+      },
+      "tooltip" : "按钮2",
+      "uIActionTarget" : "NONE",
+      "showCaption" : true
    } ]
  } ],
  "modelid" : "387C268C-5493-45DB-AC88-4B58D9E65DAB",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTGRIDUsr12216129TestCustomView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTGRIDUsr12216129TestCustomView.json
@@ -359,7 +359,7 @@
                "name" : "field_dropdownlist",
                "getPSAppCodeList" : {
                  "modelref" : true,
-                  "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/Test__UsrCodeList0218851772.json"
+                  "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/Follow_state.json"
                },
                "getPSSysPFPlugin" : {
                  "pluginType" : "EDITOR_CUSTOMSTYLE",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr09211294DataView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr09211294DataView.json
@@ -929,6 +929,34 @@
          "viewFieldName" : "TYPE",
          "hidden" : false,
          "showCaption" : false
+        }, {
+          "actionType" : "NONE",
+          "buttonStyle" : "SUCCESS",
+          "caption" : "按钮1",
+          "itemStyle" : "SUCCESS",
+          "itemType" : "BUTTON",
+          "name" : "button_calluilogic",
+          "getPSLayoutPos" : {
+            "grow" : -1,
+            "layout" : "FLEX"
+          },
+          "tooltip" : "按钮1",
+          "uIActionTarget" : "NONE",
+          "showCaption" : true
+        }, {
+          "actionType" : "NONE",
+          "buttonStyle" : "STYLE2",
+          "caption" : "按钮2",
+          "itemStyle" : "STYLE2",
+          "itemType" : "BUTTON",
+          "name" : "button_calluilogic1",
+          "getPSLayoutPos" : {
+            "grow" : -1,
+            "layout" : "FLEX"
+          },
+          "tooltip" : "按钮2",
+          "uIActionTarget" : "NONE",
+          "showCaption" : true
        } ]
      } ],
      "name" : "itemlayoutpanel",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr2EditView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr2EditView.json
@@ -777,6 +777,42 @@
          },
          "allowEmpty" : false,
          "showCaption" : true
+        }, {
+          "actionType" : "UIACTION",
+          "caption" : "111",
+          "codeName" : "button1",
+          "detailStyle" : "STYLE2",
+          "detailType" : "BUTTON",
+          "name" : "button1",
+          "getPSAppViewUIAction" : {
+            "modelref" : true,
+            "id" : "form_button1"
+          },
+          "getPSLayoutPos" : {
+            "colMD" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "getPSUIAction" : {
+            "actionTarget" : "NONE",
+            "caption" : "百度",
+            "codeName" : "openBaidu",
+            "counterId" : "openBaidu",
+            "frontProcessType" : "OPENHTMLPAGE",
+            "fullCodeName" : "openBaidu",
+            "htmlPageUrl" : "https://www.baidu.com/",
+            "name" : "百度",
+            "getPSAppCounter" : {
+              "modelref" : true,
+              "path" : "PSSYSAPPS/Web/PSAPPCOUNTERS/UIActionCounter.json"
+            },
+            "timeout" : 60000,
+            "uIActionMode" : "FRONT",
+            "uIActionTag" : "openBaidu",
+            "uIActionType" : "DEUIACTION"
+          },
+          "tooltip" : "111",
+          "uIActionTarget" : "NONE",
+          "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
@@ -159,6 +159,27 @@
      "value" : "CANCELED"
    } ],
    "enableCache" : true
+  }, {
+    "codeListTag" : "Follow_state",
+    "codeListType" : "STATIC",
+    "codeName" : "Follow_state",
+    "dynaInstMode" : 0,
+    "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPCODELISTS/Follow_state.json",
+    "emptyText" : "未定义",
+    "name" : "关注状态",
+    "getPSCodeItems" : [ {
+      "codeName" : "Item_10",
+      "text" : "不关注",
+      "tooltip" : "不关注，只有当评论中有人@提及时接收通知",
+      "userData" : "0",
+      "value" : "10"
+    }, {
+      "codeName" : "Item_20",
+      "text" : "关注",
+      "tooltip" : "保持关注并接收所有的通知",
+      "value" : "20"
+    } ],
+    "enableCache" : true
  }, {
    "codeListTag" : "ModelRepository__CodeList44",
    "codeListType" : "STATIC",
@@ -549,27 +570,6 @@
      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXDMX2.json"
    },
    "enableCache" : true
-  }, {
-    "codeListTag" : "Test__UsrCodeList0218851772",
-    "codeListType" : "STATIC",
-    "codeName" : "Test__UsrCodeList0218851772",
-    "dynaInstMode" : 0,
-    "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPCODELISTS/Test__UsrCodeList0218851772.json",
-    "emptyText" : "未定义",
-    "name" : "关注状态",
-    "getPSCodeItems" : [ {
-      "codeName" : "Item_10",
-      "text" : "不关注",
-      "tooltip" : "不关注，只有当评论中有人@提及时接收通知",
-      "userData" : "0",
-      "value" : "10"
-    }, {
-      "codeName" : "Item_20",
-      "text" : "关注",
-      "tooltip" : "保持关注并接收所有的通知",
-      "value" : "20"
-    } ],
-    "enableCache" : true
  }, {
    "codeListTag" : "Test__UsrCodeList1225197182",
    "codeListType" : "STATIC",
@@ -5670,7 +5670,7 @@
    "refTag2" : "DEFGRIDCOLUMN",
    "runtimeObject" : true
  }, {
-    "name" : "关注（下拉选择）",
+    "name" : "关注",
    "getPSSysPFPlugin" : {
      "pluginType" : "EDITOR_CUSTOMSTYLE",
      "pluginCode" : "FOLLOW",
@@ -13256,10 +13256,10 @@
    "codeName" : "VMGroup3",
    "name" : "视图消息类型测试",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-常规信息",
+      "name" : "消息类型-警告信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg4"
+        "id" : "ViewMsg5"
      }
    }, {
      "name" : "消息类型-错误信息",
@@ -13268,10 +13268,10 @@
        "id" : "ViewMsg6"
      }
    }, {
-      "name" : "消息类型-警告信息",
+      "name" : "消息类型-常规信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg5"
+        "id" : "ViewMsg4"
      }
    } ]
  }, {
@@ -13294,16 +13294,16 @@
        "id" : "ViewMsg7"
      }
    }, {
-      "name" : "消息位置-弹出",
+      "name" : "消息位置-视图下方",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg10"
+        "id" : "ViewMsg8"
      }
    }, {
-      "name" : "消息位置-视图下方",
+      "name" : "消息位置-弹出",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg10"
      }
    }, {
      "name" : "消息位置-视图内容区",
@@ -13316,65 +13316,65 @@
    "codeName" : "VMGroup8",
    "name" : "【静态测试】",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-警告信息",
+      "name" : "关闭模式-默认删除-上方-错误",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg5"
+        "id" : "ViewMsg12"
-      },
+      }
-      "position" : "POPUP"
    }, {
-      "name" : "消息类型-错误信息",
+      "name" : "消息位置-视图内容区",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg6"
+        "id" : "ViewMsg9"
-      },
+      }
-      "position" : "POPUP"
    }, {
-      "name" : "消息类型-常规信息",
+      "name" : "消息类型-警告信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg4"
+        "id" : "ViewMsg5"
      },
      "position" : "POPUP"
    }, {
-      "name" : "关闭模式-无删除-上方-常规",
+      "name" : "关闭模式-本次删除-上方-警告",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg13"
      }
    }, {
-      "name" : "消息位置-视图内容区",
+      "name" : "消息类型-错误信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg9"
+        "id" : "ViewMsg6"
-      }
+      },
+      "position" : "POPUP"
    }, {
-      "name" : "关闭模式-默认删除-上方-错误",
+      "name" : "消息位置-视图下方",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg12"
+        "id" : "ViewMsg8"
      }
    }, {
-      "name" : "消息位置-视图下方",
+      "name" : "关闭模式-无删除-上方-常规",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg11"
      }
    }, {
-      "name" : "关闭模式-本次删除-上方-警告",
+      "name" : "消息类型-常规信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg13"
+        "id" : "ViewMsg4"
-      }
+      },
+      "position" : "POPUP"
    } ]
  }, {
    "codeName" : "VMGroup5",
    "name" : "视图消息关闭模式",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-默认删除",
+      "name" : "关闭模式-本次删除",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg12"
+        "id" : "ViewMsg13"
      }
    }, {
      "name" : "关闭模式-无删除",
@@ -13383,10 +13383,10 @@
        "id" : "ViewMsg11"
      }
    }, {
-      "name" : "关闭模式-本次删除",
+      "name" : "关闭模式-默认删除",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg13"
+        "id" : "ViewMsg12"
      }
    } ]
  }, {
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.simple.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.simple.json
@@ -285,7 +285,7 @@
    "refTag2" : "DEFGRIDCOLUMN",
    "runtimeObject" : true
  }, {
-    "name" : "关注（下拉选择）",
+    "name" : "关注",
    "getPSSysPFPlugin" : {
      "pluginType" : "EDITOR_CUSTOMSTYLE",
      "pluginCode" : "FOLLOW",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSTEM.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSTEM.json
@@ -224,7 +224,7 @@
    "path" : "PSCODELISTS/CodeListTodoState.json"
  }, {
    "modelref" : true,
-    "path" : "PSMODULES/Test/PSCODELISTS/UsrCodeList0218851772.json"
+    "path" : "PSCODELISTS/Follow_state.json"
  }, {
    "modelref" : true,
    "path" : "PSCODELISTS/CodeList16.json"
@@ -1481,9 +1481,6 @@
    }, {
      "modelref" : true,
      "path" : "PSMODULES/Test/PSCODELISTS/CodeList120.json"
-    }, {
-      "modelref" : true,
-      "path" : "PSMODULES/Test/PSCODELISTS/UsrCodeList0218851772.json"
    }, {
      "modelref" : true,
      "path" : "PSMODULES/Test/PSCODELISTS/WFStatus.json"