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

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

@@ -2455,8 +2455,53 @@
       "leftPos" : 200,
       "logicNodeType" : "BEGIN",
       "name" : "开始",
+      "getPSDELogicLinks" : [ {
+        "getDstPSDELogicNode" : {
+          "modelref" : true,
+          "id" : "PREPAREPARAM1"
+        },
+        "name" : "连接名称",
+        "getSrcPSDELogicNode" : {
+          "modelref" : true,
+          "id" : "Begin"
+        }
+      } ],
       "topPos" : 200,
       "parallelOutput" : true
+    }, {
+      "codeName" : "PREPAREPARAM1",
+      "leftPos" : 420,
+      "logicNodeType" : "PREPAREPARAM",
+      "name" : "准备参数",
+      "getPSDELogicLinks" : [ {
+        "getDstPSDELogicNode" : {
+          "modelref" : true,
+          "id" : "END1"
+        },
+        "name" : "连接名称",
+        "getSrcPSDELogicNode" : {
+          "modelref" : true,
+          "id" : "PREPAREPARAM1"
+        }
+      } ],
+      "getPSDELogicNodeParams" : [ {
+        "dstFieldName" : "MONEY",
+        "getDstPSDELogicParam" : {
+          "modelref" : true,
+          "id" : "Default"
+        },
+        "name" : "直接值[1111] ==> Default[MONEY]",
+        "paramAction" : "SETPARAMVALUE",
+        "srcValue" : "1111",
+        "srcValueType" : "SRCVALUE"
+      } ],
+      "topPos" : 350
+    }, {
+      "codeName" : "END1",
+      "leftPos" : 440,
+      "logicNodeType" : "END",
+      "name" : "结束",
+      "topPos" : 580
     } ],
     "getPSDELogicParams" : [ {
       "codeName" : "Default",
@@ -2468,6 +2513,12 @@
       },
       "default" : true,
       "entityParam" : true
+    }, {
+      "codeName" : "simple",
+      "logicName" : "简单",
+      "name" : "简单",
+      "stdDataType" : 4,
+      "simpleParam" : true
     } ],
     "getStartPSDELogicNode" : {
       "modelref" : true,

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Phone/PSDELOGICS/xxx.json

@@ -9,8 +9,53 @@
     "leftPos" : 200,
     "logicNodeType" : "BEGIN",
     "name" : "开始",
+    "getPSDELogicLinks" : [ {
+      "getDstPSDELogicNode" : {
+        "modelref" : true,
+        "id" : "PREPAREPARAM1"
+      },
+      "name" : "连接名称",
+      "getSrcPSDELogicNode" : {
+        "modelref" : true,
+        "id" : "Begin"
+      }
+    } ],
     "topPos" : 200,
     "parallelOutput" : true
+  }, {
+    "codeName" : "PREPAREPARAM1",
+    "leftPos" : 420,
+    "logicNodeType" : "PREPAREPARAM",
+    "name" : "准备参数",
+    "getPSDELogicLinks" : [ {
+      "getDstPSDELogicNode" : {
+        "modelref" : true,
+        "id" : "END1"
+      },
+      "name" : "连接名称",
+      "getSrcPSDELogicNode" : {
+        "modelref" : true,
+        "id" : "PREPAREPARAM1"
+      }
+    } ],
+    "getPSDELogicNodeParams" : [ {
+      "dstFieldName" : "MONEY",
+      "getDstPSDELogicParam" : {
+        "modelref" : true,
+        "id" : "Default"
+      },
+      "name" : "直接值[1111] ==> Default[MONEY]",
+      "paramAction" : "SETPARAMVALUE",
+      "srcValue" : "1111",
+      "srcValueType" : "SRCVALUE"
+    } ],
+    "topPos" : 350
+  }, {
+    "codeName" : "END1",
+    "leftPos" : 440,
+    "logicNodeType" : "END",
+    "name" : "结束",
+    "topPos" : 580
   } ],
   "getPSDELogicParams" : [ {
     "codeName" : "Default",
@@ -22,6 +67,12 @@
     },
     "default" : true,
     "entityParam" : true
+  }, {
+    "codeName" : "simple",
+    "logicName" : "简单",
+    "name" : "简单",
+    "stdDataType" : 4,
+    "simpleParam" : true
   } ],
   "getStartPSDELogicNode" : {
     "modelref" : true,

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Phone/PSDELOGICS/xxx.json.bpmn

@@ -6,12 +6,19 @@
                 <tns:import name="org.springframework.util.StringUtils"/>
                 <tns:import name="cn.ibizlab.trainsys.util.helper.RuleUtils"/>
                                 <tns:metaData express="" name="phonexxxdefault" type="entity"/>
+                                <tns:metaData express="new HashMap()" name="phonexxxsimple" type="refentity"/>
                     <tns:metaData express="T(cn.ibizlab.trainsys.util.security.SpringContextHolder).getBean(T(cn.ibizlab.trainsys.core.common.service.IPhoneService))" name="iBzSysPhoneDefaultService" type="service"/>
                     <tns:metaData express="T(cn.ibizlab.trainsys.util.security.AuthenticationUser).getAuthenticationUser()" name="curuser" type="session"/>
                             <tns:global identifier="phonexxxdefault" type="cn.ibizlab.trainsys.core.common.domain.Phone" />
             </extensionElements>
                         <startEvent id="begin" isInterrupting="true"/>
-                        <endEvent id="begin_end" name="end"/>
-                        <sequenceFlow id="begin_end_line" sourceRef="begin" targetRef="begin_end"/>
+                        <businessRuleTask activiti:exclusive="true" g:ruleFlowGroup="phonexxxprepareparam1" id="prepareparam1" implementation="http://www.jboss.org/drools/rule" name="准备参数"/>
+                        <businessRuleTask activiti:exclusive="true" g:ruleFlowGroup="phonexxxend1" id="end1" implementation="http://www.jboss.org/drools/rule" name="结束"/>
+                        <endEvent id="end1_end" name="end"/>
+                        <sequenceFlow id="end1_end_line" sourceRef="end1" targetRef="end1_end"/>
+                    <sequenceFlow id="begin_prepareparam1" sourceRef="begin" targetRef="prepareparam1">
+                    </sequenceFlow>
+                    <sequenceFlow id="prepareparam1_end1" sourceRef="prepareparam1" targetRef="end1">
+                    </sequenceFlow>
         </process>
     </definitions>
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Phone/PSDELOGICS/xxx.json.drl

@@ -6,6 +6,7 @@ package cn.ibizlab.trainsys.common.logic.phonelogic.xxx;
         import org.springframework.util.ObjectUtils;
         import cn.ibizlab.trainsys.util.errors.BadRequestAlertException;
                 global cn.ibizlab.trainsys.core.common.domain.Phone phonexxxdefault;
+                global java.util.Map phonexxxsimple;
         global cn.ibizlab.trainsys.core.common.service.IPhoneService iBzSysPhoneDefaultService;
         global cn.ibizlab.trainsys.util.security.AuthenticationUser curuser;
 
@@ -17,4 +18,23 @@ package cn.ibizlab.trainsys.common.logic.phonelogic.xxx;
             ruleflow-group "phonexxxbegin"
             when
             then
+            end
+
+            //逻辑处理节点[准备参数]
+            rule "prepareparam1"
+            ruleflow-group "phonexxxprepareparam1"
+            when
+            then
+                            phonexxxdefault.set("money","1111");
+                        update(phonexxxdefault);//更新fact中变量值
+                        update(phonexxxsimple);//更新fact中变量值
+            end
+
+            //逻辑处理节点[结束]
+            rule "end1"
+            ruleflow-group "phonexxxend1"
+            when
+            then
+                        update(phonexxxdefault);//更新fact中变量值
+                        update(phonexxxsimple);//更新fact中变量值
             end
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST/PSLISTS/List.json

@@ -75,6 +75,8 @@
     }, {
       "id" : "field_textbox1",
       "viewFieldName" : "TESTNAME"
+    }, {
+      "id" : "field_textbox2"
     } ],
     "codeName" : "Usr0522433048",
     "controlType" : "PANEL",
