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

eb7d8405 · ibizdev · 226beeff · eb7d8405 · eb7d8405 · eb7d8405
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD2/PSFORMS/Main.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD2/PSFORMS/Main.json
@@ -226,7 +226,8 @@
          "name" : "formitem",
          "getPSSysPFPlugin" : {
            "pluginType" : "EDITOR_CUSTOMSTYLE",
-            "pluginCode" : "formulaEditor"
+            "pluginCode" : "formulaEditor",
+            "runtimeObject" : true
          },
          "showMaxLength" : true
        },

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TESTGRID/PSLISTS/Test_List.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TESTGRID/PSLISTS/Test_List.json
@@ -117,13 +117,17 @@
        "itemType" : "FIELD",
        "name" : "updateman",
        "getPSControlRenders" : [ {
-          "layoutPanelModel" : "`<span class='${util?.confirm?.ns?.b()}'>管理员</span>`",
+          "layoutPanelModel" : "`<span class='${util?.confirm?.ns?.b('custom')}'>管理员</span>`",
          "name" : "logic6",
          "renderType" : "LAYOUTPANEL_MODEL"
        } ],
        "getPSEditor" : {
          "editorType" : "SPAN",
          "name" : "updateman",
+          "getPSAppCodeList" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SysOperator.json"
+          },
          "predefinedType" : "FIELD_TEXT_DYNAMIC",
          "renderMode" : "TEXT_DYNAMIC",
          "enableLinkView" : false
@@ -133,6 +137,7 @@
          "layout" : "FLEX"
        },
        "viewFieldName" : "UPDATEMAN",
+        "convertToCodeItemText" : true,
        "hidden" : false,
        "showCaption" : false
      }, {

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TESTGRID/PSPANELS/Usr0130806471.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TESTGRID/PSPANELS/Usr0130806471.json
@@ -65,13 +65,17 @@
      "itemType" : "FIELD",
      "name" : "updateman",
      "getPSControlRenders" : [ {
-        "layoutPanelModel" : "`<span class='${util?.confirm?.ns?.b()}'>管理员</span>`",
+        "layoutPanelModel" : "`<span class='${util?.confirm?.ns?.b('custom')}'>管理员</span>`",
        "name" : "logic6",
        "renderType" : "LAYOUTPANEL_MODEL"
      } ],
      "getPSEditor" : {
        "editorType" : "SPAN",
        "name" : "updateman",
+        "getPSAppCodeList" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SysOperator.json"
+        },
        "predefinedType" : "FIELD_TEXT_DYNAMIC",
        "renderMode" : "TEXT_DYNAMIC",
        "enableLinkView" : false
@@ -81,6 +85,7 @@
        "layout" : "FLEX"
      },
      "viewFieldName" : "UPDATEMAN",
+      "convertToCodeItemText" : true,
      "hidden" : false,
      "showCaption" : false
    }, {

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/BXD2EditView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/BXD2EditView.json
@@ -929,7 +929,8 @@
            "name" : "formitem",
            "getPSSysPFPlugin" : {
              "pluginType" : "EDITOR_CUSTOMSTYLE",
-              "pluginCode" : "formulaEditor"
+              "pluginCode" : "formulaEditor",
+              "runtimeObject" : true
            },
            "showMaxLength" : true
          },

--- 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
@@ -545,13 +545,17 @@
            "itemType" : "FIELD",
            "name" : "updateman",
            "getPSControlRenders" : [ {
-              "layoutPanelModel" : "`<span class='${util?.confirm?.ns?.b()}'>管理员</span>`",
+              "layoutPanelModel" : "`<span class='${util?.confirm?.ns?.b('custom')}'>管理员</span>`",
              "name" : "logic6",
              "renderType" : "LAYOUTPANEL_MODEL"
            } ],
            "getPSEditor" : {
              "editorType" : "SPAN",
              "name" : "updateman",
+              "getPSAppCodeList" : {
+                "modelref" : true,
+                "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SysOperator.json"
+              },
              "predefinedType" : "FIELD_TEXT_DYNAMIC",
              "renderMode" : "TEXT_DYNAMIC",
              "enableLinkView" : false
@@ -561,6 +565,7 @@
              "layout" : "FLEX"
            },
            "viewFieldName" : "UPDATEMAN",
