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

515293e0 · ibizdev · 53e8bc0f · 515293e0 · 515293e0 · 515293e0
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSCODELISTS/Formula_type.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSCODELISTS/Formula_type.json
+{
+  "codeListTag" : "Formula_type",
+  "codeListType" : "STATIC",
+  "codeName" : "Formula_type",
+  "dynaInstMode" : 0,
+  "dynaModelFilePath" : "PSCODELISTS/Formula_type.json",
+  "emptyText" : "未定义",
+  "name" : "公式类型",
+  "getPSCodeItems" : [ {
+    "codeName" : "Uncondition",
+    "text" : "无条件公式",
+    "value" : "uncondition"
+  }, {
+    "codeName" : "Multicondition",
+    "text" : "多条件公式",
+    "value" : "multicondition"
+  }, {
+    "codeName" : "Advanced",
+    "text" : "高级公式",
+    "value" : "advanced"
+  } ],
+  "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/Formula_type.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPCODELISTS/Formula_type.json
+{
+  "codeListTag" : "Formula_type",
+  "codeListType" : "STATIC",
+  "codeName" : "Formula_type",
+  "dynaInstMode" : 0,
+  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPCODELISTS/Formula_type.json",
+  "emptyText" : "未定义",
+  "name" : "公式类型",
+  "getPSCodeItems" : [ {
+    "codeName" : "Uncondition",
+    "text" : "无条件公式",
+    "value" : "uncondition"
+  }, {
+    "codeName" : "Multicondition",
+    "text" : "多条件公式",
+    "value" : "multicondition"
+  }, {
+    "codeName" : "Advanced",
+    "text" : "高级公式",
+    "value" : "advanced"
+  } ],
+  "enableCache" : true
+}
\ No newline at end of file
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSFORMS/UsrTestFormLYEditView_Form.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSFORMS/UsrTestFormLYEditView_Form.json
@@ -134,6 +134,14 @@
    "id" : "formitem66",
    "hidden" : true,
    "dataType" : 25
+  }, {
+    "id" : "formula_type",
+    "dataType" : 25,
+    "createDV" : "uncondition",
+    "updateDV" : "uncondition"
+  }, {
+    "id" : "formitem17",
+    "dataType" : 25
  }, {
    "id" : "formitem1",
    "dataType" : 25
@@ -302,6 +310,71 @@
        },
        "allowEmpty" : true,
        "hidden" : true
+      }, {
+        "caption" : "公式类型",
+        "codeName" : "formula_type",
+        "createDV" : "uncondition",
+        "dataType" : 25,
+        "detailStyle" : "DEFAULT",
+        "detailType" : "FORMITEM",
+        "enableCond" : 3,
+        "ignoreInput" : 0,
+        "labelPos" : "LEFT",
+        "labelWidth" : 130,
+        "name" : "formula_type",
+        "noPrivDisplayMode" : 1,
+        "getPSEditor" : {
+          "editorType" : "RADIOBUTTONLIST",
+          "name" : "formula_type",
+          "getPSAppCodeList" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/Formula_type.json"
+          }
+        },
+        "getPSLayoutPos" : {
+          "grow" : -1,
+          "layout" : "FLEX"
+        },
+        "updateDV" : "uncondition",
+        "allowEmpty" : true,
+        "needCodeListConfig" : true,
+        "showCaption" : true
+      }, {
+        "caption" : "公式计算",
+        "codeName" : "formitem17",
+        "dataType" : 25,
+        "detailStyle" : "DEFAULT",
+        "detailType" : "FORMITEM",
+        "enableCond" : 3,
+        "ignoreInput" : 0,
+        "labelPos" : "LEFT",
+        "labelWidth" : 130,
+        "name" : "formitem17",
+        "noPrivDisplayMode" : 1,
+        "getPSEditor" : {
+          "editorParams" : {
+            "typeName" : "formula_type",
+            "valueNames" : "[\"bookname\"]"
+          },
+          "editorStyle" : "FORMULA",
+          "editorType" : "TEXTBOX",
+          "name" : "formitem17",
+          "getPSSysPFPlugin" : {
+            "pluginType" : "EDITOR_CUSTOMSTYLE",
+            "pluginCode" : "FORMULA",
+            "runtimeObject" : true
+          }
+        },
+        "getPSLayoutPos" : {
+          "grow" : -1,
+          "layout" : "FLEX"
+        },
+        "getPSSysImage" : {
+          "glyph" : "xf1d9@FontAwesome",
+          "cssClass" : "fa fa-send-o"
+        },
+        "allowEmpty" : true,
+        "showCaption" : true
      }, {
        "codeName" : "grouppanel2",
        "detailStyle" : "DEFAULT",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsrTestFormLYEditView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsrTestFormLYEditView.json
@@ -1345,6 +1345,14 @@
        "id" : "formitem66",
        "hidden" : true,
        "dataType" : 25
+      }, {
+        "id" : "formula_type",
+        "dataType" : 25,
+        "createDV" : "uncondition",
+        "updateDV" : "uncondition"
+      }, {
+        "id" : "formitem17",
+        "dataType" : 25
      }, {
        "id" : "formitem1",
        "dataType" : 25
@@ -1513,6 +1521,71 @@
            },
            "allowEmpty" : true,
            "hidden" : true
