Merge branch 'dev'

src/app-register.ts

@@ -98,6 +98,7 @@ import AppAlert from './components/app-alert/app-alert.vue'
 import AppAlertGroup from './components/app-alert-group/app-alert-group.vue'
 import AppRawItem from './components/app-rawitem/app-rawitem.vue'
 import AppImageRomate from './components/app-image-romate/app-image-romate.vue'
+import { MenuIcon } from './components/menu-icon/menu-icon'
 
 // 全局挂载UI实体服务注册中心
 window['uiServiceRegister'] = uiServiceRegister;
@@ -210,6 +211,7 @@ export const AppComponents = {
         v.component('app-alert', AppAlert);
         v.component('app-alert-group', AppAlertGroup);
         v.component('app-rawitem',AppRawItem);
-        v.component('app-image-romate', AppImageRomate)
+        v.component('app-image-romate', AppImageRomate);
+        v.component('menu-icon', MenuIcon);
     },
 };
\ No newline at end of file

src/components/app-picker/app-picker.vue

@@ -341,6 +341,7 @@ export default class AppPicker extends Vue {
     public onSelectOpen(flag: boolean): void {
         this.open = flag;
         if (this.open) {
+            this.items = [];
             //设置下拉列表的最大宽度
             this.setDropdownWidth();
             this.onSearch(this.curvalue, null, true);

src/components/menu-icon/menu-icon.tsx

+import { Vue, Component, Prop } from 'vue-property-decorator';
+import './menu-icon.less';
+
+/**
+ * 平台菜单按钮适配
+ *
+ * @export
+ * @class MenuIcon
+ * @extends {Vue}
+ */
+@Component({})
+export class MenuIcon extends Vue {
+
+    /**
+     * 项数据
+     *
+     * @type {*}
+     * @memberof MenuIcon
+     */
+    @Prop()
+    public item: any;
+
+    /**
+     * 绘制图标
+     *
+     * @returns {*}
+     * @memberof MenuIcon
+     */
+    public render(): any {
+        if (this.item) {
+            if (this.item.iconcls) {
+                return <i class={this.item.iconcls} />
+            }
+            if (this.item.icon) {
+                return <img src={this.item.icon} />
+            }
+        }
+        return <span />
+    }
+
+}
\ No newline at end of file

src/engine/view/search-view-engine.ts

@@ -97,6 +97,15 @@ export class SearchViewEngine extends ViewEngine {
         if (this.view && !this.view.isExpandSearchForm) {
             Object.assign(arg, { query: this.view.query });
         }
+        // 快速分组和快速搜索栏
+        let otherQueryParam:any = {};
+        if(this.view && this.view.quickGroupData){
+            Object.assign(otherQueryParam,this.view.quickGroupData);
+        }
+        if(this.view && this.view.quickFormData){
+            Object.assign(otherQueryParam,this.view.quickFormData);
+        }
+        Object.assign(arg,{viewparams:otherQueryParam});
     }
 
 

src/styles/default.less

@@ -246,7 +246,7 @@
     }
 }
 
-.view-container.degridview, .view-container.degridview9, .view-container.dewfgridview, .view-container.delistview, .view-container.delistview9, .view-container.dedataview, .view-container.dedataview9{
+.view-container.degridview, .view-container.degridview9, .view-container.dewfgridview, .view-container.delistview, .view-container.delistview9, .view-container.dedataview, .view-container.dedataview9,.view-container.dechartview,.view-container.dechartview9{
   >.view-card.view-no-caption{
     >.ivu-card-body{
       height: 100%;

src/utils/interceptor/interceptor.ts

@@ -109,7 +109,13 @@ export class Interceptors {
             error = error ? error : { response: {} };
             let { response: res } = error;
             let { data: _data } = res;
-
+            // 处理异常
+            if(res.headers && res.headers['x-ibz-error']){
+                res.data.errorKey = res.headers['x-ibz-error'];
+            }
+            if(res.headers && res.headers['x-ibz-params']){
+                res.data.entityName = res.headers['x-ibz-params'];
+            }
             if (res.status === 401) {
                 this.doNoLogin(_data.data);
             }

src/widgets/control-service.ts

@@ -310,4 +310,23 @@ export default class ControlService {
             }
         })
     }
+
+    /**
+     * 根据后台标识获取数据标识名称
+     * 
+     * @param prop 后台标识
+     * @memberof ControlService
+     */
+    public getNameByProp(prop: any) {
+        let model: any = this.getMode();
+        if(!model || !prop) {
+            return false;
+        }
+        let dataItems: any[] = model.getDataItems();
+        prop = prop.replace(/([A-Z])/g,"_$1").toLowerCase();
+        let data: any = dataItems.find((item:any) => {
+            return Object.is(prop, item.prop);
+        });
+        return data.name;
+    }
 }
\ No newline at end of file