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

a4de33f7 · ibizdev · b9ddff70 · a4de33f7 · a4de33f7 · a4de33f7
--- 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,6 +23,9 @@
  }, {
    "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/PSMODULES/Test/PSCODELISTS/UsrCodeList0218851772.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSCODELISTS/UsrCodeList0218851772.json
+{
+  "codeListTag" : "Test__UsrCodeList0218851772",
+  "codeListType" : "STATIC",
+  "codeName" : "UsrCodeList0218851772",
+  "dynaInstMode" : 0,
+  "dynaModelFilePath" : "PSMODULES/Test/PSCODELISTS/UsrCodeList0218851772.json",
+  "emptyText" : "未定义",
+  "name" : "关注状态",
+  "getPSCodeItems" : [ {
+    "codeName" : "Item_10",
+    "memo" : "不关注，只有当评论中有人@提及时接收通知",
+    "text" : "不关注",
+    "value" : "10"
+  }, {
+    "codeName" : "Item_20",
+    "memo" : "保持关注并接收所有的通知",
+    "text" : "关注",
+    "value" : "20"
+  } ],
+  "getPSSystemModule" : {
+    "modelref" : true,
+    "path" : "PSMODULES/Test.json"
+  },
+  "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/PSSYSAPPS/Web/PSAPPCODELISTS/Test__UsrCodeList0218851772.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPCODELISTS/Test__UsrCodeList0218851772.json
+{
+  "codeListTag" : "Test__UsrCodeList0218851772",
+  "codeListType" : "STATIC",
+  "codeName" : "Test__UsrCodeList0218851772",
+  "dynaInstMode" : 0,
+  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPCODELISTS/Test__UsrCodeList0218851772.json",
+  "emptyText" : "未定义",
+  "name" : "关注状态",
+  "getPSCodeItems" : [ {
+    "codeName" : "Item_10",
+    "memo" : "不关注，只有当评论中有人@提及时接收通知",
+    "text" : "不关注",
+    "value" : "10"
+  }, {
+    "codeName" : "Item_20",
+    "memo" : "保持关注并接收所有的通知",
+    "text" : "关注",
+    "value" : "20"
+  } ],
+  "enableCache" : true
+}
\ No newline at end of file
--- 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
@@ -21,6 +21,10 @@
    }, {
      "id" : "field_picker",
      "viewFieldName" : "UPDATEMAN"
+    }, {
+      "id" : "field_picker1"
+    }, {
+      "id" : "field_dropdownlist"
    } ],
    "codeName" : "Usr1221816596",
    "controlType" : "VIEWLAYOUTPANEL",
@@ -200,6 +204,145 @@
        "layout" : "FLEX"
      },
      "showCaption" : true
