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

800d937e · ibizdev · 62940be6 · 800d937e · 800d937e · 800d937e
--- a/app_Web/packages/ibiz-vue/src/components/common/app-simpleflex-container/app-simpleflex-container.less
+++ b/app_Web/packages/ibiz-vue/src/components/common/app-simpleflex-container/app-simpleflex-container.less
@@ -5,7 +5,7 @@
        .app-simpleflex-container-item{
            display: flex;
            >div{
-                width: 100% !important;
+                width: 100%;
            }
        }
    }

--- a/app_Web/packages/ibiz-vue/src/components/control/app-common-control/app-form-base.tsx
+++ b/app_Web/packages/ibiz-vue/src/components/control/app-common-control/app-form-base.tsx
@@ -235,29 +235,24 @@ export class AppFormBase extends EditFormControlBase {
     * @memberof AppFormBase
     */
    public renderFormPart(modelJson: IPSDEFormFormPart, index: number): any {
-        let { formPartType, name, codeName } = modelJson;
-        // 后续补
-        let systemCodeName = '',
-            appCodeName = '',
-            deCodeName = '',
-            formCodeName = '';
-
-        if (formPartType && formPartType == 'DYNASYS') {
-            return (
-                <app-form-part
-                    name={name}
-                    context={this.context}
-                    viewparams={this.viewparams}
-                    formState={this.formState}
-                    systemCodeName={systemCodeName}
-                    appCodeName={appCodeName}
-                    deCodeName={deCodeName}
-                    formCodeName={formCodeName}
-                    formDetailCodeName={codeName}
-                    on-change={this.onFormItemValueChange}
-                ></app-form-part>
-            );
-        }
+      let { formPartType, name, codeName } = modelJson;
+      if (formPartType && formPartType == 'DYNASYS') {
+          return (
+              <app-form-part
+                  name={name}
+                  data={this.data}
+                  context={this.context}
+                  viewparams={this.viewparams}
+                  formState={this.formState}
+                  systemCodeName={this.Environment.SysName}
+                  appCodeName={this.Environment.AppName}
+                  deCodeName={this.appDeCodeName}
+                  formCodeName={this.controlInstance.codeName}
+                  formDetailCodeName={codeName}
+                  on-change={this.onFormItemValueChange}
+              ></app-form-part>
+          );
+      }
    }

    /**

--- a/app_Web/packages/ibiz-vue/src/components/layout/app-default-layout/app-default-view-layout/app-default-view-layout.tsx
+++ b/app_Web/packages/ibiz-vue/src/components/layout/app-default-layout/app-default-view-layout/app-default-view-layout.tsx
@@ -825,6 +825,10 @@ export class AppDefaultViewLayout extends ControlContainer {
            if (this.layoutDetailsModel[name]?.isEnableMount === false) {
                return null;
            }
+            // 隐藏属性项不绘制
+            if (Object.is(item.itemType, 'FIELD') && (item as IPSSysPanelField).hidden) {
+              return null;
+            }
            if (Object.is(layout, 'BORDER')) {
                return (
                    <div style={childDetailStyle} slot={item.name} class={'app-pos-container'}>

--- a/trainsys-core/src/main/resources/liquibase/cn/ibizlab/trainsys/DEFAULT/h2_table.xml
+++ b/trainsys-core/src/main/resources/liquibase/cn/ibizlab/trainsys/DEFAULT/h2_table.xml
@@ -21,6 +21,12 @@
            </column>
            <column name="FIELD10" remarks="日期" type="DATETIME">
            </column>
+            <column name="FIELD11" remarks="属性11" type="VARCHAR(100)">
+            </column>
+            <column name="FIELD12" remarks="属性12" type="VARCHAR(100)">
+            </column>
+            <column name="FIELD13" remarks="属性13" type="VARCHAR(100)">
+            </column>
            <column name="FIELD2" remarks="属性2" type="VARCHAR(100)">
            </column>
            <column name="FIELD3" remarks="属性3" type="VARCHAR(100)">

--- a/trainsys-core/src/main/resources/liquibase/h2_table.xml
+++ b/trainsys-core/src/main/resources/liquibase/h2_table.xml
@@ -2,7 +2,7 @@
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">

    <!--输出实体[BOOK]数据结构 -->
-    <changeSet author="root" id="tab-book-82-1">
+    <changeSet author="root" id="tab-book-104-1">
        <createTable tableName="T_BOOK">
                <column name="BOOKNAME" remarks="" type="VARCHAR(200)">
                </column>
@@ -45,6 +45,12 @@
                </column>
                <column name="DATE" remarks="" type="DATETIME">
                </column>
+                <column name="FIELD11" remarks="" type="VARCHAR(100)">
+                </column>
+                <column name="FIELD12" remarks="" type="VARCHAR(100)">
+                </column>
+                <column name="FIELD13" remarks="" type="VARCHAR(100)">
+                </column>
        </createTable>
    </changeSet>


--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Book.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Book.json
@@ -243,6 +243,15 @@
    }, {
      "name" : "DATE",
      "codeName" : "Date"
+    }, {
+      "name" : "FIELD11",
+      "codeName" : "Field11"
+    }, {
+      "name" : "FIELD12",
+      "codeName" : "Field12"
+    }, {
+      "name" : "FIELD13",
+      "codeName" : "Field13"
    } ],
    "codeName" : "Table",
    "dynaModelFilePath" : "PSMODULES/common/PSDATAENTITIES/Book/PSDETABLES/Table.json",
@@ -1979,6 +1988,234 @@
    },
    "stdDataType" : 5,
    "valueFormat" : "%1$tY-%1$tm-%1$td"
+  }, {
+    "getAllPSDEFDTColumns" : [ {
+      "columnName" : "FIELD11",
+      "dBType" : "MYSQL5",
+      "name" : "FIELD11",
+      "queryCodeExp" : "t1.`FIELD11`",
+      "standardColumnName" : "`FIELD11`"
+    } ],
+    "getAllPSDEFUIModes" : [ {
+      "codeName" : "Default",
+      "name" : "[FIELD11][属性11]",
+      "getPSDEFFormItem" : {
+        "codeName" : "Default",
+        "editorType" : "TEXTBOX",
+        "name" : "[FIELD11][属性11]",
+        "stringLength" : 100,
+        "uIMode" : "DEFAULT"
+      },
+      "type" : "DEFAULT"
+    }, {
+      "codeName" : "MobileDefault",
+      "name" : "[FIELD11][属性11]移动端默认",
+      "getPSDEFFormItem" : {
+        "codeName" : "MobileDefault",
+        "editorType" : "MOBTEXT",
+        "name" : "[FIELD11][属性11]移动端默认",
+        "stringLength" : 100,
+        "uIMode" : "MOBILEDEFAULT",
+        "mobileMode" : true
+      },
+      "type" : "MOBILEDEFAULT",
+      "mobileMode" : true
+    } ],
+    "getAllPSDEFValueRules" : [ {
+      "codeName" : "Default",
+      "name" : "默认规则",
+      "getPSDEFVRGroupCondition" : {
+        "condOp" : "AND",
+        "condType" : "GROUP",
+        "name" : "默认组",
+        "getPSDEFVRConditions" : [ {
+          "condType" : "STRINGLENGTH",
+          "dEFName" : "FIELD11",
+          "maxValue" : 100,
+          "name" : "默认字符串长度",
+          "ruleInfo" : "内容长度必须小于等于[100]",
+          "includeMaxValue" : true,
+          "includeMinValue" : false,
+          "keyCond" : true
+        } ],
+        "ruleInfo" : "内容长度必须小于等于[100]"
+      },
+      "ruleInfo" : "内容长度必须小于等于[100]",
+      "checkDefault" : true,
+      "defaultMode" : true,
+      "enableBackend" : true,
+      "enableFront" : true
+    } ],
+    "codeName" : "Field11",
+    "dEFType" : 1,
+    "dataType" : "TEXT",
+    "importOrder" : 1000,
+    "length" : 100,
+    "logicName" : "属性11",
+    "name" : "FIELD11",
+    "getPSDEDBTable" : {
+      "modelref" : true,
+      "path" : "PSMODULES/common/PSDATAENTITIES/Book/PSDETABLES/Table.json"
+    },
+    "getPSSysDBColumn" : {
+      "modelref" : true,
+      "id" : "FIELD11"
+    },
+    "stdDataType" : 25,
+    "stringLength" : 100,
+    "valueFormat" : "%1$s"
+  }, {
+    "getAllPSDEFDTColumns" : [ {
+      "columnName" : "FIELD12",
+      "dBType" : "MYSQL5",
+      "name" : "FIELD12",
+      "queryCodeExp" : "t1.`FIELD12`",
+      "standardColumnName" : "`FIELD12`"
+    } ],
+    "getAllPSDEFUIModes" : [ {
+      "codeName" : "MobileDefault",
+      "name" : "[FIELD12][属性12]移动端默认",
+      "getPSDEFFormItem" : {
+        "codeName" : "MobileDefault",
+        "editorType" : "MOBTEXT",
+        "name" : "[FIELD12][属性12]移动端默认",
+        "stringLength" : 100,
+        "uIMode" : "MOBILEDEFAULT",
+        "mobileMode" : true
+      },
+      "type" : "MOBILEDEFAULT",
+      "mobileMode" : true
+    }, {
+      "codeName" : "Default",
+      "name" : "[FIELD12][属性12]",
+      "getPSDEFFormItem" : {
+        "codeName" : "Default",
+        "editorType" : "TEXTBOX",
+        "name" : "[FIELD12][属性12]",
+        "stringLength" : 100,
+        "uIMode" : "DEFAULT"
+      },
+      "type" : "DEFAULT"
+    } ],
+    "getAllPSDEFValueRules" : [ {
+      "codeName" : "Default",
+      "name" : "默认规则",
+      "getPSDEFVRGroupCondition" : {
+        "condOp" : "AND",
+        "condType" : "GROUP",
+        "name" : "默认组",
+        "getPSDEFVRConditions" : [ {
+          "condType" : "STRINGLENGTH",
+          "dEFName" : "FIELD12",
+          "maxValue" : 100,
+          "name" : "默认字符串长度",
+          "ruleInfo" : "内容长度必须小于等于[100]",
+          "includeMaxValue" : true,
+          "includeMinValue" : false,
+          "keyCond" : true
+        } ],
+        "ruleInfo" : "内容长度必须小于等于[100]"
+      },
+      "ruleInfo" : "内容长度必须小于等于[100]",
+      "checkDefault" : true,
+      "defaultMode" : true,
+      "enableBackend" : true,
+      "enableFront" : true
+    } ],
+    "codeName" : "Field12",
+    "dEFType" : 1,
+    "dataType" : "TEXT",
+    "importOrder" : 1000,
+    "length" : 100,
+    "logicName" : "属性12",
+    "name" : "FIELD12",
+    "getPSDEDBTable" : {
+      "modelref" : true,
+      "path" : "PSMODULES/common/PSDATAENTITIES/Book/PSDETABLES/Table.json"
+    },
+    "getPSSysDBColumn" : {
+      "modelref" : true,
+      "id" : "FIELD12"
+    },
+    "stdDataType" : 25,
+    "stringLength" : 100,
+    "valueFormat" : "%1$s"
+  }, {
+    "getAllPSDEFDTColumns" : [ {
+      "columnName" : "FIELD13",
+      "dBType" : "MYSQL5",
+      "name" : "FIELD13",
+      "queryCodeExp" : "t1.`FIELD13`",
+      "standardColumnName" : "`FIELD13`"
+    } ],
+    "getAllPSDEFUIModes" : [ {
+      "codeName" : "MobileDefault",
+      "name" : "[FIELD13][属性13]移动端默认",
+      "getPSDEFFormItem" : {
+        "codeName" : "MobileDefault",
+        "editorType" : "MOBTEXT",
+        "name" : "[FIELD13][属性13]移动端默认",
+        "stringLength" : 100,
+        "uIMode" : "MOBILEDEFAULT",
+        "mobileMode" : true
+      },
+      "type" : "MOBILEDEFAULT",
+      "mobileMode" : true
+    }, {
+      "codeName" : "Default",
+      "name" : "[FIELD13][属性13]",
+      "getPSDEFFormItem" : {
+        "codeName" : "Default",
+        "editorType" : "TEXTBOX",
+        "name" : "[FIELD13][属性13]",
+        "stringLength" : 100,
+        "uIMode" : "DEFAULT"
+      },
+      "type" : "DEFAULT"
+    } ],
+    "getAllPSDEFValueRules" : [ {
+      "codeName" : "Default",
+      "name" : "默认规则",
+      "getPSDEFVRGroupCondition" : {
+        "condOp" : "AND",
+        "condType" : "GROUP",
+        "name" : "默认组",
+        "getPSDEFVRConditions" : [ {
+          "condType" : "STRINGLENGTH",
+          "dEFName" : "FIELD13",
+          "maxValue" : 100,
+          "name" : "默认字符串长度",
+          "ruleInfo" : "内容长度必须小于等于[100]",
+          "includeMaxValue" : true,
+          "includeMinValue" : false,
+          "keyCond" : true
+        } ],
+        "ruleInfo" : "内容长度必须小于等于[100]"
+      },
+      "ruleInfo" : "内容长度必须小于等于[100]",
+      "checkDefault" : true,
+      "defaultMode" : true,
+      "enableBackend" : true,
+      "enableFront" : true
+    } ],
+    "codeName" : "Field13",
+    "dEFType" : 1,
+    "dataType" : "TEXT",
+    "importOrder" : 1000,
+    "length" : 100,
+    "logicName" : "属性13",
+    "name" : "FIELD13",
+    "getPSDEDBTable" : {
+      "modelref" : true,
+      "path" : "PSMODULES/common/PSDATAENTITIES/Book/PSDETABLES/Table.json"
+    },
+    "getPSSysDBColumn" : {
+      "modelref" : true,
+      "id" : "FIELD13"
+    },
+    "stdDataType" : 25,
+    "stringLength" : 100,
+    "valueFormat" : "%1$s"
  } ],
  "getAllPSDEMethodDTOs" : [ {
    "name" : "BookDTO",
@@ -2072,6 +2309,39 @@
      "sourceType" : "DEFIELD",
      "stdDataType" : 5,
      "type" : "SIMPLE"
+    }, {
+      "logicName" : "属性11",
+      "name" : "Field11",
+      "getPSDEField" : {
+        "name" : "FIELD11",
+        "codeName" : "Field11"
+      },
+      "sourceType" : "DEFIELD",
+      "stdDataType" : 25,
+      "stringLength" : 100,
+      "type" : "SIMPLE"
+    }, {
+      "logicName" : "属性12",
+      "name" : "Field12",
+      "getPSDEField" : {
+        "name" : "FIELD12",
+        "codeName" : "Field12"
+      },
+      "sourceType" : "DEFIELD",
+      "stdDataType" : 25,
+      "stringLength" : 100,
+      "type" : "SIMPLE"
+    }, {
+      "logicName" : "属性13",
+      "name" : "Field13",
+      "getPSDEField" : {
+        "name" : "FIELD13",
+        "codeName" : "Field13"
+      },
+      "sourceType" : "DEFIELD",
+      "stdDataType" : 25,
+      "stringLength" : 100,
+      "type" : "SIMPLE"
    }, {
      "logicName" : "属性2",
      "name" : "Field2",
@@ -2520,6 +2790,12 @@
    "name" : "书实体编辑视图",
    "realModelSubType" : "DEEDITVIEW",
    "realModelType" : "PSDEVIEWBASE"
+  }, {
+    "codeName" : "OptionView",
+    "logicName" : "书实体选项操作视图",
+    "name" : "书实体选项操作视图",
+    "realModelSubType" : "DEOPTVIEW",
+    "realModelType" : "PSDEVIEWBASE"
  }, {
    "codeName" : "RedirectView",
    "logicName" : "书实体数据重定向视图",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Book/PSDEDATAQUERIES/Default/PSDEDQCODES/MYSQL5.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Book/PSDEDATAQUERIES/Default/PSDEDQCODES/MYSQL5.json
@@ -25,6 +25,15 @@
  }, {
    "expression" : "t1.`FIELD10`",
    "name" : "FIELD10"
+  }, {
+    "expression" : "t1.`FIELD11`",
+    "name" : "FIELD11"
+  }, {
+    "expression" : "t1.`FIELD12`",
+    "name" : "FIELD12"
+  }, {
+    "expression" : "t1.`FIELD13`",
+    "name" : "FIELD13"
  }, {
    "expression" : "t1.`FIELD2`",
    "name" : "FIELD2"
@@ -62,6 +71,6 @@
    "expression" : "t1.`UPDATEMAN`",
    "name" : "UPDATEMAN"
  } ],
-  "queryCode" : "SELECT\nt1.`BOOKID`,\nt1.`BOOKNAME`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`DATE`,\nt1.`DEPTID`,\nt1.`FIELD`,\nt1.`FIELD10`,\nt1.`FIELD2`,\nt1.`FIELD3`,\nt1.`FIELD4`,\nt1.`FIELD5`,\nt1.`FIELD6`,\nt1.`FIELD7`,\nt1.`FIELD8`,\nt1.`FIELD9`,\nt1.`ORGID`,\nt1.`TYPE`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_BOOK` t1 \n",
+  "queryCode" : "SELECT\nt1.`BOOKID`,\nt1.`BOOKNAME`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`DATE`,\nt1.`DEPTID`,\nt1.`FIELD`,\nt1.`FIELD10`,\nt1.`FIELD11`,\nt1.`FIELD12`,\nt1.`FIELD13`,\nt1.`FIELD2`,\nt1.`FIELD3`,\nt1.`FIELD4`,\nt1.`FIELD5`,\nt1.`FIELD6`,\nt1.`FIELD7`,\nt1.`FIELD8`,\nt1.`FIELD9`,\nt1.`ORGID`,\nt1.`TYPE`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_BOOK` t1 \n",
  "id" : "PSMODULES/common/PSDATAENTITIES/Book/PSDEDATAQUERIES/Default/PSDEDQCODES/MYSQL5.json"
 }
\ No newline at end of file
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Book/PSDEDATAQUERIES/View/PSDEDQCODES/MYSQL5.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Book/PSDEDATAQUERIES/View/PSDEDQCODES/MYSQL5.json
@@ -25,6 +25,15 @@
  }, {
    "expression" : "t1.`FIELD10`",
    "name" : "FIELD10"
+  }, {
+    "expression" : "t1.`FIELD11`",
+    "name" : "FIELD11"
+  }, {
+    "expression" : "t1.`FIELD12`",
+    "name" : "FIELD12"
+  }, {
+    "expression" : "t1.`FIELD13`",
+    "name" : "FIELD13"
  }, {
    "expression" : "t1.`FIELD2`",
    "name" : "FIELD2"
@@ -62,6 +71,6 @@
    "expression" : "t1.`UPDATEMAN`",
    "name" : "UPDATEMAN"
  } ],
-  "queryCode" : "SELECT\nt1.`BOOKID`,\nt1.`BOOKNAME`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`DATE`,\nt1.`DEPTID`,\nt1.`FIELD`,\nt1.`FIELD10`,\nt1.`FIELD2`,\nt1.`FIELD3`,\nt1.`FIELD4`,\nt1.`FIELD5`,\nt1.`FIELD6`,\nt1.`FIELD7`,\nt1.`FIELD8`,\nt1.`FIELD9`,\nt1.`ORGID`,\nt1.`TYPE`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_BOOK` t1 \n",
+  "queryCode" : "SELECT\nt1.`BOOKID`,\nt1.`BOOKNAME`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`DATE`,\nt1.`DEPTID`,\nt1.`FIELD`,\nt1.`FIELD10`,\nt1.`FIELD11`,\nt1.`FIELD12`,\nt1.`FIELD13`,\nt1.`FIELD2`,\nt1.`FIELD3`,\nt1.`FIELD4`,\nt1.`FIELD5`,\nt1.`FIELD6`,\nt1.`FIELD7`,\nt1.`FIELD8`,\nt1.`FIELD9`,\nt1.`ORGID`,\nt1.`TYPE`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_BOOK` t1 \n",
  "id" : "PSMODULES/common/PSDATAENTITIES/Book/PSDEDATAQUERIES/View/PSDEDQCODES/MYSQL5.json"
 }
\ No newline at end of file
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json
@@ -349,6 +349,24 @@
    "name" : "DATE",
    "stdDataType" : 5,
    "valueFormat" : "YYYY-MM-DD"
+  }, {
+    "codeName" : "Field11",
+    "logicName" : "属性11",
+    "name" : "FIELD11",
+    "stdDataType" : 25,
+    "stringLength" : 100
+  }, {
+    "codeName" : "Field12",
+    "logicName" : "属性12",
+    "name" : "FIELD12",
+    "stdDataType" : 25,
+    "stringLength" : 100
+  }, {
+    "codeName" : "Field13",
+    "logicName" : "属性13",
+    "name" : "FIELD13",
+    "stdDataType" : 25,
+    "stringLength" : 100
  } ],
  "getAllPSAppDEMethodDTOs" : [ {
    "codeName" : "BookDTO",
@@ -452,6 +470,42 @@
      "sourceType" : "DEFIELD",
      "stdDataType" : 5,
      "type" : "SIMPLE"
+    }, {
+      "codeName" : "Field11",
+      "logicName" : "属性11",
+      "name" : "Field11",
+      "orderValue" : 1000,
+      "getPSAppDEField" : {
+        "name" : "FIELD11",
+        "codeName" : "Field11"
+      },
+      "sourceType" : "DEFIELD",
+      "stdDataType" : 25,
+      "type" : "SIMPLE"
+    }, {
+      "codeName" : "Field12",
+      "logicName" : "属性12",
+      "name" : "Field12",
+      "orderValue" : 1000,
+      "getPSAppDEField" : {
+        "name" : "FIELD12",
+        "codeName" : "Field12"
+      },
+      "sourceType" : "DEFIELD",
+      "stdDataType" : 25,
+      "type" : "SIMPLE"
+    }, {
+      "codeName" : "Field13",
+      "logicName" : "属性13",
+      "name" : "Field13",
+      "orderValue" : 1000,
+      "getPSAppDEField" : {
+        "name" : "FIELD13",
+        "codeName" : "Field13"
+      },
+      "sourceType" : "DEFIELD",
+      "stdDataType" : 25,
+      "type" : "SIMPLE"
    }, {
      "codeName" : "Field2",
      "logicName" : "属性2",
@@ -878,6 +932,29 @@
    "requestPath" : "/select",
    "builtinMethod" : false
  } ],
+  "getAllPSAppDEUILogics" : [ {
+    "codeName" : "test",
+    "defaultParamName" : "Default",
+    "logicName" : "tes",
+    "name" : "tes",
+    "getPSDEUILogicNodes" : [ {
+      "codeName" : "Begin",
+      "logicNodeType" : "BEGIN",
+      "name" : "开始",
+      "parallelOutput" : true
+    } ],
+    "getPSDEUILogicParams" : [ {
+      "codeName" : "Default",
+      "logicName" : "传入变量",
+      "name" : "传入变量",
+      "default" : true,
+      "entityParam" : true
+    } ],
+    "getStartPSDEUILogicNode" : {
+      "modelref" : true,
+      "id" : "Begin"
+    }
+  } ],
  "getAllPSDEOPPrivs" : [ {
    "logicName" : "建立",
    "name" : "CREATE"

--- 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,6 +113,69 @@
      "name" : "FIELD3",
      "codeName" : "Field3"
    }
+  }, {
+    "id" : "field5",
+    "dataType" : 25,
+    "getPSAppDEField" : {
+      "name" : "FIELD5",
+      "codeName" : "Field5"
+    }
+  }, {
+    "id" : "date",
+    "dataType" : 5,
+    "getPSAppDEField" : {
+      "name" : "DATE",
+      "codeName" : "Date"
+    }
+  }, {
+    "id" : "field6",
+    "dataType" : 25,
+    "getPSAppDEField" : {
+      "name" : "FIELD6",
+      "codeName" : "Field6"
+    }
+  }, {
+    "id" : "field7",
+    "dataType" : 25,
+    "getPSAppDEField" : {
+      "name" : "FIELD7",
+      "codeName" : "Field7"
+    }
+  }, {
+    "id" : "field8",
+    "dataType" : 25,
+    "getPSAppDEField" : {
+      "name" : "FIELD8",
+      "codeName" : "Field8"
+    }
+  }, {
+    "id" : "field9",
+    "dataType" : 25,
+    "getPSAppDEField" : {
+      "name" : "FIELD9",
+      "codeName" : "Field9"
+    }
+  }, {
+    "id" : "field11",
+    "dataType" : 25,
+    "getPSAppDEField" : {
+      "name" : "FIELD11",
+      "codeName" : "Field11"
+    }
+  }, {
+    "id" : "field12",
+    "dataType" : 25,
+    "getPSAppDEField" : {
+      "name" : "FIELD12",
+      "codeName" : "Field12"
+    }
+  }, {
+    "id" : "field13",
+    "dataType" : 25,
+    "getPSAppDEField" : {
+      "name" : "FIELD13",
+      "codeName" : "Field13"
+    }
  }, {
    "id" : "createman",
    "dataType" : 25,
@@ -305,6 +368,294 @@
        "allowEmpty" : true,
        "needCodeListConfig" : true,
        "showCaption" : true
+      }, {
+        "caption" : "单选项列表",
+        "codeName" : "field5",
+        "dataType" : 25,
+        "detailStyle" : "DEFAULT",
+        "detailType" : "FORMITEM",
+        "enableCond" : 3,
+        "ignoreInput" : 0,
+        "labelPos" : "LEFT",
+        "labelWidth" : 130,
+        "name" : "field5",
+        "noPrivDisplayMode" : 1,
+        "getPSAppDEField" : {
+          "name" : "FIELD5",
+          "codeName" : "Field5"
+        },
+        "getPSEditor" : {
+          "editorType" : "RADIOBUTTONLIST",
+          "name" : "field5"
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "allowEmpty" : true,
+        "needCodeListConfig" : true,
+        "showCaption" : true
+      }, {
+        "caption" : "时间选择器",
+        "codeName" : "date",
+        "dataType" : 5,
+        "detailStyle" : "DEFAULT",
+        "detailType" : "FORMITEM",
+        "enableCond" : 3,
+        "ignoreInput" : 0,
+        "itemWidth" : 290.0,
+        "labelPos" : "LEFT",
+        "labelWidth" : 130,
+        "name" : "date",
+        "noPrivDisplayMode" : 1,
+        "getPSAppDEField" : {
+          "name" : "DATE",
+          "codeName" : "Date"
+        },
+        "getPSEditor" : {
+          "dateTimeFormat" : "YYYY-MM-DD HH:mm:ss",
+          "editorParams" : {
+            "TIMEFMT" : "YYYY-MM-DD HH:mm:ss"
+          },
+          "editorType" : "DATEPICKER",
+          "editorWidth" : 160.0,
+          "name" : "date"
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "valueFormat" : "YYYY-MM-DD",
+        "allowEmpty" : true,
+        "showCaption" : true
+      }, {
+        "caption" : "文件上传",
+        "codeName" : "field6",
+        "dataType" : 25,
+        "detailStyle" : "DEFAULT",
+        "detailType" : "FORMITEM",
+        "enableCond" : 3,
+        "ignoreInput" : 0,
+        "labelPos" : "LEFT",
+        "labelWidth" : 130,
+        "name" : "field6",
+        "noPrivDisplayMode" : 1,
+        "getPSAppDEField" : {
+          "name" : "FIELD6",
+          "codeName" : "Field6"
+        },
+        "getPSEditor" : {
+          "editorParams" : {
+            "FILEEXTS" : "",
+            "MAXFILESIZE" : "",
+            "MINFILECNT" : "",
+            "MAXFILECNT" : ""
+          },
+          "editorType" : "FILEUPLOADER",
+          "maxFileCount" : -1,
+          "maxFileSize" : -1,
+          "minFileCount" : 0,
+          "name" : "field6"
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "allowEmpty" : true,
+        "showCaption" : true
+      }, {
+        "caption" : "HTML",
+        "codeName" : "field7",
+        "dataType" : 25,
+        "detailStyle" : "DEFAULT",
+        "detailType" : "FORMITEM",
+        "enableCond" : 3,
+        "ignoreInput" : 0,
+        "labelPos" : "LEFT",
+        "labelWidth" : 130,
+        "name" : "field7",
+        "noPrivDisplayMode" : 1,
+        "getPSAppDEField" : {
+          "name" : "FIELD7",
+          "codeName" : "Field7"
+        },
+        "getPSEditor" : {
+          "editorType" : "HTMLEDITOR",
+          "name" : "field7"
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "allowEmpty" : true,
+        "showCaption" : true
+      }, {
+        "caption" : "密码框",
+        "codeName" : "field8",
+        "dataType" : 25,
+        "detailStyle" : "DEFAULT",
+        "detailType" : "FORMITEM",
+        "enableCond" : 3,
+        "ignoreInput" : 0,
+        "labelPos" : "LEFT",
+        "labelWidth" : 130,
+        "name" : "field8",
+        "noPrivDisplayMode" : 1,
+        "getPSAppDEField" : {
+          "name" : "FIELD8",
+          "codeName" : "Field8"
+        },
+        "getPSEditor" : {
+          "editorType" : "PASSWORD",
+          "maxLength" : 100,
+          "name" : "field8"
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "allowEmpty" : true,
+        "showCaption" : true
+      }, {
+        "caption" : "数据选择",
+        "codeName" : "field9",
+        "dataType" : 25,
+        "detailStyle" : "DEFAULT",
+        "detailType" : "FORMITEM",
+        "enableCond" : 3,
+        "ignoreInput" : 0,
+        "labelPos" : "LEFT",
+        "labelWidth" : 130,
+        "name" : "field9",
+        "noPrivDisplayMode" : 1,
+        "getPSAppDEField" : {
+          "name" : "FIELD9",
+          "codeName" : "Field9"
+        },
+        "getPSEditor" : {
+          "editorParams" : {
+            "AC" : "TRUE",
+            "PICKUPVIEW" : "TRUE"
+          },
+          "editorType" : "PICKER",
+          "handlerType" : "PickupText",
+          "name" : "field9",
+          "enableAC" : true,
+          "enablePickupView" : true,
+          "forceSelection" : true,
+          "showTrigger" : true,
+          "singleSelect" : true
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "allowEmpty" : true,
+        "showCaption" : true
+      }, {
+        "caption" : "数据选择（下拉）",
+        "codeName" : "field11",
+        "dataType" : 25,
+        "detailStyle" : "DEFAULT",
+        "detailType" : "FORMITEM",
+        "enableCond" : 3,
+        "ignoreInput" : 0,
+        "labelPos" : "LEFT",
+        "labelWidth" : 130,
+        "name" : "field11",
+        "noPrivDisplayMode" : 1,
+        "getPSAppDEField" : {
+          "name" : "FIELD11",
+          "codeName" : "Field11"
+        },
+        "getPSEditor" : {
+          "editorParams" : {
+            "AC" : "TRUE",
+            "TRIGGER" : "TRUE",
+            "PICKUPVIEW" : "FALSE"
+          },
+          "editorType" : "PICKEREX_TRIGGER",
+          "handlerType" : "PickupText",
+          "name" : "field11",
+          "enableAC" : true,
+          "enablePickupView" : false,
+          "forceSelection" : true,
+          "showTrigger" : true,
+          "singleSelect" : true
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "allowEmpty" : true,
+        "showCaption" : true
+      }, {
+        "caption" : "数据选择（链接）",
+        "codeName" : "field12",
+        "dataType" : 25,
+        "detailStyle" : "DEFAULT",
+        "detailType" : "FORMITEM",
+        "enableCond" : 3,
+        "ignoreInput" : 0,
+        "labelPos" : "LEFT",
+        "labelWidth" : 130,
+        "name" : "field12",
+        "noPrivDisplayMode" : 1,
+        "getPSAppDEField" : {
+          "name" : "FIELD12",
+          "codeName" : "Field12"
+        },
+        "getPSEditor" : {
+          "editorParams" : {
+            "LINKVIEW" : "TRUE",
+            "AC" : "TRUE",
+            "TRIGGER" : "FALSE",
+            "PICKUPVIEW" : "TRUE"
+          },
+          "editorType" : "PICKEREX_LINK",
+          "handlerType" : "PickupText",
+          "name" : "field12",
+          "enableAC" : true,
+          "enableLinkView" : true,
+          "enablePickupView" : true,
+          "forceSelection" : true,
+          "showTrigger" : false,
+          "singleSelect" : true
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "allowEmpty" : true,
+        "showCaption" : true
+      }, {
+        "caption" : "多行输入",
+        "codeName" : "field13",
+        "dataType" : 25,
+        "detailStyle" : "DEFAULT",
+        "detailType" : "FORMITEM",
+        "enableCond" : 3,
+        "ignoreInput" : 0,
+        "labelPos" : "LEFT",
+        "labelWidth" : 130,
+        "name" : "field13",
+        "noPrivDisplayMode" : 1,
+        "getPSAppDEField" : {
+          "name" : "FIELD13",
+          "codeName" : "Field13"
+        },
+        "getPSEditor" : {
+          "editorType" : "TEXTAREA",
+          "maxLength" : 100,
+          "name" : "field13",
+          "showMaxLength" : true
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "allowEmpty" : true,
+        "showCaption" : true
      } ],
      "getPSLayout" : {
        "columnCount" : 24,

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/RawMaterial/PSFORMS/Main.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/RawMaterial/PSFORMS/Main.json
@@ -99,6 +99,13 @@
      "name" : "RAWMATERIALNAME",
      "codeName" : "RawMaterialName"
    }
+  }, {
+    "id" : "rawmaterialid",
+    "dataType" : 25,
+    "getPSAppDEField" : {
+      "name" : "RAWMATERIALID",
+      "codeName" : "RawMaterialId"
+    }
  }, {
    "id" : "createman",
    "dataType" : 25,
@@ -127,14 +134,6 @@
      "name" : "UPDATEDATE",
      "codeName" : "UpdateDate"
    }
-  }, {
-    "id" : "rawmaterialid",
-    "hidden" : true,
-    "dataType" : 25,
-    "getPSAppDEField" : {
-      "name" : "RAWMATERIALID",
-      "codeName" : "RawMaterialId"
-    }
  } ],
  "getPSDEFormPages" : [ {
    "caption" : "基本信息",
@@ -259,6 +258,68 @@
      },
      "allowEmpty" : true,
      "showCaption" : true
+    }, {
+      "codeName" : "tabpanel1",
+      "detailStyle" : "DEFAULT",
+      "detailType" : "TABPANEL",
+      "name" : "tabpanel1",
+      "getPSDEFormTabPages" : [ {
+        "caption" : "分页111",
+        "codeName" : "tabpage1",
+        "detailStyle" : "DEFAULT",
+        "detailType" : "TABPAGE",
+        "name" : "tabpage1",
+        "getPSLayout" : {
+          "columnCount" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "infoGroupMode" : false,
+        "showCaption" : true
+      }, {
+        "caption" : "分页222",
+        "codeName" : "tabpage2",
+        "detailStyle" : "DEFAULT",
+        "detailType" : "TABPAGE",
+        "name" : "tabpage2",
+        "getPSDEFormDetails" : [ {
+          "caption" : "原材料标识",
+          "codeName" : "rawmaterialid",
+          "dataType" : 25,
+          "detailStyle" : "DEFAULT",
+          "detailType" : "FORMITEM",
+          "enableCond" : 3,
+          "ignoreInput" : 0,
+          "labelPos" : "LEFT",
+          "labelWidth" : 130,
+          "name" : "rawmaterialid",
+          "noPrivDisplayMode" : 1,
+          "getPSAppDEField" : {
+            "name" : "RAWMATERIALID",
+            "codeName" : "RawMaterialId"
+          },
+          "getPSEditor" : {
+            "editorType" : "SPAN",
+            "name" : "rawmaterialid",
+            "enableLinkView" : false
+          },
+          "getPSLayoutPos" : {
+            "colMD" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "allowEmpty" : true,
+          "showCaption" : true
+        } ],
+        "getPSLayout" : {
+          "columnCount" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "infoGroupMode" : false,
+        "showCaption" : true
+      } ],
+      "getPSLayoutPos" : {
+        "colMD" : 24,
+        "layout" : "TABLE_24COL"
+      }
    } ],
    "getPSLayout" : {
      "columnCount" : 24,

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/RawMaterialEditView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/RawMaterialEditView.json
@@ -1085,6 +1085,13 @@
        "name" : "RAWMATERIALNAME",
        "codeName" : "RawMaterialName"
      }
+    }, {
+      "id" : "rawmaterialid",
+      "dataType" : 25,
+      "getPSAppDEField" : {
+        "name" : "RAWMATERIALID",
+        "codeName" : "RawMaterialId"
+      }
    }, {
      "id" : "createman",
      "dataType" : 25,
@@ -1113,14 +1120,6 @@
        "name" : "UPDATEDATE",
        "codeName" : "UpdateDate"
      }
-    }, {
-      "id" : "rawmaterialid",
-      "hidden" : true,
-      "dataType" : 25,
-      "getPSAppDEField" : {
-        "name" : "RAWMATERIALID",
-        "codeName" : "RawMaterialId"
-      }
    } ],
    "getPSDEFormPages" : [ {
      "caption" : "基本信息",
@@ -1245,6 +1244,68 @@
        },
        "allowEmpty" : true,
        "showCaption" : true
+      }, {
+        "codeName" : "tabpanel1",
+        "detailStyle" : "DEFAULT",
+        "detailType" : "TABPANEL",
+        "name" : "tabpanel1",
+        "getPSDEFormTabPages" : [ {
+          "caption" : "分页111",
+          "codeName" : "tabpage1",
+          "detailStyle" : "DEFAULT",
+          "detailType" : "TABPAGE",
+          "name" : "tabpage1",
+          "getPSLayout" : {
+            "columnCount" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "infoGroupMode" : false,
+          "showCaption" : true
+        }, {
+          "caption" : "分页222",
+          "codeName" : "tabpage2",
+          "detailStyle" : "DEFAULT",
+          "detailType" : "TABPAGE",
+          "name" : "tabpage2",
+          "getPSDEFormDetails" : [ {
+            "caption" : "原材料标识",
+            "codeName" : "rawmaterialid",
+            "dataType" : 25,
+            "detailStyle" : "DEFAULT",
+            "detailType" : "FORMITEM",
+            "enableCond" : 3,
+            "ignoreInput" : 0,
+            "labelPos" : "LEFT",
+            "labelWidth" : 130,
+            "name" : "rawmaterialid",
+            "noPrivDisplayMode" : 1,
+            "getPSAppDEField" : {
+              "name" : "RAWMATERIALID",
+              "codeName" : "RawMaterialId"
+            },
+            "getPSEditor" : {
+              "editorType" : "SPAN",
+              "name" : "rawmaterialid",
+              "enableLinkView" : false
+            },
+            "getPSLayoutPos" : {
+              "colMD" : 24,
+              "layout" : "TABLE_24COL"
+            },
+            "allowEmpty" : true,
+            "showCaption" : true
+          } ],
+          "getPSLayout" : {
+            "columnCount" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "infoGroupMode" : false,
+          "showCaption" : true
+        } ],
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        }
      } ],
      "getPSLayout" : {
        "columnCount" : 24,

--- 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
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookOptionView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookOptionView.json
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPPORTALVIEWS/AppPortalView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPPORTALVIEWS/AppPortalView.json
+{
+  "accUserMode" : 0,
+  "codeName" : "AppPortalView",
+  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPPORTALVIEWS/AppPortalView.json",
+  "name" : "AppPortalView",
+  "getPSControls" : [ {
+    "codeName" : "AppPortalView_db",
+    "controlType" : "DASHBOARD",
+    "name" : "dashboard",
+    "getPSControlHandler" : {
+      "enableDEFieldPrivilege" : false,
+      "id" : "dashboard"
+    },
+    "getPSControlParam" : {
+      "autoLoad" : true,
+      "showBusyIndicator" : true
+    },
+    "getPSLayout" : {
+      "columnCount" : 24,
+      "layout" : "TABLE_24COL"
+    },
+    "enableCustomized" : false,
+    "modelid" : "B2D554B2-5150-4FA6-B5EF-B9A6C1AA7848",
+    "modeltype" : "PSSYSDASHBOARD"
+  } ],
+  "getPSViewLayoutPanel" : {
+    "codeName" : "Layoutpanel",
+    "controlStyle" : "APPPORTALVIEW",
+    "controlType" : "VIEWLAYOUTPANEL",
+    "name" : "layoutpanel",
+    "getPSControlParam" : { },
+    "layoutBodyOnly" : true,
+    "layoutPanel" : true,
+    "useDefaultLayout" : true
+  },
+  "title" : "应用门户视图",
+  "viewStyle" : "DEFAULT",
+  "viewType" : "APPPORTALVIEW",
+  "enableDP" : true,
+  "modelid" : "B2D554B2-5150-4FA6-B5EF-B9A6C1AA7848",
+  "modeltype" : "PSAPPPORTALVIEW"
+}
\ No newline at end of file
--- 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
@@ -716,6 +716,12 @@
    "viewType" : "DEEDITVIEW",
    "resource" : "Book",
    "view" : "EditView"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookOptionView.json",
+    "viewType" : "DEOPTVIEW",
+    "resource" : "Book",
+    "view" : "OptionView"
  }, {
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoEditView.json",
@@ -746,6 +752,11 @@
    "viewType" : "DEGRIDVIEW",
    "resource" : "RawMaterial",
    "view" : "GridView"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPPORTALVIEWS/AppPortalView.json",
+    "viewType" : "APPPORTALVIEW",
+    "view" : "AppPortalView"
  }, {
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr2EditView2.json",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSDBSCHEMES/DEFAULT.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSDBSCHEMES/DEFAULT.json
@@ -54,6 +54,27 @@
      "name" : "FIELD10",
      "stdDataType" : 5,
      "nullable" : true
+    }, {
+      "codeName" : "FIELD11",
+      "length" : 100,
+      "logicName" : "属性11",
+      "name" : "FIELD11",
+      "stdDataType" : 25,
+      "nullable" : true
+    }, {
+      "codeName" : "FIELD12",
+      "length" : 100,
+      "logicName" : "属性12",
+      "name" : "FIELD12",
+      "stdDataType" : 25,
+      "nullable" : true
+    }, {
+      "codeName" : "FIELD13",
+      "length" : 100,
+      "logicName" : "属性13",
+      "name" : "FIELD13",
+      "stdDataType" : 25,
+      "nullable" : true
    }, {
      "codeName" : "FIELD2",
      "length" : 100,