@@ -215,6 +217,9 @@
       "name" : "field_textbox1",
       "getPSEditor" : {
         "editorHeight" : 100.0,
+        "editorParams" : {
+          "contenttype" : "RAW"
+        },
         "editorType" : "RAW",
         "editorWidth" : 600.0,
         "name" : "field_textbox1",
@@ -232,6 +237,26 @@
       "width" : 600.0,
       "hidden" : false,
       "showCaption" : false
+    }, {
+      "caption" : "文本框",
+      "itemStyle" : "DEFAULT",
+      "itemType" : "FIELD",
+      "name" : "field_textbox2",
+      "getPSEditor" : {
+        "contentType" : "HTML",
+        "editorParams" : {
+          "contenttype" : "HTML"
+        },
+        "editorType" : "RAW",
+        "name" : "field_textbox2",
+        "predefinedType" : "FIELD_TEXTBOX"
+      },
+      "getPSLayoutPos" : {
+        "colMD" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "hidden" : false,
+      "showCaption" : false
     } ],
     "modelid" : "01B1D530-723C-4CB4-A877-5F5E3CFC11AF",
     "modeltype" : "PSSYSVIEWPANEL"
@@ -390,15 +415,15 @@
     "modeltype" : "PSDETOOLBAR"
   } ],
   "getPSDEListDataItems" : [ {
-    "dataType" : 25,
-    "name" : "testname"
-  }, {
     "dataType" : 25,
     "name" : "testid",
     "getPSAppDEField" : {
       "name" : "AMOUNT",
       "codeName" : "Amount"
     }
+  }, {
+    "dataType" : 25,
+    "name" : "testname"
   }, {
     "dataType" : 25,
     "name" : "srfkey",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDEVIEWS/TESTMobMPickupView.json

@@ -94,6 +94,8 @@
       }, {
         "id" : "field_textbox1",
         "viewFieldName" : "TESTNAME"
+      }, {
+        "id" : "field_textbox2"
       } ],
       "codeName" : "Usr0522433048",
       "controlType" : "PANEL",