+    }, {
+      "caption" : "栅格容器",
+      "itemStyle" : "DEFAULT",
+      "itemType" : "CONTAINER",
+      "name" : "container_grid",
+      "getPSLayout" : {
+        "layout" : "SIMPLEFLEX"
+      },
+      "getPSLayoutPos" : {
+        "grow" : -1,
+        "layout" : "FLEX"
+      },
+      "getPSPanelItems" : [ {
+        "caption" : "面板容器",
+        "itemStyle" : "DEFAULT",
+        "itemType" : "CONTAINER",
+        "name" : "container",
+        "getPSLayout" : {
+          "childColLG" : -1,
+          "childColMD" : 24,
+          "childColSM" : -1,
+          "childColXS" : -1,
+          "columnCount" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "getPSLayoutPos" : {
+          "grow" : 8,
+          "layout" : "SIMPLEFLEX"
+        },
+        "getPSPanelItems" : [ {
+          "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
+        } ]
+      }, {
+        "caption" : "面板容器",
+        "itemStyle" : "DEFAULT",
+        "itemType" : "CONTAINER",
+        "name" : "container1",
+        "getPSLayout" : {
+          "childColLG" : -1,
+          "childColMD" : 24,
+          "childColSM" : -1,
+          "childColXS" : -1,
+          "columnCount" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "getPSLayoutPos" : {
+          "grow" : 4,
+          "layout" : "SIMPLEFLEX"
+        },
+        "getPSPanelItems" : [ {
+          "caption" : "容器",
+          "itemStyle" : "DEFAULT",
+          "itemType" : "CONTAINER",
+          "name" : "container2",
+          "getPSLayout" : {
+            "layout" : "FLEX"
+          },
+          "getPSLayoutPos" : {
+            "colMD" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "getPSPanelItems" : [ {
+            "caption" : "数据选择",
+            "itemStyle" : "DEFAULT",
+            "itemType" : "FIELD",
+            "name" : "field_picker1",
+            "getPSEditor" : {
+              "editorParams" : {
+                "AC" : "TRUE",
+                "TRIGGER" : "TRUE",
+                "PICKUPVIEW" : "FALSE"
+              },
+              "editorStyle" : "PERSONEL_SELECT_PROJECT",
+              "editorType" : "PICKEREX_TRIGGER",
+              "name" : "field_picker1",
+              "getPSSysPFPlugin" : {
+                "pluginType" : "EDITOR_CUSTOMSTYLE",
+                "pluginCode" : "PERSON_SELECT",
+                "runtimeObject" : true
+              },
+              "predefinedType" : "FIELD_PICKER",
+              "enableAC" : true,
+              "enablePickupView" : false,
+              "forceSelection" : true,
+              "showTrigger" : true,
+              "singleSelect" : true
+            },
+            "getPSLayoutPos" : {
+              "grow" : -1,
+              "hAlignSelf" : "LEFT",
+              "layout" : "FLEX",
+              "vAlignSelf" : "TOP"
+            },
+            "hidden" : false,
+            "showCaption" : false
+          }, {
+            "caption" : "下拉列表框",
+            "itemStyle" : "DEFAULT",
+            "itemType" : "FIELD",
+            "name" : "field_dropdownlist",
+            "getPSEditor" : {
+              "editorType" : "DROPDOWNLIST",
+              "name" : "field_dropdownlist",
+              "getPSAppCodeList" : {
+                "modelref" : true,
+                "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/Test__UsrCodeList0218851772.json"
+              },
+              "predefinedType" : "FIELD_DROPDOWNLIST",
+              "singleSelect" : true
+            },
+            "getPSLayoutPos" : {
+              "grow" : -1,
+              "hAlignSelf" : "RIGHT",
+              "layout" : "FLEX",
+              "vAlignSelf" : "TOP"
+            },
+            "hidden" : false,
+            "showCaption" : false
+          } ]
+        } ]
+      } ],
+      "predefinedType" : "CONTAINER_GRID"
    } ],
    "layoutBodyOnly" : false,
    "layoutPanel" : true,

--- 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
@@ -549,6 +549,26 @@
      "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",
+      "memo" : "不关注，只有当评论中有人@提及时接收通知",
+      "text" : "不关注",
+      "value" : "10"
+    }, {
+      "codeName" : "Item_20",
+      "memo" : "保持关注并接收所有的通知",
+      "text" : "关注",
+      "value" : "20"
+    } ],
+    "enableCache" : true
  }, {
    "codeListTag" : "Test__UsrCodeList1225197182",
    "codeListType" : "STATIC",
@@ -2878,6 +2898,18 @@
    },
    "pluginCode" : "ORGSELECT",
    "styleCode" : "ORGSELECT"