+            "convertToCodeItemText" : true,
            "hidden" : false,
            "showCaption" : false
          }, {
@@ -845,13 +850,17 @@
            "itemType" : "FIELD",
            "name" : "updateman",
            "getPSControlRenders" : [ {
-              "layoutPanelModel" : "`<span class='${util?.confirm?.ns?.b()}'>管理员</span>`",
+              "layoutPanelModel" : "`<span class='${util?.confirm?.ns?.b('custom')}'>管理员</span>`",
              "name" : "logic6",
              "renderType" : "LAYOUTPANEL_MODEL"
            } ],
            "getPSEditor" : {
              "editorType" : "SPAN",
              "name" : "updateman",
+              "getPSAppCodeList" : {
+                "modelref" : true,
+                "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SysOperator.json"
+              },
              "predefinedType" : "FIELD_TEXT_DYNAMIC",
              "renderMode" : "TEXT_DYNAMIC",
              "enableLinkView" : false
@@ -861,6 +870,7 @@
              "layout" : "FLEX"
            },
            "viewFieldName" : "UPDATEMAN",
+            "convertToCodeItemText" : true,
            "hidden" : false,
            "showCaption" : false
          }, {

--- 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
@@ -2875,7 +2875,8 @@
    "name" : "formula编辑器",
    "getPSSysPFPlugin" : {
      "pluginType" : "EDITOR_CUSTOMSTYLE",
-      "pluginCode" : "formulaEditor"
+      "pluginCode" : "formulaEditor",
+      "runtimeObject" : true
    },
    "pluginCode" : "formulaEditor",
    "styleCode" : "formulaEditor"
@@ -5487,11 +5488,15 @@
    "name" : "formula编辑器插件",
    "getPSSysPFPlugin" : {
      "pluginType" : "EDITOR_CUSTOMSTYLE",
-      "pluginCode" : "formulaEditor"
+      "pluginCode" : "formulaEditor",
+      "runtimeObject" : true
    },
    "pluginCode" : "formulaEditor",
    "pluginType" : "EDITOR_CUSTOMSTYLE",
-    "refMode" : "EDITORSTYPE"
+    "rTObjectName" : "IBizFormulaEditor",
+    "rTObjectRepo" : "@ibiz-template-plugins/formula-editor@0.0.1-dev.1",
+    "refMode" : "EDITORSTYPE",
+    "runtimeObject" : true
  }, {
    "name" : "logicNodePlugin",
    "getPSSysPFPlugin" : {
@@ -13461,22 +13466,22 @@
    "codeName" : "VMGroup3",
    "name" : "视图消息类型测试",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-错误信息",
+      "name" : "消息类型-常规信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg6"
+        "id" : "ViewMsg4"
      }
    }, {
-      "name" : "消息类型-警告信息",
+      "name" : "消息类型-错误信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg5"
+        "id" : "ViewMsg6"
      }
    }, {
-      "name" : "消息类型-常规信息",
+      "name" : "消息类型-警告信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg4"
+        "id" : "ViewMsg5"
      }
    } ]
  }, {
@@ -13493,10 +13498,10 @@
    "codeName" : "VMGroup4",
    "name" : "视图消息位置测试",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息位置-视图下方",
+      "name" : "消息位置-视图上方",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg7"
      }
    }, {
      "name" : "消息位置-弹出",
@@ -13505,81 +13510,81 @@
        "id" : "ViewMsg10"
      }
    }, {
-      "name" : "消息位置-视图内容区",
+      "name" : "消息位置-视图下方",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg9"
+        "id" : "ViewMsg8"
      }
    }, {
-      "name" : "消息位置-视图上方",
+      "name" : "消息位置-视图内容区",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg7"
+        "id" : "ViewMsg9"
      }
    } ]
  }, {
    "codeName" : "VMGroup8",
    "name" : "【静态测试】",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-默认删除-上方-错误",
+      "name" : "消息类型-警告信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg12"
-      }
+        "id" : "ViewMsg5"
+      },
+      "position" : "POPUP"
    }, {
-      "name" : "消息位置-视图内容区",
+      "name" : "消息类型-错误信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg9"
-      }
+        "id" : "ViewMsg6"
+      },
+      "position" : "POPUP"
    }, {
-      "name" : "关闭模式-本次删除-上方-警告",
+      "name" : "关闭模式-无删除-上方-常规",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg13"
+        "id" : "ViewMsg11"
      }
    }, {
-      "name" : "消息类型-错误信息",
+      "name" : "消息类型-常规信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg6"
+        "id" : "ViewMsg4"
      },
      "position" : "POPUP"
    }, {
-      "name" : "消息位置-视图下方",
+      "name" : "关闭模式-默认删除-上方-错误",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg12"
      }
    }, {
-      "name" : "关闭模式-无删除-上方-常规",
+      "name" : "消息位置-视图内容区",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg9"
      }
    }, {
-      "name" : "消息类型-常规信息",
+      "name" : "消息位置-视图下方",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg4"
-      },
-      "position" : "POPUP"
+        "id" : "ViewMsg8"
+      }
    }, {
-      "name" : "消息类型-警告信息",
+      "name" : "关闭模式-本次删除-上方-警告",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg5"
-      },
-      "position" : "POPUP"
+        "id" : "ViewMsg13"
+      }
    } ]
  }, {
    "codeName" : "VMGroup5",
    "name" : "视图消息关闭模式",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-本次删除",
+      "name" : "关闭模式-默认删除",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg13"
+        "id" : "ViewMsg12"
      }
    }, {
      "name" : "关闭模式-无删除",
@@ -13588,26 +13593,26 @@
        "id" : "ViewMsg11"
      }
    }, {
-      "name" : "关闭模式-默认删除",
+      "name" : "关闭模式-本次删除",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg12"
+        "id" : "ViewMsg13"
      }
    } ]
  }, {
    "codeName" : "VMGroup6",
    "name" : "视图消息动态模式测试",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "动态模式-实体数据集",
+      "name" : "动态模式-静态内容",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg14"
+        "id" : "ViewMsg15"
      }
    }, {
-      "name" : "动态模式-静态内容",
+      "name" : "动态模式-实体数据集",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg15"
+        "id" : "ViewMsg14"
      }
    } ]
  } ],
--- 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
@@ -89,11 +89,15 @@
    "name" : "formula编辑器插件",
    "getPSSysPFPlugin" : {
      "pluginType" : "EDITOR_CUSTOMSTYLE",
-      "pluginCode" : "formulaEditor"
+      "pluginCode" : "formulaEditor",
+      "runtimeObject" : true
    },
    "pluginCode" : "formulaEditor",
    "pluginType" : "EDITOR_CUSTOMSTYLE",
-    "refMode" : "EDITORSTYPE"
+    "rTObjectName" : "IBizFormulaEditor",
+    "rTObjectRepo" : "@ibiz-template-plugins/formula-editor@0.0.1-dev.1",
+    "refMode" : "EDITORSTYPE",
+    "runtimeObject" : true
  }, {
    "name" : "logicNodePlugin",
    "getPSSysPFPlugin" : {

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSTEM.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSTEM.json
@@ -959,7 +959,8 @@
    "name" : "formula编辑器",
    "getPSSysPFPlugin" : {
      "pluginType" : "EDITOR_CUSTOMSTYLE",
-      "pluginCode" : "formulaEditor"
+      "pluginCode" : "formulaEditor",
+      "runtimeObject" : true
    },
    "styleCode" : "formulaEditor",
    "replaceDefault" : false