@@ -234,6 +236,9 @@
         "name" : "field_textbox1",
         "getPSEditor" : {
           "editorHeight" : 100.0,
+          "editorParams" : {
+            "contenttype" : "RAW"
+          },
           "editorType" : "RAW",
           "editorWidth" : 600.0,
           "name" : "field_textbox1",
@@ -251,6 +256,26 @@
         "width" : 600.0,
         "hidden" : false,
         "showCaption" : false
+      }, {
+        "caption" : "文本框",
+        "itemStyle" : "DEFAULT",
+        "itemType" : "FIELD",
+        "name" : "field_textbox2",
+        "getPSEditor" : {
+          "contentType" : "HTML",
+          "editorParams" : {
+            "contenttype" : "HTML"
+          },
+          "editorType" : "RAW",
+          "name" : "field_textbox2",
+          "predefinedType" : "FIELD_TEXTBOX"
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "hidden" : false,
+        "showCaption" : false
       } ],
       "modelid" : "01B1D530-723C-4CB4-A877-5F5E3CFC11AF",
       "modeltype" : "PSSYSVIEWPANEL"
@@ -487,15 +512,15 @@
       "modeltype" : "PSDETOOLBAR"
     } ],
     "getPSDEListDataItems" : [ {
-      "dataType" : 25,
-      "name" : "testname"
-    }, {
       "dataType" : 25,
       "name" : "testid",
       "getPSAppDEField" : {
         "name" : "AMOUNT",
         "codeName" : "Amount"
       }
+    }, {
+      "dataType" : 25,
+      "name" : "testname"
     }, {
       "dataType" : 25,
       "name" : "srfkey",

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

@@ -7573,6 +7573,8 @@
           }, {
             "id" : "field_textbox1",
             "viewFieldName" : "TESTNAME"
+          }, {
+            "id" : "field_textbox2"
           } ],
           "codeName" : "Usr0522433048",
           "controlType" : "PANEL",
