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

af2cbc91 · ibizdev · 38d4545f · af2cbc91 · af2cbc91 · af2cbc91
--- 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
@@ -14,6 +14,9 @@
  }, {
    "modelref" : true,
    "path" : "PSMODULES/Test/PSCODELISTS/TestAll.json"
+  }, {
+    "modelref" : true,
+    "path" : "PSMODULES/Test/PSCODELISTS/All.json"
  }, {
    "modelref" : true,
    "path" : "PSMODULES/Test/PSCODELISTS/ViewMsgPosition.json"

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSCODELISTS/All.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSCODELISTS/All.json
+{
+  "codeListTag" : "Test__All",
+  "codeListType" : "STATIC",
+  "codeName" : "All",
+  "dynaInstMode" : 0,
+  "dynaModelFilePath" : "PSMODULES/Test/PSCODELISTS/All.json",
+  "emptyText" : "未定义",
+  "name" : "全部代码表",
+  "getPSCodeItems" : [ {
+    "codeName" : "All",
+    "text" : "全部",
+    "value" : "all"
+  }, {
+    "codeName" : "Aa",
+    "text" : "宅基地",
+    "value" : "aa"
+  }, {
+    "codeName" : "Bb",
+    "text" : "山地",
+    "value" : "bb"
+  }, {
+    "codeName" : "Cc",
+    "text" : "林地",
+    "value" : "cc"
+  } ],
+  "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__All.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPCODELISTS/Test__All.json
+{
+  "codeListTag" : "Test__All",
+  "codeListType" : "STATIC",
+  "codeName" : "Test__All",
+  "dynaInstMode" : 0,
+  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPCODELISTS/Test__All.json",
+  "emptyText" : "未定义",
+  "name" : "全部代码表",
+  "getPSCodeItems" : [ {
+    "codeName" : "All",
+    "text" : "全部",
+    "value" : "all"
+  }, {
+    "codeName" : "Aa",
+    "text" : "宅基地",
+    "value" : "aa"
+  }, {
+    "codeName" : "Bb",
+    "text" : "山地",
+    "value" : "bb"
+  }, {
+    "codeName" : "Cc",
+    "text" : "林地",
+    "value" : "cc"
+  } ],
+  "enableCache" : true
+}
\ No newline at end of file
--- 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
@@ -113,15 +113,15 @@
      "id" : "Get"
    },
    "getPSDEFIUpdateDetails" : [ {
-      "name" : "field17"
+      "name" : "field14"
    }, {
      "name" : "type"
-    }, {
-      "name" : "field8"
    }, {
      "name" : "field11"
    }, {
-      "name" : "field14"
+      "name" : "field17"
+    }, {
+      "name" : "field8"
    }, {
      "name" : "field13"
    } ]
@@ -241,6 +241,13 @@
      "name" : "FIELD35",
      "codeName" : "Field35"
    }
+  }, {
+    "id" : "formitem13",
+    "dataType" : 25,
+    "getPSAppDEField" : {
+      "name" : "FIELD36",
+      "codeName" : "Field36"
+    }
  }, {
    "id" : "field3",
    "dataType" : 25,
@@ -600,10 +607,6 @@
    "id" : "formitem14",
    "hidden" : true,
    "dataType" : 25
-  }, {
-    "id" : "formitem13",
-    "hidden" : true,
-    "dataType" : 25
  } ],
  "getPSDEFormPages" : [ {
    "caption" : "基本信息",
@@ -2212,6 +2215,37 @@
        },
        "allowEmpty" : true,
        "showCaption" : true
+      }, {
+        "caption" : "测试全部",
+        "codeName" : "formitem13",
+        "dataType" : 25,
+        "detailStyle" : "DEFAULT",
+        "detailType" : "FORMITEM",
+        "enableCond" : 3,
+        "ignoreInput" : 0,
+        "labelPos" : "LEFT",
+        "labelWidth" : 130,
+        "name" : "formitem13",
+        "noPrivDisplayMode" : 1,
+        "getPSAppDEField" : {
+          "name" : "FIELD36",
+          "codeName" : "Field36"
+        },
+        "getPSEditor" : {
+          "editorType" : "CHECKBOXLIST",
+          "name" : "formitem13",
+          "getPSAppCodeList" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/Test__All.json"
+          }
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "allowEmpty" : true,
+        "needCodeListConfig" : true,
+        "showCaption" : true
      }, {
        "caption" : "选项框列表1111",
        "codeName" : "field3",
@@ -4873,30 +4907,6 @@
      },
      "allowEmpty" : true,
      "hidden" : true
