lxm1993 发布系统代码 [后台服务，演示应用]

6e0c94b2 · ibizdev · 09c0d462 · 6e0c94b2 · 6e0c94b2 · 6e0c94b2
--- a/app_Web/src/components/app-form-group/app-form-group.scss
+++ b/app_Web/src/components/app-form-group/app-form-group.scss
 .app-form-group {
-    margin: 10px 0;
    .app-form-group-caption {
        padding-left: 20px;
    }
@@ -8,6 +7,8 @@
        margin-right: 20px;
        cursor: pointer;
    }
+    >.ivu-card{
+      margin: 10px 0;
      >.ivu-card-body {
          padding: 20px 5px 10px 5px;
      }
@@ -19,7 +20,9 @@
              margin-left: 4px;
          }
      }
+    }
    &.app-group-collapse-content {
+      >.ivu-card{
        >.ivu-card-head {
            color: var(--app-color-gray-200);
            border-bottom: none;
@@ -28,8 +31,10 @@
            display: none;
        }
      }
+    }
    &.app-group-flex {
+      >.ivu-card{
        height: 100%;
        overflow-y: auto;
        overflow-x: hidden;
@@ -40,4 +45,5 @@
            overflow-x: hidden;
        }
      }
+    }
 }
\ No newline at end of file
--- a/app_Web/src/components/app-form-group/app-form-group.vue
+++ b/app_Web/src/components/app-form-group/app-form-group.vue
@@ -12,7 +12,7 @@
                </app-form-group2>
        </template>
        <template v-else>
-            <card v-if="isShowCaption === true" :dis-hover="true" :class="classes">
+            <card v-if="isShowCaption === true" :dis-hover="true">
                <span class='app-form-group-caption' slot='title'>
                    <icon v-if="titleBarCloseMode !== 0" :type="collapseContent ? 'md-add' : 'md-remove'" class="collapse-icon"
                    @click="clickCollapse"></icon>