@@ -7713,6 +7715,9 @@
             "name" : "field_textbox1",
             "getPSEditor" : {
               "editorHeight" : 100.0,
+              "editorParams" : {
+                "contenttype" : "RAW"
+              },
               "editorType" : "RAW",
               "editorWidth" : 600.0,
               "name" : "field_textbox1",
@@ -7730,6 +7735,26 @@
             "width" : 600.0,
             "hidden" : false,
             "showCaption" : false
+          }, {
+            "caption" : "文本框",
+            "itemStyle" : "DEFAULT",
+            "itemType" : "FIELD",
+            "name" : "field_textbox2",
+            "getPSEditor" : {
+              "contentType" : "HTML",
+              "editorParams" : {
+                "contenttype" : "HTML"
+              },
+              "editorType" : "RAW",
+              "name" : "field_textbox2",
+              "predefinedType" : "FIELD_TEXTBOX"
+            },
+            "getPSLayoutPos" : {
+              "colMD" : 24,
+              "layout" : "TABLE_24COL"
+            },
+            "hidden" : false,
+            "showCaption" : false
           } ],
           "modelid" : "01B1D530-723C-4CB4-A877-5F5E3CFC11AF",
           "modeltype" : "PSSYSVIEWPANEL"
@@ -7966,15 +7991,15 @@
           "modeltype" : "PSDETOOLBAR"
         } ],
         "getPSDEListDataItems" : [ {
-          "dataType" : 25,
-          "name" : "testname"
-        }, {
           "dataType" : 25,
           "name" : "testid",
           "getPSAppDEField" : {
             "name" : "AMOUNT",
             "codeName" : "Amount"
           }
+        }, {
+          "dataType" : 25,
+          "name" : "testname"
         }, {
           "dataType" : 25,
           "name" : "srfkey",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/TEST/PSLISTS/List.json

@@ -37,6 +37,8 @@
     }, {
       "id" : "field_textbox1",
       "viewFieldName" : "TESTNAME"
+    }, {
+      "id" : "field_textbox2"
     } ],
     "codeName" : "Usr0522433048",
     "controlType" : "PANEL",
@@ -177,6 +179,9 @@
       "name" : "field_textbox1",
       "getPSEditor" : {
         "editorHeight" : 100.0,
+        "editorParams" : {
+          "contenttype" : "RAW"
+        },
         "editorType" : "RAW",
         "editorWidth" : 600.0,
         "name" : "field_textbox1",
@@ -194,6 +199,26 @@
       "width" : 600.0,
       "hidden" : false,
       "showCaption" : false
+    }, {
+      "caption" : "文本框",
+      "itemStyle" : "DEFAULT",
+      "itemType" : "FIELD",
+      "name" : "field_textbox2",
+      "getPSEditor" : {
+        "contentType" : "HTML",
+        "editorParams" : {
+          "contenttype" : "HTML"
+        },
+        "editorType" : "RAW",
+        "name" : "field_textbox2",
+        "predefinedType" : "FIELD_TEXTBOX"
+      },
+      "getPSLayoutPos" : {
+        "colMD" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "hidden" : false,
+      "showCaption" : false
     } ],
     "modelid" : "01B1D530-723C-4CB4-A877-5F5E3CFC11AF",
     "modeltype" : "PSSYSVIEWPANEL"
@@ -415,15 +440,15 @@
     "modeltype" : "PSDETOOLBAR"
   } ],
   "getPSDEListDataItems" : [ {
-    "dataType" : 25,
-    "name" : "testname"
-  }, {
     "dataType" : 25,
     "name" : "testid",
     "getPSAppDEField" : {
       "name" : "AMOUNT",
       "codeName" : "Amount"
     }
+  }, {
+    "dataType" : 25,
+    "name" : "testname"
   }, {
     "dataType" : 25,
     "name" : "srfkey",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDEVIEWS/TESTMobMPickupView.json

@@ -62,6 +62,8 @@
       }, {
         "id" : "field_textbox1",
         "viewFieldName" : "TESTNAME"
+      }, {
+        "id" : "field_textbox2"
       } ],
       "codeName" : "Usr0522433048",
       "controlType" : "PANEL",