-    }, {
-      "codeName" : "formitem13",
-      "dataType" : 25,
-      "detailStyle" : "DEFAULT",
-      "detailType" : "FORMITEM",
-      "enableCond" : 3,
-      "ignoreInput" : 0,
-      "labelPos" : "LEFT",
-      "labelWidth" : 130,
-      "name" : "formitem13",
-      "noPrivDisplayMode" : 1,
-      "getPSEditor" : {
-        "editorType" : "HIDDEN",
-        "name" : "formitem13"
-      },
-      "getPSLayoutPos" : {
-        "colLG" : 23,
-        "colMD" : 23,
-        "colSM" : 23,
-        "colXS" : 23,
-        "layout" : "TABLE_24COL"
-      },
-      "allowEmpty" : true,
-      "hidden" : true
    } ],
    "getPSLayout" : {
      "childColLG" : 23,

--- 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
@@ -230,15 +230,15 @@
        "id" : "Get"
      },
      "getPSDEFIUpdateDetails" : [ {
-        "name" : "field17"
+        "name" : "field14"
      }, {
        "name" : "type"
-      }, {
-        "name" : "field8"
      }, {
        "name" : "field11"
      }, {
-        "name" : "field14"
+        "name" : "field17"
+      }, {
+        "name" : "field8"
      }, {
        "name" : "field13"
      } ]
@@ -358,6 +358,13 @@
        "name" : "FIELD35",
        "codeName" : "Field35"
      }
+    }, {
+      "id" : "formitem13",
+      "dataType" : 25,
+      "getPSAppDEField" : {
+        "name" : "FIELD36",
+        "codeName" : "Field36"
+      }
    }, {
      "id" : "field3",
      "dataType" : 25,
@@ -717,10 +724,6 @@
      "id" : "formitem14",
      "hidden" : true,
      "dataType" : 25
-    }, {
-      "id" : "formitem13",
-      "hidden" : true,
-      "dataType" : 25
    } ],
    "getPSDEFormPages" : [ {
      "caption" : "基本信息",
@@ -2329,6 +2332,37 @@
          },
          "allowEmpty" : true,
          "showCaption" : true
+        }, {
+          "caption" : "测试全部",
+          "codeName" : "formitem13",
+          "dataType" : 25,
+          "detailStyle" : "DEFAULT",
+          "detailType" : "FORMITEM",
+          "enableCond" : 3,
+          "ignoreInput" : 0,
+          "labelPos" : "LEFT",
+          "labelWidth" : 130,
+          "name" : "formitem13",
+          "noPrivDisplayMode" : 1,
+          "getPSAppDEField" : {
+            "name" : "FIELD36",
+            "codeName" : "Field36"
+          },
+          "getPSEditor" : {
+            "editorType" : "CHECKBOXLIST",
+            "name" : "formitem13",
+            "getPSAppCodeList" : {
+              "modelref" : true,
+              "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/Test__All.json"
+            }
+          },
+          "getPSLayoutPos" : {
+            "colMD" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "allowEmpty" : true,
+          "needCodeListConfig" : true,
+          "showCaption" : true
        }, {
          "caption" : "选项框列表1111",
          "codeName" : "field3",
@@ -4990,30 +5024,6 @@
        },
        "allowEmpty" : true,
        "hidden" : true
-      }, {
-        "codeName" : "formitem13",
-        "dataType" : 25,
-        "detailStyle" : "DEFAULT",
-        "detailType" : "FORMITEM",
-        "enableCond" : 3,
-        "ignoreInput" : 0,
-        "labelPos" : "LEFT",
-        "labelWidth" : 130,
-        "name" : "formitem13",
-        "noPrivDisplayMode" : 1,
-        "getPSEditor" : {
-          "editorType" : "HIDDEN",
-          "name" : "formitem13"
-        },
-        "getPSLayoutPos" : {
-          "colLG" : 23,
-          "colMD" : 23,
-          "colSM" : 23,
-          "colXS" : 23,
-          "layout" : "TABLE_24COL"
-        },
-        "allowEmpty" : true,
-        "hidden" : true
      } ],
      "getPSLayout" : {
        "childColLG" : 23,

--- 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
@@ -785,15 +785,15 @@
        "id" : "Get"
      },
      "getPSDEFIUpdateDetails" : [ {
-        "name" : "field17"
+        "name" : "field14"
      }, {
        "name" : "type"
-      }, {
-        "name" : "field8"
      }, {
        "name" : "field11"
      }, {
-        "name" : "field14"
+        "name" : "field17"
+      }, {
+        "name" : "field8"
      }, {
        "name" : "field13"
      } ]