+          }, {
+            "caption" : "公式类型",
+            "codeName" : "formula_type",
+            "createDV" : "uncondition",
+            "dataType" : 25,
+            "detailStyle" : "DEFAULT",
+            "detailType" : "FORMITEM",
+            "enableCond" : 3,
+            "ignoreInput" : 0,
+            "labelPos" : "LEFT",
+            "labelWidth" : 130,
+            "name" : "formula_type",
+            "noPrivDisplayMode" : 1,
+            "getPSEditor" : {
+              "editorType" : "RADIOBUTTONLIST",
+              "name" : "formula_type",
+              "getPSAppCodeList" : {
+                "modelref" : true,
+                "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/Formula_type.json"
+              }
+            },
+            "getPSLayoutPos" : {
+              "grow" : -1,
+              "layout" : "FLEX"
+            },
+            "updateDV" : "uncondition",
+            "allowEmpty" : true,
+            "needCodeListConfig" : true,
+            "showCaption" : true
+          }, {
+            "caption" : "公式计算",
+            "codeName" : "formitem17",
+            "dataType" : 25,
+            "detailStyle" : "DEFAULT",
+            "detailType" : "FORMITEM",
+            "enableCond" : 3,
+            "ignoreInput" : 0,
+            "labelPos" : "LEFT",
+            "labelWidth" : 130,
+            "name" : "formitem17",
+            "noPrivDisplayMode" : 1,
+            "getPSEditor" : {
+              "editorParams" : {
+                "typeName" : "formula_type",
+                "valueNames" : "[\"bookname\"]"
+              },
+              "editorStyle" : "FORMULA",
+              "editorType" : "TEXTBOX",
+              "name" : "formitem17",
+              "getPSSysPFPlugin" : {
+                "pluginType" : "EDITOR_CUSTOMSTYLE",
+                "pluginCode" : "FORMULA",
+                "runtimeObject" : true
+              }
+            },
+            "getPSLayoutPos" : {
+              "grow" : -1,
+              "layout" : "FLEX"
+            },
+            "getPSSysImage" : {
+              "glyph" : "xf1d9@FontAwesome",
+              "cssClass" : "fa fa-send-o"
+            },
+            "allowEmpty" : true,
+            "showCaption" : true
          }, {
            "codeName" : "grouppanel2",
            "detailStyle" : "DEFAULT",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSTEM.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSTEM.json
@@ -162,6 +162,9 @@
  }, {
    "modelref" : true,
    "path" : "PSCODELISTS/CodeList89.json"
+  }, {
+    "modelref" : true,
+    "path" : "PSCODELISTS/Formula_type.json"
  }, {
    "modelref" : true,
    "path" : "PSCODELISTS/CodeList2.json"