@@ -202,6 +204,9 @@
         "name" : "field_textbox1",
         "getPSEditor" : {
           "editorHeight" : 100.0,
+          "editorParams" : {
+            "contenttype" : "RAW"
+          },
           "editorType" : "RAW",
           "editorWidth" : 600.0,
           "name" : "field_textbox1",
@@ -219,6 +224,26 @@
         "width" : 600.0,
         "hidden" : false,
         "showCaption" : false
+      }, {
+        "caption" : "文本框",
+        "itemStyle" : "DEFAULT",
+        "itemType" : "FIELD",
+        "name" : "field_textbox2",
+        "getPSEditor" : {
+          "contentType" : "HTML",
+          "editorParams" : {
+            "contenttype" : "HTML"
+          },
+          "editorType" : "RAW",
+          "name" : "field_textbox2",
+          "predefinedType" : "FIELD_TEXTBOX"
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "hidden" : false,
+        "showCaption" : false
       } ],
       "modelid" : "01B1D530-723C-4CB4-A877-5F5E3CFC11AF",
       "modeltype" : "PSSYSVIEWPANEL"
@@ -518,15 +543,15 @@
       "modeltype" : "PSDETOOLBAR"
     } ],
     "getPSDEListDataItems" : [ {
-      "dataType" : 25,
-      "name" : "testname"
-    }, {
       "dataType" : 25,
       "name" : "testid",
       "getPSAppDEField" : {
         "name" : "AMOUNT",
         "codeName" : "Amount"
       }
+    }, {
+      "dataType" : 25,
+      "name" : "testname"
     }, {
       "dataType" : 25,
       "name" : "srfkey",

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

@@ -1375,16 +1375,16 @@
     "codeName" : "VMGroup2",
     "name" : "视图消息组2",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息",
+      "name" : "视图消息2",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
       }
     }, {
-      "name" : "视图消息2",
+      "name" : "视图消息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
       }
     } ]
   }, {

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

@@ -119,6 +119,14 @@
       "name" : "EXPENSENAME",
       "codeName" : "ExpenseName"
     }
+  }, {
+    "id" : "expensesheetid",
+    "hidden" : true,
+    "dataType" : 25,
+    "getPSAppDEField" : {
+      "name" : "EXPENSESHEETID",
+      "codeName" : "ExpenseSheetId"
+    }
   }, {
     "id" : "createman",
     "dataType" : 25,
@@ -217,6 +225,33 @@
         },
         "allowEmpty" : true,
         "showCaption" : true
+      }, {
+        "caption" : "报销单标识",
+        "codeName" : "expensesheetid",
+        "dataType" : 25,
+        "detailStyle" : "DEFAULT",
+        "detailType" : "FORMITEM",
+        "enableCond" : 3,
+        "ignoreInput" : 0,
+        "labelPos" : "LEFT",
+        "labelWidth" : 130,
+        "name" : "expensesheetid",
+        "noPrivDisplayMode" : 1,
+        "getPSAppDEField" : {
+          "name" : "EXPENSESHEETID",
+          "codeName" : "ExpenseSheetId"
+        },
+        "getPSEditor" : {
+          "editorType" : "HIDDEN",
+          "name" : "expensesheetid"
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "allowEmpty" : true,
+        "hidden" : true,
+        "showCaption" : true
       } ],
       "getPSLayout" : {
         "childColLG" : -1,

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

@@ -76,6 +76,8 @@
     }, {
       "id" : "field_textbox1",
       "viewFieldName" : "TESTNAME"
+    }, {
+      "id" : "field_textbox2"
     } ],
     "codeName" : "Usr0522433048",
     "controlType" : "PANEL",
@@ -220,6 +222,9 @@
       "name" : "field_textbox1",
       "getPSEditor" : {
         "editorHeight" : 100.0,
+        "editorParams" : {
+          "contenttype" : "RAW"
+        },
         "editorType" : "RAW",
         "editorWidth" : 600.0,
         "name" : "field_textbox1",
@@ -237,6 +242,26 @@
       "width" : 600.0,
       "hidden" : false,
       "showCaption" : false
+    }, {
+      "caption" : "文本框",
+      "itemStyle" : "DEFAULT",
+      "itemType" : "FIELD",
+      "name" : "field_textbox2",
+      "getPSEditor" : {
+        "contentType" : "HTML",
+        "editorParams" : {
+          "contenttype" : "HTML"
+        },
+        "editorType" : "RAW",
+        "name" : "field_textbox2",
+        "predefinedType" : "FIELD_TEXTBOX"
+      },
+      "getPSLayoutPos" : {
+        "colMD" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "hidden" : false,
+      "showCaption" : false
     } ],
     "name" : "list_itempanel",
     "modelid" : "01B1D530-723C-4CB4-A877-5F5E3CFC11AF",