--- a/app_Web/src/components/app-form-item/app-form-item.scss
+++ b/app_Web/src/components/app-form-item/app-form-item.scss
 .app-form-item {
    height: 100%;
+    min-height: 45px;
    padding: 0 15px;
    .app-form-item-label {

--- a/app_Web/src/pages/sample/ibizbookusr3-tree-view/ibizbookusr3-tree-view-base.vue
+++ b/app_Web/src/pages/sample/ibizbookusr3-tree-view/ibizbookusr3-tree-view-base.vue
@@ -6,6 +6,9 @@
 </div>
 <div class="content-container">
+  <div class="search-contant">
+      <i-input search @on-change="($event) => { this.srfnodefilter = $event.target.value; }" placeholder="图书名称" @on-search="onSearch" class='pull-left'/>
+  </div>
 <div class="tree-contant">
    <view_tree 
    :viewState="viewState"  
@@ -215,6 +218,7 @@ export default class IBIZBOOKUsr3TreeViewBase extends Vue {
     * @memberof IBIZBOOKUsr3TreeViewBase
     */
    public containerModel: any = {
+        view_searchform: { name: 'searchform', type: 'SEARCHFORM' },
        view_tree: { name: 'tree', type: 'TREEVIEW' },
    };

--- a/app_Web/src/pages/sample/ibizbookusr3-tree-view/ibizbookusr3-tree-view.scss
+++ b/app_Web/src/pages/sample/ibizbookusr3-tree-view/ibizbookusr3-tree-view.scss
@@ -13,7 +13,7 @@
    }
 }
 .tree-contant {
-        height: 100%;
+        height: calc(100% - 40px);
    margin:  0px 0px 16px 0;
    overflow: auto;
 }

--- a/app_Web/src/pages/sample/ibizbookusr3-tree-view/ibizbookusr3-tree-view.vue
+++ b/app_Web/src/pages/sample/ibizbookusr3-tree-view/ibizbookusr3-tree-view.vue
@@ -2,11 +2,13 @@
 import { Component } from 'vue-property-decorator';
 import IBIZBOOKUsr3TreeViewBase from './ibizbookusr3-tree-view-base.vue';
+import view_searchform from '@widgets/ibizbook/default-searchform/default-searchform.vue';
 import view_tree from '@widgets/ibizbook/treebasics-treeview/treebasics-treeview.vue';
 // 基于 @VIEW/实体树视图/VIEW.vue.ftl 生成
 @Component({
    components: {
+        view_searchform, 
        view_tree, 
    },
    beforeRouteEnter: (to: any, from: any, next: any) => {

--- a/app_Web/src/widgets/ibizbook/quicksearchform-searchform/quicksearchform-searchform-base.vue
+++ b/app_Web/src/widgets/ibizbook/quicksearchform-searchform/quicksearchform-searchform-base.vue
@@ -670,7 +670,7 @@ export default class QUICKSEARCHFORMBase extends Vue implements ControlInterface
     */
    public load(opt: any = {}): void {
        if(!this.loadAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKListView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKCalendarView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
            return;
        }
        const arg: any = { ...opt };
@@ -706,7 +706,7 @@ export default class QUICKSEARCHFORMBase extends Vue implements ControlInterface
     */
    public async loadDraft(opt: any = {},mode?:string): Promise<any> {
        if(!this.loaddraftAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKListView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKCalendarView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
            return;
        }
        const arg: any = { ...opt } ;

--- a/demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK/PSGANTTS/Usr.json
+++ b/demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK/PSGANTTS/Usr.json
@@ -12,6 +12,30 @@
    "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK.json"
  },
  "getPSDETreeColumns" : [ {
+    "caption" : "作者",
+    "codeName" : "author",
+    "columnType" : "DEFGRIDCOLUMN",
+    "dataItemName" : "author",
+    "mOSFilePath" : "psdetreecols/author",
+    "name" : "author",
+    "rTMOSFilePath" : "psdetreecols/author",
+    "width" : 200,
+    "widthUnit" : "px",
+    "enableExpand" : false,
+    "enableSort" : false
+  }, {
+    "caption" : "图书名称",
+    "codeName" : "ibizbookname",
+    "columnType" : "DEFGRIDCOLUMN",
+    "dataItemName" : "ibizbookname",
+    "mOSFilePath" : "psdetreecols/ibizbookname",
+    "name" : "ibizbookname",
+    "rTMOSFilePath" : "psdetreecols/ibizbookname",
+    "width" : 200,
+    "widthUnit" : "px",
+    "enableExpand" : false,
+    "enableSort" : false
+  }, {
    "caption" : "归还日期",
    "codeName" : "returntime",
    "columnType" : "DEFGRIDCOLUMN",
@@ -47,30 +71,6 @@
    "widthUnit" : "px",
    "enableExpand" : false,
    "enableSort" : false
-  }, {
-    "caption" : "作者",
-    "codeName" : "author",
-    "columnType" : "DEFGRIDCOLUMN",
-    "dataItemName" : "author",
-    "mOSFilePath" : "psdetreecols/author",
-    "name" : "author",
-    "rTMOSFilePath" : "psdetreecols/author",
-    "width" : 200,
-    "widthUnit" : "px",
-    "enableExpand" : false,
-    "enableSort" : false
-  }, {
-    "caption" : "图书名称",
-    "codeName" : "ibizbookname",
-    "columnType" : "DEFGRIDCOLUMN",
-    "dataItemName" : "ibizbookname",
-    "mOSFilePath" : "psdetreecols/ibizbookname",
-    "name" : "ibizbookname",
-    "rTMOSFilePath" : "psdetreecols/ibizbookname",
-    "width" : 200,
-    "widthUnit" : "px",
-    "enableExpand" : false,
-    "enableSort" : false
  } ],
  "getPSDETreeNodeRSs" : [ {
    "getChildPSDETreeNode" : {

--- a/demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK/PSTREEGRIDICES/TreeTable.json
+++ b/demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK/PSTREEGRIDICES/TreeTable.json
@@ -20,13 +20,13 @@
    }
  } ],
  "getPSDETreeColumns" : [ {
-    "caption" : "作者",
+    "caption" : "图书描述",
-    "codeName" : "author",
+    "codeName" : "subtext",
    "columnType" : "DEFGRIDCOLUMN",
-    "dataItemName" : "author",
+    "dataItemName" : "subtext",
-    "mOSFilePath" : "psdetreecols/author",
+    "mOSFilePath" : "psdetreecols/subtext",
-    "name" : "author",
+    "name" : "subtext",
-    "rTMOSFilePath" : "psdetreecols/author",
+    "rTMOSFilePath" : "psdetreecols/subtext",
    "width" : 50,
    "widthUnit" : "px",
    "enableExpand" : false,
@@ -44,13 +44,13 @@
    "enableExpand" : false,
    "enableSort" : false
  }, {
-    "caption" : "图书描述",
+    "caption" : "作者",
-    "codeName" : "subtext",
+    "codeName" : "author",
    "columnType" : "DEFGRIDCOLUMN",
-    "dataItemName" : "subtext",
+    "dataItemName" : "author",
-    "mOSFilePath" : "psdetreecols/subtext",
+    "mOSFilePath" : "psdetreecols/author",
-    "name" : "subtext",
+    "name" : "author",
-    "rTMOSFilePath" : "psdetreecols/subtext",
+    "rTMOSFilePath" : "psdetreecols/author",
    "width" : 50,
    "widthUnit" : "px",
    "enableExpand" : false,

--- a/demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZBOOKGanttView.json
+++ b/demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZBOOKGanttView.json
@@ -42,6 +42,30 @@
      "id" : "GANTT"
    },
    "getPSDETreeColumns" : [ {
+      "caption" : "作者",
+      "codeName" : "author",
+      "columnType" : "DEFGRIDCOLUMN",
+      "dataItemName" : "author",
+      "mOSFilePath" : "psdetreecols/author",
+      "name" : "author",
+      "rTMOSFilePath" : "psdetreecols/author",
+      "width" : 200,
+      "widthUnit" : "px",
+      "enableExpand" : false,
+      "enableSort" : false
+    }, {
+      "caption" : "图书名称",
+      "codeName" : "ibizbookname",
+      "columnType" : "DEFGRIDCOLUMN",
+      "dataItemName" : "ibizbookname",
+      "mOSFilePath" : "psdetreecols/ibizbookname",
+      "name" : "ibizbookname",
+      "rTMOSFilePath" : "psdetreecols/ibizbookname",
+      "width" : 200,
+      "widthUnit" : "px",
+      "enableExpand" : false,
+      "enableSort" : false
+    }, {
      "caption" : "归还日期",
      "codeName" : "returntime",
      "columnType" : "DEFGRIDCOLUMN",
@@ -77,30 +101,6 @@
      "widthUnit" : "px",
      "enableExpand" : false,
      "enableSort" : false
-    }, {
-      "caption" : "作者",
-      "codeName" : "author",
-      "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "author",
-      "mOSFilePath" : "psdetreecols/author",
-      "name" : "author",
-      "rTMOSFilePath" : "psdetreecols/author",
-      "width" : 200,
-      "widthUnit" : "px",
-      "enableExpand" : false,
-      "enableSort" : false
-    }, {
-      "caption" : "图书名称",
-      "codeName" : "ibizbookname",
-      "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "ibizbookname",
-      "mOSFilePath" : "psdetreecols/ibizbookname",
-      "name" : "ibizbookname",
-      "rTMOSFilePath" : "psdetreecols/ibizbookname",
-      "width" : 200,
-      "widthUnit" : "px",
-      "enableExpand" : false,
-      "enableSort" : false
    } ],
    "getPSDETreeNodeRSs" : [ {
      "getChildPSDETreeNode" : {

--- a/demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZBOOKTreeGridExView.json
+++ b/demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZBOOKTreeGridExView.json
@@ -88,13 +88,13 @@
      "id" : "TREEGRIDEX"
    },
    "getPSDETreeColumns" : [ {
-      "caption" : "作者",
+      "caption" : "图书描述",
-      "codeName" : "author",
+      "codeName" : "subtext",
      "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "author",
+      "dataItemName" : "subtext",
-      "mOSFilePath" : "psdetreecols/author",
+      "mOSFilePath" : "psdetreecols/subtext",
-      "name" : "author",
+      "name" : "subtext",
-      "rTMOSFilePath" : "psdetreecols/author",
+      "rTMOSFilePath" : "psdetreecols/subtext",
      "width" : 50,
      "widthUnit" : "px",
      "enableExpand" : false,
@@ -112,13 +112,13 @@
      "enableExpand" : false,
      "enableSort" : false
    }, {
-      "caption" : "图书描述",
+      "caption" : "作者",
-      "codeName" : "subtext",
+      "codeName" : "author",
      "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "subtext",
+      "dataItemName" : "author",
-      "mOSFilePath" : "psdetreecols/subtext",
+      "mOSFilePath" : "psdetreecols/author",
-      "name" : "subtext",
+      "name" : "author",
-      "rTMOSFilePath" : "psdetreecols/subtext",
+      "rTMOSFilePath" : "psdetreecols/author",
      "width" : 50,
      "widthUnit" : "px",
      "enableExpand" : false,

--- a/demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZBOOKUsr3TreeView.json
+++ b/demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZBOOKUsr3TreeView.json
@@ -31,6 +31,187 @@
    } ]
  } ],
  "getPSControls" : [ {
+    "codeName" : "Default",
+    "controlType" : "SEARCHFORM",
+    "defaultLabelWidth" : 130,
+    "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK/PSSEARCHFORMS/Default.json",
+    "logicName" : "默认搜索表单",
+    "mOSFilePath" : "psmodules/Sample/psdataentities/IBIZBOOK/psdeform_searchforms/Default",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK.json"
+    },
+    "getPSControlHandler" : {
+      "getPSHandlerActions" : [ {
+        "actionType" : "FILTERACTION",
+        "name" : "load",
+        "getPSAppDEMethod" : {
+          "modelref" : true,
+          "id" : "FilterGet"
+        },
+        "getPSAppDataEntity" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK.json"
+        }
+      }, {
+        "actionType" : "FILTERACTION",
+        "name" : "loaddraft",
+        "getPSAppDEMethod" : {
+          "modelref" : true,
+          "id" : "FilterGetDraft"
+        },
+        "getPSAppDataEntity" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK.json"
+        }
+      }, {
+        "actionType" : "FILTERACTION",
+        "name" : "search",
+        "getPSAppDEMethod" : {
+          "modelref" : true,
+          "id" : "FilterSearch"
+        },
+        "getPSAppDataEntity" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK.json"
+        }
+      } ],
+      "enableDEFieldPrivilege" : false,
+      "id" : "搜索表单处理器"
+    },
+    "getPSControlParam" : {
+      "autoLoad" : true,
+      "showBusyIndicator" : true,
+      "id" : "SEARCHFORM"
+    },
+    "getPSDEFormItems" : [ {
+      "id" : "n_ibizbookname_like",
+      "dataType" : 25,
+      "getPSAppDEField" : {
+        "name" : "IBIZBOOKNAME",
+        "codeName" : "IBIZBOOKName"
+      }
+    }, {
+      "id" : "n_price_gtandeq",
+      "dataType" : 7,
+      "getPSAppDEField" : {
+        "name" : "PRICE",
+        "codeName" : "Price"
+      }
+    } ],
+    "getPSDEFormPages" : [ {
+      "getCapPSLanguageRes" : {
+        "lanResTag" : "CONTROL.DEFORM.IBIZBOOK.DEFAULT.FORMPAGE.FORMPAGE1",
+        "mOSFilePath" : "pslanguageres/Auto1835",
+        "rTMOSFilePath" : "pslanguageres/Auto1835"
+      },
+      "caption" : "常规条件",
+      "codeName" : "formpage1",
+      "detailStyle" : "DEFAULT",
+      "detailType" : "FORMPAGE",
+      "mOSFilePath" : "psdeformdetail_formpages/formpage1",
+      "name" : "formpage1",
+      "getPSDEFormDetails" : [ {
+        "getCapPSLanguageRes" : {
+          "lanResTag" : "CONTROL.DEFSFITEM.IBIZBOOK.N_IBIZBOOKNAME_LIKE",
+          "mOSFilePath" : "pslanguageres/Auto486",
+          "rTMOSFilePath" : "pslanguageres/Auto486"
+        },
+        "caption" : "图书名称(%)",
+        "codeName" : "n_ibizbookname_like",
+        "dataType" : 25,
+        "detailStyle" : "DEFAULT",
+        "detailType" : "FORMITEM",
+        "enableCond" : 3,
+        "ignoreInput" : 0,
+        "labelPos" : "LEFT",
+        "labelWidth" : 130,
+        "mOSFilePath" : "psdeformdetail_formitems/n_ibizbookname_like",
+        "name" : "n_ibizbookname_like",
+        "noPrivDisplayMode" : 1,
+        "getPSAppDEField" : {
+          "name" : "IBIZBOOKNAME",
+          "codeName" : "IBIZBOOKName"
+        },
+        "getPSEditor" : {
+          "editorType" : "TEXTBOX",
+          "editorWidth" : 100.0,
+          "name" : "n_ibizbookname_like"
+        },
+        "getPSLayoutPos" : {
+          "colLG" : 12,
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "rTMOSFilePath" : "psdeformdetail_formitems/n_ibizbookname_like",
+        "allowEmpty" : true,
+        "showCaption" : true
+      }, {
+        "getCapPSLanguageRes" : {
+          "lanResTag" : "CONTROL.DEFSFITEM.IBIZBOOK.N_PRICE_GTANDEQ",
+          "mOSFilePath" : "pslanguageres/Auto2082",
+          "rTMOSFilePath" : "pslanguageres/Auto2082"
+        },
+        "caption" : "图书价格(>=)",
+        "codeName" : "n_price_gtandeq",
+        "dataType" : 7,
+        "detailStyle" : "DEFAULT",
+        "detailType" : "FORMITEM",
+        "enableCond" : 3,
+        "ignoreInput" : 0,
+        "labelPos" : "LEFT",
+        "labelWidth" : 130,
+        "mOSFilePath" : "psdeformdetail_formitems/n_price_gtandeq",
+        "name" : "n_price_gtandeq",
+        "noPrivDisplayMode" : 1,
+        "getPSAppDEField" : {
+          "name" : "PRICE",
+          "codeName" : "Price"
+        },
+        "getPSEditor" : {
+          "editorType" : "TEXTBOX",
+          "editorWidth" : 100.0,
+          "name" : "n_price_gtandeq"
+        },
+        "getPSLayoutPos" : {
+          "colLG" : 12,
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "rTMOSFilePath" : "psdeformdetail_formitems/n_price_gtandeq",
+        "allowEmpty" : true,
+        "showCaption" : true
+      } ],
+      "getPSLayout" : {
+        "childColLG" : -1,
+        "childColMD" : 24,
+        "childColSM" : -1,
+        "childColXS" : -1,
+        "columnCount" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "rTMOSFilePath" : "psdeformdetail_formpages/formpage1",
+      "infoGroupMode" : false
+    } ],
+    "getPSLayout" : {
+      "childColLG" : -1,
+      "childColMD" : 24,
+      "childColSM" : -1,
+      "childColXS" : -1,
+      "columnCount" : 24,
+      "layout" : "TABLE_24COL"
+    },
+    "rTMOSFilePath" : "pssysapps/Web/psappdeviews/IBIZBOOKUsr3TreeView/psappviewctrls/searchform",
+    "searchButtonStyle" : "DEFAULT",
+    "tabHeaderPos" : "TOP",
+    "enableAdvanceSearch" : false,
+    "enableAutoSearch" : false,
+    "enableFilterSave" : false,
+    "noTabHeader" : true,
+    "name" : "searchform",
+    "modelid" : "643b7d93870f8f5842b663af83ba85ae",
+    "modeltype" : "PSDEFORM_SEARCHFORM"
+  }, {
    "codeName" : "Treebasics",
    "controlType" : "TREEVIEW",
    "getCreatePSControlAction" : {
@@ -441,13 +622,21 @@
    "layoutPanel" : true,
    "useDefaultLayout" : true
  },
+  "getQuickGroupPSCodeList" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/BookSailState.json"
+  },
  "rTMOSFilePath" : "pssysapps/Web/psappdeviews/IBIZBOOKUsr3TreeView",
  "title" : "图书树视图",
  "viewStyle" : "DEFAULT",
  "viewType" : "DETREEVIEW",
  "xDataControlName" : "tree",
  "enableDP" : true,
-  "enableFilter" : false,
+  "enableFilter" : true,
+  "enableQuickGroup" : true,
+  "enableQuickSearch" : true,
+  "enableSearch" : true,
+  "expandSearchForm" : true,
  "modelid" : "406f27bfbbbe3bb0f15d8d77ca63e24c",
  "modeltype" : "PSAPPDEVIEW"
 }
\ No newline at end of file
--- a/demo-core/src/main/resources/liquibase/h2_table.xml
+++ b/demo-core/src/main/resources/liquibase/h2_table.xml
@@ -172,7 +172,7 @@
    <!--输出实体[IBIZBOOK]数据结构 -->
-    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizbook-1336-7">
+    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizbook-1338-7">
        <createTable tableName="T_IBIZBOOK">
                <column name="CREATEMAN" remarks="" type="VARCHAR(60)">
                </column>