+  }, {
+    "codeName" : "PERSONEL_SELECT_PROJECT",
+    "containerType" : "PANELFIELD",
+    "editorType" : "PICKEREX_TRIGGER",
+    "name" : "人员选择器（项目）",
+    "getPSSysPFPlugin" : {
+      "pluginType" : "EDITOR_CUSTOMSTYLE",
+      "pluginCode" : "PERSON_SELECT",
+      "runtimeObject" : true
+    },
+    "pluginCode" : "PERSON_SELECT",
+    "styleCode" : "PERSONEL_SELECT_PROJECT"
  }, {
    "codeName" : "PROGRESS",
    "containerType" : "FORMITEM",
@@ -5755,6 +5787,19 @@
    "rTObjectRepo" : "@ibiz-template-plugin/person-select@0.0.10-alpha.9",
    "refMode" : "EDITORSTYPE",
    "runtimeObject" : true
+  }, {
+    "name" : "人员选择2",
+    "getPSSysPFPlugin" : {
+      "pluginType" : "EDITOR_CUSTOMSTYLE",
+      "pluginCode" : "PERSON_SELECT",
+      "runtimeObject" : true
+    },
+    "pluginCode" : "PERSON_SELECT",
+    "pluginType" : "EDITOR_CUSTOMSTYLE",
+    "rTObjectName" : "IBizPersonelSelect",
+    "rTObjectRepo" : "@ibiz-template-plm/person-select@0.0.2-dev.65",
+    "refMode" : "EDITORSTYPE",
+    "runtimeObject" : true
  }, {
    "name" : "代码表表格列绘制插件",
    "getPSSysPFPlugin" : {
@@ -13664,22 +13709,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"
      }
    } ]
  }, {
@@ -13724,6 +13769,18 @@
    "codeName" : "VMGroup8",
    "name" : "【静态测试】",
    "getPSAppViewMsgGroupDetails" : [ {
+      "name" : "关闭模式-默认删除-上方-错误",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg12"
+      }
+    }, {
+      "name" : "消息位置-视图内容区",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg9"
+      }
+    }, {
      "name" : "消息位置-视图下方",
      "getPSAppViewMsg" : {
        "modelref" : true,
@@ -13749,13 +13806,6 @@
        "id" : "ViewMsg6"
      },
      "position" : "POPUP"
-    }, {
-      "name" : "消息类型-常规信息",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg4"
-      },
-      "position" : "POPUP"
    }, {
      "name" : "关闭模式-无删除-上方-常规",
      "getPSAppViewMsg" : {
@@ -13763,28 +13813,17 @@
        "id" : "ViewMsg11"
      }
    }, {
-      "name" : "消息位置-视图内容区",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg9"
-      }
-    }, {
-      "name" : "关闭模式-默认删除-上方-错误",
+      "name" : "消息类型-常规信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg12"
-      }
+        "id" : "ViewMsg4"
+      },
+      "position" : "POPUP"
    } ]
  }, {
    "codeName" : "VMGroup5",
    "name" : "视图消息关闭模式",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-默认删除",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg12"
-      }
-    }, {
      "name" : "关闭模式-无删除",
      "getPSAppViewMsg" : {
        "modelref" : true,
@@ -13796,6 +13835,12 @@
        "modelref" : true,
        "id" : "ViewMsg13"
      }
+    }, {
+      "name" : "关闭模式-默认删除",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg12"
+      }
    } ]
  }, {
    "codeName" : "VMGroup6",
--- 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
@@ -256,6 +256,19 @@
    "rTObjectRepo" : "@ibiz-template-plugin/person-select@0.0.10-alpha.9",
    "refMode" : "EDITORSTYPE",
    "runtimeObject" : true
+  }, {
+    "name" : "人员选择2",
+    "getPSSysPFPlugin" : {
+      "pluginType" : "EDITOR_CUSTOMSTYLE",
+      "pluginCode" : "PERSON_SELECT",
+      "runtimeObject" : true
+    },
+    "pluginCode" : "PERSON_SELECT",
+    "pluginType" : "EDITOR_CUSTOMSTYLE",
+    "rTObjectName" : "IBizPersonelSelect",
+    "rTObjectRepo" : "@ibiz-template-plm/person-select@0.0.2-dev.65",
+    "refMode" : "EDITORSTYPE",
+    "runtimeObject" : true
  }, {
    "name" : "代码表表格列绘制插件",
    "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
@@ -222,6 +222,9 @@
  }, {
    "modelref" : true,
    "path" : "PSCODELISTS/CodeListTodoState.json"
+  }, {
+    "modelref" : true,
+    "path" : "PSMODULES/Test/PSCODELISTS/UsrCodeList0218851772.json"
  }, {
    "modelref" : true,
    "path" : "PSCODELISTS/CodeList16.json"
@@ -1127,6 +1130,20 @@
    },
    "styleCode" : "ALLEMPSELECT",
    "replaceDefault" : false
+  }, {
+    "codeName" : "PERSONEL_SELECT_PROJECT",
+    "dynaModelFilePath" : "PSSYSEDITORSTYLES/PERSONEL_SELECT_PROJECT.json",
+    "editorHeight" : -1.0,
+    "editorType" : "PICKEREX_TRIGGER",
+    "editorWidth" : -1.0,
+    "name" : "人员选择器（项目）",
+    "getPSSysPFPlugin" : {
+      "pluginType" : "EDITOR_CUSTOMSTYLE",
+      "pluginCode" : "PERSON_SELECT",
+      "runtimeObject" : true
+    },
+    "styleCode" : "PERSONEL_SELECT_PROJECT",
+    "replaceDefault" : false
  }, {
    "codeName" : "Auto8",
    "dynaModelFilePath" : "PSSYSEDITORSTYLES/Auto8.json",
@@ -1444,6 +1461,9 @@
    }, {
      "modelref" : true,
      "path" : "PSMODULES/Test/PSCODELISTS/CodeList120.json"
+    }, {
+      "modelref" : true,
+      "path" : "PSMODULES/Test/PSCODELISTS/UsrCodeList0218851772.json"
    }, {
      "modelref" : true,
      "path" : "PSMODULES/Test/PSCODELISTS/WFStatus.json"