@@ -400,15 +425,15 @@
     "id" : "DataExport"
   },
   "getPSDEListDataItems" : [ {
-    "dataType" : 25,
-    "name" : "testname"
-  }, {
     "dataType" : 25,
     "name" : "testid",
     "getPSAppDEField" : {
       "name" : "AMOUNT",
       "codeName" : "Amount"
     }
+  }, {
+    "dataType" : 25,
+    "name" : "testname"
   }, {
     "dataType" : 25,
     "name" : "srfkey",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/ViewLayoutModelRepository/PSLISTS/ListViewViewLayout_List.json

@@ -62,6 +62,8 @@
     }, {
       "id" : "field_textbox1",
       "viewFieldName" : "TESTNAME"
+    }, {
+      "id" : "field_textbox2"
     } ],
     "codeName" : "Usr0522433048",
     "controlType" : "PANEL",
@@ -206,6 +208,9 @@
       "name" : "field_textbox1",
       "getPSEditor" : {
         "editorHeight" : 100.0,
+        "editorParams" : {
+          "contenttype" : "RAW"
+        },
         "editorType" : "RAW",
         "editorWidth" : 600.0,
         "name" : "field_textbox1",
@@ -223,6 +228,26 @@
       "width" : 600.0,
       "hidden" : false,
       "showCaption" : false
+    }, {
+      "caption" : "文本框",
+      "itemStyle" : "DEFAULT",
+      "itemType" : "FIELD",
+      "name" : "field_textbox2",
+      "getPSEditor" : {
+        "contentType" : "HTML",
+        "editorParams" : {
+          "contenttype" : "HTML"
+        },
+        "editorType" : "RAW",
+        "name" : "field_textbox2",
+        "predefinedType" : "FIELD_TEXTBOX"
+      },
+      "getPSLayoutPos" : {
+        "colMD" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "hidden" : false,
+      "showCaption" : false
     } ],
     "name" : "list_itempanel",
     "modelid" : "01B1D530-723C-4CB4-A877-5F5E3CFC11AF",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/ViewLayoutModelRepository/PSPANELS/Usr0522433048.json

@@ -11,6 +11,8 @@
   }, {
     "id" : "field_textbox1",
     "viewFieldName" : "TESTNAME"
+  }, {
+    "id" : "field_textbox2"
   } ],
   "codeName" : "Usr0522433048",
   "controlType" : "PANEL",
@@ -154,6 +156,9 @@
     "name" : "field_textbox1",
     "getPSEditor" : {
       "editorHeight" : 100.0,
+      "editorParams" : {
+        "contenttype" : "RAW"
+      },
       "editorType" : "RAW",
       "editorWidth" : 600.0,
       "name" : "field_textbox1",
@@ -171,6 +176,26 @@
     "width" : 600.0,
     "hidden" : false,
     "showCaption" : false
+  }, {
+    "caption" : "文本框",
+    "itemStyle" : "DEFAULT",
+    "itemType" : "FIELD",
+    "name" : "field_textbox2",
+    "getPSEditor" : {
+      "contentType" : "HTML",
+      "editorParams" : {
+        "contenttype" : "HTML"
+      },
+      "editorType" : "RAW",
+      "name" : "field_textbox2",
+      "predefinedType" : "FIELD_TEXTBOX"
+    },
+    "getPSLayoutPos" : {
+      "colMD" : 24,
+      "layout" : "TABLE_24COL"
+    },
+    "hidden" : false,
+    "showCaption" : false
   } ],
   "modelid" : "01B1D530-723C-4CB4-A877-5F5E3CFC11AF",
   "modeltype" : "PSSYSVIEWPANEL"

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

@@ -354,7 +354,7 @@
         "uIActionType" : "DEUIACTION"
       },
       "tooltip" : "新建行",