@@ -913,6 +913,13 @@
        "name" : "FIELD35",
        "codeName" : "Field35"
      }
+    }, {
+      "id" : "formitem13",
+      "dataType" : 25,
+      "getPSAppDEField" : {
+        "name" : "FIELD36",
+        "codeName" : "Field36"
+      }
    }, {
      "id" : "field3",
      "dataType" : 25,
@@ -1272,10 +1279,6 @@
      "id" : "formitem14",
      "hidden" : true,
      "dataType" : 25
-    }, {
-      "id" : "formitem13",
-      "hidden" : true,
-      "dataType" : 25
    } ],
    "getPSDEFormPages" : [ {
      "caption" : "基本信息",
@@ -2884,6 +2887,37 @@
          },
          "allowEmpty" : true,
          "showCaption" : true
+        }, {
+          "caption" : "测试全部",
+          "codeName" : "formitem13",
+          "dataType" : 25,
+          "detailStyle" : "DEFAULT",
+          "detailType" : "FORMITEM",
+          "enableCond" : 3,
+          "ignoreInput" : 0,
+          "labelPos" : "LEFT",
+          "labelWidth" : 130,
+          "name" : "formitem13",
+          "noPrivDisplayMode" : 1,
+          "getPSAppDEField" : {
+            "name" : "FIELD36",
+            "codeName" : "Field36"
+          },
+          "getPSEditor" : {
+            "editorType" : "CHECKBOXLIST",
+            "name" : "formitem13",
+            "getPSAppCodeList" : {
+              "modelref" : true,
+              "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/Test__All.json"
+            }
+          },
+          "getPSLayoutPos" : {
+            "colMD" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "allowEmpty" : true,
+          "needCodeListConfig" : true,
+          "showCaption" : true
        }, {
          "caption" : "选项框列表1111",
          "codeName" : "field3",
@@ -5545,30 +5579,6 @@
        },
        "allowEmpty" : true,
        "hidden" : true
-      }, {
-        "codeName" : "formitem13",
-        "dataType" : 25,
-        "detailStyle" : "DEFAULT",
-        "detailType" : "FORMITEM",
-        "enableCond" : 3,
-        "ignoreInput" : 0,
-        "labelPos" : "LEFT",
-        "labelWidth" : 130,
-        "name" : "formitem13",
-        "noPrivDisplayMode" : 1,
-        "getPSEditor" : {
-          "editorType" : "HIDDEN",
-          "name" : "formitem13"
-        },
-        "getPSLayoutPos" : {
-          "colLG" : 23,
-          "colMD" : 23,
-          "colSM" : 23,
-          "colXS" : 23,
-          "layout" : "TABLE_24COL"
-        },
-        "allowEmpty" : true,
-        "hidden" : true
      } ],
      "getPSLayout" : {
        "childColLG" : 23,

--- 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
@@ -260,6 +260,32 @@
    "name" : "云系统操作者",
    "predefinedType" : "OPERATOR",
    "enableCache" : true
+  }, {
+    "codeListTag" : "Test__All",
+    "codeListType" : "STATIC",
+    "codeName" : "Test__All",
+    "dynaInstMode" : 0,
+    "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPCODELISTS/Test__All.json",
+    "emptyText" : "未定义",
+    "name" : "全部代码表",
+    "getPSCodeItems" : [ {
+      "codeName" : "All",
+      "text" : "全部",
+      "value" : "all"
+    }, {
+      "codeName" : "Aa",
+      "text" : "宅基地",
+      "value" : "aa"
+    }, {
+      "codeName" : "Bb",
+      "text" : "山地",
+      "value" : "bb"
+    }, {
+      "codeName" : "Cc",
+      "text" : "林地",
+      "value" : "cc"
+    } ],
+    "enableCache" : true
  }, {
    "codeListTag" : "Test__Booktype",
    "codeListType" : "DYNAMIC",
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSTEM.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSTEM.json
@@ -177,6 +177,9 @@
  }, {
    "modelref" : true,
    "path" : "PSCODELISTS/CodeList4.json"
+  }, {
+    "modelref" : true,
+    "path" : "PSMODULES/Test/PSCODELISTS/All.json"
  }, {
    "modelref" : true,
    "path" : "PSCODELISTS/CodeList102.json"
@@ -1782,6 +1785,9 @@
    }, {
      "modelref" : true,
      "path" : "PSMODULES/Test/PSCODELISTS/TestAll.json"
+    }, {
+      "modelref" : true,
+      "path" : "PSMODULES/Test/PSCODELISTS/All.json"
    }, {
      "modelref" : true,
      "path" : "PSMODULES/Test/PSCODELISTS/ViewMsgPosition.json"