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

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Book.json

@@ -930,6 +930,37 @@
     "logicName" : "基础属性查询",
     "name" : "SIMPLE",
     "getPSDEDQMain" : {
+      "getChildPSDEDQJoins" : [ {
+        "getDERPSDataEntity" : {
+          "modelref" : true,
+          "path" : "PSMODULES/common/PSDATAENTITIES/Book.json"
+        },
+        "getJoinPSDER" : {
+          "modelref" : true,
+          "path" : "PSMODULES/common/PSDATAENTITIES/Book/PSDERS/DER1N_BOOK_BOOK_PBOOKID.json"
+        },
+        "getJoinPSDataEntity" : {
+          "modelref" : true,
+          "path" : "PSMODULES/common/PSDATAENTITIES/Book.json"
+        },
+        "joinType" : "N1",
+        "name" : "BOOK相关N:1（INNER JOIN）DER1N_BOOK_BOOK_PBOOKID",
+        "getPSDEDQGroupCondition" : {
+          "condOp" : "AND",
+          "condType" : "GROUP",
+          "name" : "连接条件",
+          "getPSDEDQConditions" : [ {
+            "condOp" : "LIKE",
+            "condType" : "SINGLE",
+            "fieldName" : "FIELD",
+            "name" : "(FIELD) 文本包含(%)",
+            "getPSDEField" : {
+              "name" : "FIELD",
+              "codeName" : "Field"
+            }
+          } ]
+        }
+      } ],
       "getJoinPSDataEntity" : {
         "modelref" : true,
         "path" : "PSMODULES/common/PSDATAENTITIES/Book.json"

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Book/PSDEDATAQUERIES/Simple/PSDEDQCODES/MYSQL5.json

@@ -2,11 +2,33 @@
   "dBType" : "MYSQL5",
   "name" : "MySQL5",
   "getPSDEDataQueryCodeConds" : [ {
+    "condType" : "CUSTOM",
+    "customCond" : "( t11.`FIELD` LIKE '%%' )",
+    "name" : "查询条件"
+  }, {
     "condType" : "CUSTOM",
     "customCond" : "( t1.`TYPE` = '历史'  AND  ( t1.`BOOKNAME` LIKE '%我了个老天爷%' ) )",
     "name" : "查询条件"
   } ],
   "getPSDEDataQueryCodeExps" : [ {
+    "expression" : "t1.`APPID`",
+    "name" : "APPID"
+  }, {
+    "expression" : "t1.`BOOKCHILD1S`",
+    "name" : "BOOKCHILD1S"
+  }, {
+    "expression" : "t1.`BOOKCHILD2S`",
+    "name" : "BOOKCHILD2S"
+  }, {
+    "expression" : "t1.`BOOKCHILD3S`",
+    "name" : "BOOKCHILD3S"
+  }, {
+    "expression" : "t1.`BOOKCHILD4S`",
+    "name" : "BOOKCHILD4S"
+  }, {
+    "expression" : "t1.`BOOKCHILD5S`",
+    "name" : "BOOKCHILD5S"
+  }, {
     "expression" : "t1.`DATE`",
     "name" : "DATE"
   }, {
@@ -147,6 +169,12 @@
   }, {
     "expression" : "t1.`FIELD9`",
     "name" : "FIELD9"
+  }, {
+    "expression" : "t1.`MODEL`",
+    "name" : "MODEL"
+  }, {
+    "expression" : "t1.`MODELID`",
+    "name" : "MODELID"
   }, {
     "expression" : "t1.`PBOOKID`",
     "name" : "PBOOKID"
@@ -156,6 +184,9 @@
   }, {
     "expression" : "t1.`TYPE`",
     "name" : "TYPE"
+  }, {
+    "expression" : "t1.`USERID`",
+    "name" : "USERID"
   }, {
     "expression" : "t1.`BOOKID`",
     "name" : "BOOKID"
@@ -181,6 +212,6 @@
     "expression" : "t1.`UPDATEMAN`",
     "name" : "UPDATEMAN"
   } ],
-  "queryCode" : "SELECT\nt1.`BOOKID`,\nt1.`BOOKNAME`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`DEPTID`,\nt1.`ORGID`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_BOOK` t1 \n",
+  "queryCode" : "SELECT\nt1.`BOOKID`,\nt1.`BOOKNAME`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`DEPTID`,\nt1.`ORGID`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_BOOK` t1 \nLEFT JOIN `T_BOOK` t11 ON t1.`PBOOKID` = t11.`BOOKID` \n",
   "id" : "PSMODULES/common/PSDATAENTITIES/Book/PSDEDATAQUERIES/Simple/PSDEDQCODES/MYSQL5.json"
 }
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSFORMS/Usr09027777EditView_Form.json

@@ -144,6 +144,7 @@
   }, {
     "id" : "memo",
     "dataType" : 25,
+    "createDV" : "*1111* **22**",
     "getPSAppDEField" : {
       "name" : "FIELD8",
       "codeName" : "Field8"
@@ -334,6 +335,7 @@
         },
         "caption" : "属性8",
         "codeName" : "memo",
+        "createDV" : "*1111* **22**",
         "dataType" : 25,
         "detailStyle" : "DEFAULT",
         "detailType" : "FORMITEM",
@@ -348,14 +350,9 @@
           "codeName" : "Field8"
         },
         "getPSEditor" : {
-          "editorStyle" : "MarkdownMemoEditor",
           "editorType" : "TEXTAREA",
           "maxLength" : 100,
           "name" : "memo",
-          "getPSSysPFPlugin" : {
-            "pluginType" : "EDITOR_CUSTOMSTYLE",
-            "pluginCode" : "MarkdownMemoEditor"
-          },
           "showMaxLength" : true
         },
         "getPSLayoutPos" : {

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr09027777EditView.json

@@ -439,6 +439,7 @@
       }, {
         "id" : "memo",
         "dataType" : 25,
+        "createDV" : "*1111* **22**",
         "getPSAppDEField" : {
           "name" : "FIELD8",
           "codeName" : "Field8"
@@ -629,6 +630,7 @@
             },
             "caption" : "属性8",
             "codeName" : "memo",
+            "createDV" : "*1111* **22**",
             "dataType" : 25,
             "detailStyle" : "DEFAULT",
             "detailType" : "FORMITEM",
@@ -643,14 +645,9 @@
               "codeName" : "Field8"
             },
             "getPSEditor" : {
-              "editorStyle" : "MarkdownMemoEditor",
               "editorType" : "TEXTAREA",
               "maxLength" : 100,
               "name" : "memo",
-              "getPSSysPFPlugin" : {
-                "pluginType" : "EDITOR_CUSTOMSTYLE",
-                "pluginCode" : "MarkdownMemoEditor"
-              },
               "showMaxLength" : true
             },
             "getPSLayoutPos" : {

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.simple.json

@@ -535,15 +535,6 @@
     "pluginType" : "CUSTOM",
     "refMode" : "CONTROL",
     "refTag" : "FORM"
-  }, {
-    "name" : "备注编辑器",
-    "getPSSysPFPlugin" : {
-      "pluginType" : "EDITOR_CUSTOMSTYLE",
-      "pluginCode" : "MarkdownMemoEditor"
-    },
-    "pluginCode" : "MarkdownMemoEditor",
-    "pluginType" : "EDITOR_CUSTOMSTYLE",
-    "refMode" : "EDITORSTYPE"
   }, {
     "name" : "大屏_进度条",
     "getPSSysPFPlugin" : {