tony001 发布系统代码 [ibz-lite，应用]

app_web/src/locale/lanres/entities/dst-api/dst-api_BO_CN_base.ts

@@ -56,6 +56,18 @@ function getLocaleResourceBase(){
 			uiactions: {
 			},
 		},
+		default_searchform: {
+			details: {
+				formpage1: commonLogic.appcommonhandle("常规条件",null), 
+				n_apiname_like: commonLogic.appcommonhandle("名称(文本包含(%))",null), 
+				n_msname_like: commonLogic.appcommonhandle("微服务标识(文本包含(%))",null), 
+				n_servicename_like: commonLogic.appcommonhandle("微服务标识(文本包含(%))",null), 
+				n_apipath_like: commonLogic.appcommonhandle("路径(文本包含(%))",null), 
+				n_systemid_eq: commonLogic.appcommonhandle("系统标识(等于(=))",null), 
+			},
+			uiactions: {
+			},
+		},
 		gridviewtoolbar_toolbar: {
 			tbitem3: {
 				caption: commonLogic.appcommonhandle("新建",null),
@@ -105,6 +117,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
+			tbitem19: {
+				caption: commonLogic.appcommonhandle("过滤",null),
+				tip: commonLogic.appcommonhandle("过滤",null),
+			},
 			tbitem18: {
 				caption: commonLogic.appcommonhandle("帮助",null),
 				tip: commonLogic.appcommonhandle("帮助",null),

app_web/src/locale/lanres/entities/dst-api/dst-api_en_US_base.ts

@@ -56,6 +56,18 @@ function getLocaleResourceBase(){
 			uiactions: {
 			},
 		},
+		default_searchform: {
+			details: {
+				formpage1: commonLogic.appcommonhandle("常规条件",null), 
+				n_apiname_like: commonLogic.appcommonhandle("名称(文本包含(%))",null), 
+				n_msname_like: commonLogic.appcommonhandle("微服务标识(文本包含(%))",null), 
+				n_servicename_like: commonLogic.appcommonhandle("微服务标识(文本包含(%))",null), 
+				n_apipath_like: commonLogic.appcommonhandle("路径(文本包含(%))",null), 
+				n_systemid_eq: commonLogic.appcommonhandle("系统标识(等于(=))",null), 
+			},
+			uiactions: {
+			},
+		},
 		gridviewtoolbar_toolbar: {
 			tbitem3: {
 				caption: commonLogic.appcommonhandle("New",null),
@@ -105,6 +117,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
+			tbitem19: {
+				caption: commonLogic.appcommonhandle("Filter",null),
+				tip: commonLogic.appcommonhandle("Filter",null),
+			},
 			tbitem18: {
 				caption: commonLogic.appcommonhandle("Help",null),
 				tip: commonLogic.appcommonhandle("Help",null),

app_web/src/locale/lanres/entities/dst-api/dst-api_zh_CN_base.ts

@@ -56,6 +56,18 @@ function getLocaleResourceBase(){
 			uiactions: {
 			},
 		},
+		default_searchform: {
+			details: {
+				formpage1: commonLogic.appcommonhandle("常规条件",null), 
+				n_apiname_like: commonLogic.appcommonhandle("名称(文本包含(%))",null), 
+				n_msname_like: commonLogic.appcommonhandle("微服务标识(文本包含(%))",null), 
+				n_servicename_like: commonLogic.appcommonhandle("微服务标识(文本包含(%))",null), 
+				n_apipath_like: commonLogic.appcommonhandle("路径(文本包含(%))",null), 
+				n_systemid_eq: commonLogic.appcommonhandle("系统标识(等于(=))",null), 
+			},
+			uiactions: {
+			},
+		},
 		gridviewtoolbar_toolbar: {
 			tbitem3: {
 				caption: commonLogic.appcommonhandle("新建",null),
@@ -105,6 +117,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
+			tbitem19: {
+				caption: commonLogic.appcommonhandle("过滤",null),
+				tip: commonLogic.appcommonhandle("过滤",null),
+			},
 			tbitem18: {
 				caption: commonLogic.appcommonhandle("帮助",null),
 				tip: commonLogic.appcommonhandle("帮助",null),

app_web/src/pages/lite/dst-apigrid-view/dst-apigrid-view-base.vue

@@ -9,7 +9,7 @@
             </div>
         <div class='content-container'>
             <div style='margin-bottom: 6px;'>
-                <i-input v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;padding-left: 24px' placeholder="名称" />
+                <i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;padding-left: 24px' placeholder="名称" />
                 <div class='pull-right'>
                     <div class='toolbar-container'>
                         <tooltip :transfer="true" :max-width="600">
@@ -82,6 +82,13 @@
                             </dropdown-menu>
                         </dropdown>
                         <span class='seperator'>|</span>
+                        <tooltip :transfer="true" :max-width="600">
+                                <i-button v-show="toolBarModels.tbitem19.visabled" :disabled="toolBarModels.tbitem19.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem19' }, $event)">
+                                    <i class='fa fa-filter'></i>
+                                    <span class='caption'>{{$t('entities.dstapi.gridviewtoolbar_toolbar.tbitem19.caption')}}</span>
+                                </i-button>
+                            <div slot='content'>{{$t('entities.dstapi.gridviewtoolbar_toolbar.tbitem19.tip')}}</div>
+                        </tooltip>
                         <tooltip :transfer="true" :max-width="600">
                                 <i-button v-show="toolBarModels.tbitem18.visabled" :disabled="toolBarModels.tbitem18.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem18' }, $event)">
                                     <i class='fa fa-question'></i>
@@ -92,6 +99,22 @@
                     </div>
                 </div>
             </div>
+            <view_searchform 
+                :viewState="viewState"  
+                :viewparams="viewparams" 
+                :context="context" 
+                :showBusyIndicator="true"
+                v-show="isExpandSearchForm"
+                loaddraftAction="FilterGetDraft"
+                loadAction="FilterGet"
+            
+                name="searchform"  
+                ref='searchform' 
+                @save="searchform_save($event)"  
+                @search="searchform_search($event)"  
+                @load="searchform_load($event)"  
+                @closeview="closeView($event)">
+            </view_searchform>
                     <div class='view-body-messages'>
                     </div>
             <view_grid 
@@ -298,6 +321,7 @@ export default class DstAPIGridViewBase extends Vue {
      * @memberof DstAPIGridViewBase
      */
     public containerModel: any = {
+        view_searchform: { name: 'searchform', type: 'SEARCHFORM' },
         view_toolbar: { name: 'toolbar', type: 'TOOLBAR' },
         view_grid: { name: 'grid', type: 'GRID' },
     };
@@ -365,6 +389,8 @@ export default class DstAPIGridViewBase extends Vue {
 
 
         tbitem17: {  name: 'tbitem17', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
+        tbitem19: { name: 'tbitem19', actiontarget: 'NONE', caption: '过滤', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'ToggleFilter', target: '' } },
+
         tbitem18: { name: 'tbitem18', actiontarget: 'NONE', caption: '帮助', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Help', target: '' } },
 
     };
@@ -398,6 +424,7 @@ export default class DstAPIGridViewBase extends Vue {
                 this.newdata(args,fullargs, params, $event, xData);
             },
             grid: this.$refs.grid,
+            searchform: this.$refs.searchform,
             keyPSDEField: 'dstapi',
             majorPSDEField: 'name',
             isLoadDefault: true,
@@ -709,6 +736,42 @@ export default class DstAPIGridViewBase extends Vue {
     }
 
 
+    /**
+     * searchform 部件 save 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof DstAPIGridViewBase
+     */
+    public searchform_save($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('searchform', 'save', $event);
+    }
+
+
+    /**
+     * searchform 部件 search 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof DstAPIGridViewBase
+     */
+    public searchform_search($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('searchform', 'search', $event);
+    }
+
+
+    /**
+     * searchform 部件 load 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof DstAPIGridViewBase
+     */
+    public searchform_load($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('searchform', 'load', $event);
+    }
+
+
     /**
      * toolbar 部件 click 事件
      *

app_web/src/pages/lite/dst-apigrid-view/dst-apigrid-view.vue

@@ -2,9 +2,11 @@
 import { Component } from 'vue-property-decorator';
 import DstAPIGridViewBase from './dst-apigrid-view-base.vue';
 
+import view_searchform from '@widgets/dst-api/default-searchform/default-searchform.vue';
 import view_grid from '@widgets/dst-api/main-grid/main-grid.vue';
 @Component({
     components: {
+        view_searchform, 
         view_grid, 
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {

app_web/src/widgets/dst-api/default-searchform/default-searchform-base.vue

@@ -34,14 +34,15 @@
           </i-col>
           <i-col v-show="detailsModel.n_servicename_like.visible" :style="{}"  :sm="{ span: 12, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 8, offset: 0 }">
               <app-form-item name='n_servicename_like' :itemRules="this.rules.n_servicename_like" class='' :caption="$t('entities.dstapi.default_searchform.details.n_servicename_like')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_servicename_like.error" :isEmptyCaption="false" labelPos="LEFT"> 
-              !!!!模版产生代码错误:----
-          Tip: If the failing expression is known to be legally refer to something that's sometimes null or missing, either specify a default value like myOptionalVar!myDefault, or use <#if myOptionalVar??>when-present<#else>when-missing</#if>. (These only cover the last step of the expression; to cover the whole expression, use parenthesis: (myOptionalVar.foo)!myDefault, (myOptionalVar.foo)??
-          ----
+              <input-box 
+              v-model="data.n_servicename_like"  
+              @enter="onEnter($event)"  
+                
+              :disabled="detailsModel.n_servicename_like.disabled" 
+              type='text' 
+              style="">
+          </input-box>
           
-          ----
-          FTL stack trace ("~" means nesting-related):
-          	- Failed at: #if item.getUnitName() != ""  [in template "TEMPLCODE_zh_CN" at line 165, column 5]
-          ----
           </app-form-item>
           
           </i-col>

app_web/src/widgets/dst-api/main-grid/main-grid-model.ts

@@ -81,6 +81,32 @@ export default class MainModel {
           name: 'dstapi',
           prop: 'id',
         },
+      {
+        name: 'n_apiname_like',
+        prop: 'n_apiname_like',
+        dataType: 'QUERYPARAM'
+      },
+      {
+        name: 'n_msname_like',
+        prop: 'n_msname_like',
+        dataType: 'QUERYPARAM'
+      },
+      {
+        name: 'n_servicename_like',
+        prop: 'n_servicename_like',
+        dataType: 'QUERYPARAM'
+      },
+      {
+        name: 'n_apipath_like',
+        prop: 'n_apipath_like',
+        dataType: 'QUERYPARAM'
+      },
+      {
+        name: 'n_systemid_eq',
+        prop: 'n_systemid_eq',
+        dataType: 'QUERYPARAM'
+      },
+
         {
           name:'size',
           prop:'size',