-      "showCaption" : false,
+      "showCaption" : true,
       "showIcon" : true
     }, {
       "itemType" : "SEPERATOR",

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

@@ -823,6 +823,14 @@
         "name" : "EXPENSENAME",
         "codeName" : "ExpenseName"
       }
+    }, {
+      "id" : "expensesheetid",
+      "hidden" : true,
+      "dataType" : 25,
+      "getPSAppDEField" : {
+        "name" : "EXPENSESHEETID",
+        "codeName" : "ExpenseSheetId"
+      }
     }, {
       "id" : "createman",
       "dataType" : 25,
@@ -921,6 +929,33 @@
           },
           "allowEmpty" : true,
           "showCaption" : true
+        }, {
+          "caption" : "报销单标识",
+          "codeName" : "expensesheetid",
+          "dataType" : 25,
+          "detailStyle" : "DEFAULT",
+          "detailType" : "FORMITEM",
+          "enableCond" : 3,
+          "ignoreInput" : 0,
+          "labelPos" : "LEFT",
+          "labelWidth" : 130,
+          "name" : "expensesheetid",
+          "noPrivDisplayMode" : 1,
+          "getPSAppDEField" : {
+            "name" : "EXPENSESHEETID",
+            "codeName" : "ExpenseSheetId"
+          },
+          "getPSEditor" : {
+            "editorType" : "HIDDEN",
+            "name" : "expensesheetid"
+          },
+          "getPSLayoutPos" : {
+            "colMD" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "allowEmpty" : true,
+          "hidden" : true,
+          "showCaption" : true
         } ],
         "getPSLayout" : {
           "childColLG" : -1,

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

@@ -954,7 +954,7 @@
         "uIActionType" : "DEUIACTION"
       },
       "tooltip" : "新建行",
-      "showCaption" : false,
+      "showCaption" : true,
       "showIcon" : true
     }, {
       "itemType" : "SEPERATOR",

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

@@ -870,6 +870,8 @@
       }, {
         "id" : "field_textbox1",
         "viewFieldName" : "TESTNAME"
+      }, {
+        "id" : "field_textbox2"
       } ],
       "codeName" : "Usr0522433048",
       "controlType" : "PANEL",
@@ -1014,6 +1016,9 @@
         "name" : "field_textbox1",
         "getPSEditor" : {
           "editorHeight" : 100.0,
+          "editorParams" : {
+            "contenttype" : "RAW"
+          },
           "editorType" : "RAW",
           "editorWidth" : 600.0,
           "name" : "field_textbox1",
@@ -1031,6 +1036,26 @@
         "width" : 600.0,
         "hidden" : false,
         "showCaption" : false
+      }, {
+        "caption" : "文本框",
+        "itemStyle" : "DEFAULT",
+        "itemType" : "FIELD",
+        "name" : "field_textbox2",
+        "getPSEditor" : {
+          "contentType" : "HTML",
+          "editorParams" : {
+            "contenttype" : "HTML"
+          },
+          "editorType" : "RAW",
+          "name" : "field_textbox2",
+          "predefinedType" : "FIELD_TEXTBOX"
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "hidden" : false,
+        "showCaption" : false
       } ],
       "name" : "list_itempanel",
       "modelid" : "01B1D530-723C-4CB4-A877-5F5E3CFC11AF",
@@ -1274,15 +1299,15 @@
       "id" : "DataExport"
     },
     "getPSDEListDataItems" : [ {
-      "dataType" : 25,
-      "name" : "testname"
-    }, {
       "dataType" : 25,
       "name" : "testid",
       "getPSAppDEField" : {
         "name" : "AMOUNT",
         "codeName" : "Amount"
       }
+    }, {
+      "dataType" : 25,
+      "name" : "testname"
     }, {
       "dataType" : 25,
       "name" : "srfkey",

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

@@ -95,6 +95,8 @@
       }, {
         "id" : "field_textbox1",
         "viewFieldName" : "TESTNAME"
+      }, {
+        "id" : "field_textbox2"
       } ],
       "codeName" : "Usr0522433048",
       "controlType" : "PANEL",
@@ -239,6 +241,9 @@
         "name" : "field_textbox1",
         "getPSEditor" : {
           "editorHeight" : 100.0,
+          "editorParams" : {
+            "contenttype" : "RAW"
+          },
           "editorType" : "RAW",
           "editorWidth" : 600.0,
           "name" : "field_textbox1",
@@ -256,6 +261,26 @@
         "width" : 600.0,
         "hidden" : false,
         "showCaption" : false
+      }, {
+        "caption" : "文本框",
+        "itemStyle" : "DEFAULT",
+        "itemType" : "FIELD",
+        "name" : "field_textbox2",
+        "getPSEditor" : {
+          "contentType" : "HTML",
+          "editorParams" : {
+            "contenttype" : "HTML"
+          },
+          "editorType" : "RAW",
+          "name" : "field_textbox2",
+          "predefinedType" : "FIELD_TEXTBOX"
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "hidden" : false,
+        "showCaption" : false
       } ],
       "name" : "simplelist_itempanel",
       "modelid" : "01B1D530-723C-4CB4-A877-5F5E3CFC11AF",
@@ -493,15 +518,15 @@
       "modeltype" : "PSDETOOLBAR"
     } ],
     "getPSDEListDataItems" : [ {
-      "dataType" : 25,
-      "name" : "testname"
-    }, {
       "dataType" : 25,
       "name" : "testid",
       "getPSAppDEField" : {
         "name" : "AMOUNT",
         "codeName" : "Amount"
       }
+    }, {
+      "dataType" : 25,
+      "name" : "testname"
     }, {
       "dataType" : 25,
       "name" : "srfkey",

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

@@ -352,7 +352,7 @@
         "uIActionType" : "DEUIACTION"
       },
       "tooltip" : "新建行",
-      "showCaption" : false,
+      "showCaption" : true,
       "showIcon" : true
     }, {
       "itemType" : "SEPERATOR",

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

@@ -352,7 +352,7 @@
         "uIActionType" : "DEUIACTION"
       },
       "tooltip" : "新建行",
-      "showCaption" : false,
+      "showCaption" : true,
       "showIcon" : true
     }, {
       "itemType" : "SEPERATOR",

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

@@ -640,6 +640,8 @@
       }, {
         "id" : "field_textbox1",
         "viewFieldName" : "TESTNAME"
+      }, {
+        "id" : "field_textbox2"
       } ],
       "codeName" : "Usr0522433048",
       "controlType" : "PANEL",
@@ -784,6 +786,9 @@
         "name" : "field_textbox1",
         "getPSEditor" : {
           "editorHeight" : 100.0,
+          "editorParams" : {
+            "contenttype" : "RAW"
+          },
           "editorType" : "RAW",
           "editorWidth" : 600.0,
           "name" : "field_textbox1",
@@ -801,6 +806,26 @@
         "width" : 600.0,
         "hidden" : false,
         "showCaption" : false
+      }, {
+        "caption" : "文本框",
+        "itemStyle" : "DEFAULT",
+        "itemType" : "FIELD",
+        "name" : "field_textbox2",
+        "getPSEditor" : {
+          "contentType" : "HTML",
+          "editorParams" : {
+            "contenttype" : "HTML"
+          },
+          "editorType" : "RAW",
+          "name" : "field_textbox2",
+          "predefinedType" : "FIELD_TEXTBOX"
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "hidden" : false,
+        "showCaption" : false
       } ],
       "name" : "list_itempanel",
       "modelid" : "01B1D530-723C-4CB4-A877-5F5E3CFC11AF",

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

@@ -352,7 +352,7 @@
         "uIActionType" : "DEUIACTION"
       },
       "tooltip" : "新建行",
-      "showCaption" : false,
+      "showCaption" : true,
       "showIcon" : true
     }, {
       "itemType" : "SEPERATOR",

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

@@ -852,7 +852,7 @@
         "uIActionType" : "DEUIACTION"
       },
       "tooltip" : "新建行",
-      "showCaption" : false,
+      "showCaption" : true,
       "showIcon" : true
     }, {
       "itemType" : "SEPERATOR",

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

@@ -3571,16 +3571,16 @@
     "codeName" : "VMGroup2",
     "name" : "视图消息组2",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息",
+      "name" : "视图消息2",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
       }
     }, {
-      "name" : "视图消息2",
+      "name" : "视图消息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
       }
     } ]
   }, {