2020.2.14 更新

src/app-register.ts

@@ -69,6 +69,8 @@ import AppImagePreview from './components/app-image-preview/app-image-preview.vu
 import AppFormatData from './components/app-format-data/app-format-data.vue'
 import AppUploadFileInfo from './components/app-upload-file-info/app-upload-file-info.vue'
 import ContextMenu from './components/context-menu/context-menu'
+import AppColumnFormat from './components/app-column-format/app-column-format.vue'
+import AppQuickGroup from './components/app-quick-group/app-quick-group.vue'
 
 // 全局挂载UI实体服务注册中心
 window['uiServiceRegister'] = uiServiceRegister;
@@ -147,5 +149,7 @@ export const AppComponents = {
         v.component('app-format-data', AppFormatData);
         v.component('app-upload-file-info', AppUploadFileInfo);
         v.component('context-menu',ContextMenu);
+        v.component('app-column-format',AppColumnFormat);
+        v.component('app-quick-group',AppQuickGroup);
     },
 };
\ No newline at end of file

src/components/app-checkbox-list/app-checkbox-list.vue

@@ -43,7 +43,7 @@ export default class AppCheckBox extends Vue {
      * @type {string}
      * @memberof AppCheckBox
      */
-    @Prop({default:';'}) public valueSeparator?: string;
+    @Prop({default:','}) public valueSeparator?: string;
 
     /**
      * 是否禁用
@@ -97,28 +97,6 @@ export default class AppCheckBox extends Vue {
         }
     }
 
-    /**
-     * 分隔符
-     *
-     * @type {*}
-     * @memberof AppCheckBox
-     */
-    @Prop() separator: any;
-
-    /**
-     * 获取分隔符
-     *
-     * @readonly
-     * @memberof AppCheckBox
-     */
-    get currentseparator() {
-        if (this.separator) {
-            return this.separator;
-        } else {
-            return ';';
-        }
-    }
-
     /** 
      * 选中值
      *

src/components/app-column-format/app-column-format.less

+.app-column-format{
+    display: inline-block;
+}
\ No newline at end of file

src/components/app-column-format/app-column-format.vue

+<template>
+  <div class="app-column-format">
+      {{text}}
+  </div>
+</template>
+
+<script lang="ts">
+import { Vue, Component, Prop, Model, Emit, Watch } from "vue-property-decorator";
+
+/**
+ * 表格列格式化json数组，数据格式为"[{"srfkey":"001","srfmajortext":"TEST1"},{"srfkey":"002","srfmajortext":"TEST2"}......]"
+ */
+@Component({
+})
+export default class AppColumnFormat extends Vue {
+    
+    /**
+     * 值
+     * @type {any}
+     * @memberof AppColumnFormat
+     */
+    @Prop() public value?: any;
+
+    /**
+     * 显示文本
+     * @type {any}
+     * @memberof AppColumnFormat
+     */
+    get text(){
+      if(this.value){
+        let returnStr:string = "";
+        let tempData:Array<any> =[];
+        if(typeof(this.value) === 'string'){
+          tempData= JSON.parse(this.value);
+        }else{
+          tempData = JSON.parse(JSON.stringify(this.value));
+        }
+        tempData.forEach((item:any,index:number) =>{
+          if(index >0){
+            returnStr +="、";
+          }
+          returnStr +=item.srfmajortext;
+        })
+        return returnStr;
+      }else{
+        return "";
+      }
+    }
+
+
+
+
+}
+</script>
+
+<style lang='less'>
+@import "./app-column-format.less";
+</style>
\ No newline at end of file

src/components/app-form-druipart/app-form-druipart.vue

@@ -47,6 +47,14 @@ export default class AppFormDRUIPart extends Vue {
      */
     @Prop({ default: '' }) public refreshitems!: string;
 
+    /**
+     * 禁止加载
+     *
+     * @type {string}
+     * @memberof AppFormDRUIPart
+     */
+    @Prop({ default: false }) public isForbidLoad!: boolean;
+
     /**
      * 关系视图类型
      *
@@ -254,7 +262,9 @@ export default class AppFormDRUIPart extends Vue {
                 this.blockUIStop();
             }
         }
-        this.formDruipart.next({action:'load',data:{srfparentdename:this.parentName,srfparentkey:_paramitem}});
+        if(!this.isForbidLoad){
+            this.formDruipart.next({action:'load',data:{srfparentdename:this.parentName,srfparentkey:_paramitem}});
+        }
     }
 
     /**

src/components/app-quick-group/app-quick-group.less

+.app-quick-group{
+    padding: 4px;
+    background-color: #F1F1F1;
+    .app-quick-item{
+        margin-right: 8px;
+        padding: 8px;
+        cursor: pointer;
+        .app-quick-item-label{
+            margin-left:4px;
+        }
+        .app-seleted-item{
+            display: inline-block;
+            font-weight: 700;
+            color: #0c64eb !important;
+            padding: 4px;
+            border-bottom: 2px solid;
+        }
+        .app-seleted-item:focus {
+            outline: none;
+        }
+        .app-quick-item-counter{
+            border-radius: 12px;
+            padding-left: 4px;
+            font-size: 12px;
+            font-weight: 400;
+            vertical-align: middle;
+            display: inline-block;
+            width: 18px;
+            height: 18px;
+            margin-left: 4px;
+            background-color: #ddd;
+        }
+    }
+    .app-quick-item :hover{
+        color: #0c64eb !important;
+    }
+}
\ No newline at end of file

src/components/app-quick-group/app-quick-group.vue

+<template>
+  <div class="app-quick-group">
+    <span class="app-quick-item" v-for="item in renderArray" :key="item.id" @click="handleClick(item)">
+      <span v-if="!item.children" :style="{color:item.color}" :class="{'app-seleted-item':isSelectedItem(item)}">
+        <i v-if=" item.iconcls && !Object.is(item.iconcls, '')" :class="item.iconcls"></i>
+        <img v-else-if="item.icon && !Object.is(item.icon, '')" :src="item.icon" />
+        <span class="app-quick-item-label">{{item.label}}</span>
+        <span v-show="isSelectedItem(item) && counterService && counterService.counterData && counterService.counterData[item.codename]" class="app-quick-item-counter">{{itemTag(item)}}</span>
+      </span>
+      <el-dropdown v-if="item.children" style="outline: none !important;" trigger="click" @command="handleCommand($event,item)">
+        <span :style="{color:item.color}" :class="{'app-seleted-item':isSelectedItem(item)}">
+          <i v-if=" item.iconcls && !Object.is(item.iconcls, '')" :class="item.iconcls"></i>
+          <img v-else-if="item.icon && !Object.is(item.icon, '')" :src="item.icon" />
+          <span class="app-quick-item-label">{{item.label}}</span>
+          <span v-show="isSelectedItem(item) && counterService && counterService.counterData && counterService.counterData[item.codename]" class="app-quick-item-counter">{{itemTag(item)}}</span>
+        </span>
+        <el-dropdown-menu slot="dropdown">
+          <el-dropdown-item v-for="childitem in item.children" :command="childitem" :key="childitem.id">
+            <span :style="{color:childitem.color}">
+              <i v-if=" childitem.iconcls && !Object.is(childitem.iconcls, '')" :class="childitem.iconcls"></i>
+              <img v-else-if="childitem.icon && !Object.is(childitem.icon, '')" :src="childitem.icon" />
+              <span :style="{color:(childitem.label == item.label)?'#0c64eb':''}">{{childitem.label}}</span>
+            </span>
+          </el-dropdown-item>
+        </el-dropdown-menu>
+    </el-dropdown>
+    </span>
+  </div>
+</template>
+
+<script lang="ts">
+import { Vue, Component, Prop, Model, Emit } from "vue-property-decorator";
+@Component({})
+export default class AppQuickGroup extends Vue {
+
+    /**
+     * 传入渲染项
+     *
+     * @type {Array<any>}
+     * @memberof AppQuickGroup
+     */
+    @Prop() public items!:Array<any>;
+
+    /**
+     * 计数器服务名
+     *
+     * @type {string}
+     * @memberof AppQuickGroup
+     */
+    @Prop() public counterService?:any;
+
+    /**
+     * UI选中项
+     *
+     * @type {*}
+     * @memberof AppQuickGroup
+     */
+    public selectedUiItem:any;
+
+    /**
+     * 传入渲染项
+     *
+     * @type {Array<any>}
+     * @memberof AppQuickGroup
+     */
+    get renderArray(){
+      if(this.items && this.items.length >0){
+        this.selectedUiItem = this.items[0];
+        this.handleClick(this.items[0]);
+        return this.handleDataSet(this.items)
+      }else{
+        return [];
+      }
+    }
+
+    public itemTag(item:any){
+      if(this.counterService && this.counterService.counterData && item.codename){
+        return this.counterService.counterData[item.codename];
+      }else{
+        return "";
+      }
+    }
+
+    /**
+     * 是否选中当前项
+     * 
+     * @param item 传入当前项
+     * @memberof AppQuickGroup
+     */
+    public isSelectedItem(item:any){
+      if(this.selectedUiItem && (this.selectedUiItem.id === item.id)){
+        return true;
+      }else{
+        return false;
+      }
+    }
+ 
+    /**
+     * 处理代码表返回数据(树状结构)
+     * 
+     * @param result 返回数组
+     * @memberof AppQuickGroup
+     */
+    public handleDataSet(result:Array<any>){
+        let list:Array<any> = [];
+        if(result.length === 0){
+            return list;
+        }
+        result.forEach((codeItem:any) =>{
+            if(!codeItem.pvalue){
+                let valueField:string = codeItem.value;
+                this.setChildCodeItems(valueField,result,codeItem);
+                list.push(codeItem);
+            }
+        })
+        return list;
+    }
+
+    /**
+     * 处理非根节点数据
+     * 
+     * @param pValue 父值
+     * @param result 返回数组
+     * @param codeItem 代码项
+     * @memberof AppQuickGroup
+     */
+    public setChildCodeItems(pValue:string,result:Array<any>,codeItem:any){
+        result.forEach((item:any) =>{
+            if(item.pvalue == pValue){
+                let valueField:string = item.value;
+                this.setChildCodeItems(valueField,result,item);
+                if(!codeItem.children){
+                    codeItem.children = [];
+                }
+                codeItem.children.push(item);
+            }
+        })
+    }
+
+    /**
+     * 处理点击事件
+     * 
+     * @param $event 值
+     * @param isswitch 是否切换UI选中项
+     * @memberof AppQuickGroup
+     */
+    public handleClick($event:any,isswitch:boolean = true){
+      this.$emit('valuechange',$event);
+      if(isswitch){
+        this.selectedUiItem = $event;
+      }
+      this.$forceUpdate();
+    }
+
+    /**
+     * 处理子项点击事件
+     * 
+     * @param $event 值
+     * @param item 父值
+     * @memberof AppQuickGroup
+     */
+    public handleCommand($event:any,item:any){
+      item.label = $event.label;
+      item.codename = $event.codename;
+      this.handleClick($event,false);
+    }
+
+    
+
+}
+</script>
+
+<style lang='less'>
+@import "./app-quick-group.less";
+</style>
\ No newline at end of file

src/components/app-span/app-span.vue

@@ -55,14 +55,14 @@ export default class AppSpan extends Vue {
      * @type {boolean}
      * @memberof AppSpan
      */
-    @Prop({default:"、"}) public textSeparator?: string;
+    @Prop({default:'、'}) public textSeparator?: string;
 
     /**
      * 值分隔符
      * @type {boolean}
      * @memberof AppSpan
      */
-    @Prop({default:";"}) public valueSeparator?: string;
+    @Prop({default:','}) public valueSeparator?: string;
 
     /**
      * 监控表单属性 data 值

src/components/app-user/app-user.vue

@@ -64,6 +64,12 @@ export default class AppUser extends Vue {
                 _user.avatar = this.$store.getters.getAppData().context.srfusericonpath;
             }
         }
+        if(localStorage.getItem("user")){
+            let user:any = JSON.parse(localStorage.getItem("user") as string);
+            if(user && user.personname){
+                _user.name = user.personname;
+            }
+        }
         Object.assign(this.user,_user,{
             time: +new Date
         });

src/components/codelist/codelist.vue

@@ -61,14 +61,14 @@ export default class CodeList extends Vue {
      * @type {boolean}
      * @memberof SelectPicker
      */
-    @Prop({default:"、"}) public textSeparator?: string;
+    @Prop({default:'、'}) public textSeparator?: string;
 
     /**
      * 值分隔符
      * @type {boolean}
      * @memberof SelectPicker
      */
-    @Prop({default:";"}) public valueSeparator?: string;
+    @Prop({default:','}) public valueSeparator?: string;
 
     /**
      * 是否为空

src/components/dropdown-list-mpicker/dropdown-list-mpicker.vue

@@ -60,7 +60,7 @@ export default class DropDownListMpicker extends Vue {
      * @type {string}
      * @memberof DropDownListMpicker
      */
-    @Prop({default:';'}) public valueSeparator?: string;
+    @Prop({default:','}) public valueSeparator?: string;
 
     /**
      * 是否禁用

src/components/login/login.vue

@@ -133,8 +133,12 @@ export default class Login extends Vue {
         post.then((response: any) => {
             if (response && response.status === 200) {
                 const data = response.data;
-                localStorage.setItem('token', data.token);
-                localStorage.setItem('user', JSON.stringify(data.user));
+                if(data && data.token){
+                    localStorage.setItem('token', data.token);
+                }
+                if(data && data.user){
+                    localStorage.setItem('user', JSON.stringify(data.user));
+                }
                 const url: any = this.$route.query.redirect ? this.$route.query.redirect : '*';
                 this.$router.push({ path: url });
             }

src/engine/view/md-view-engine.ts

@@ -117,6 +117,9 @@ export default class MDViewEngine extends ViewEngine {
         if (Object.is(eventName, 'load')) {
             this.onSearchFormLoad(args);
         }
+        if (Object.is(eventName, 'search')) {
+            this.onSearchFormLoad(args);
+        }
     }
 
     /**
@@ -157,6 +160,20 @@ export default class MDViewEngine extends ViewEngine {
         this.isLoadDefault = true;
     }
 
+    /**
+     * 搜索表单搜索
+     *
+     * @param {*} [args={}]
+     * @memberof MDViewEngine
+     */
+    public onSearchFormSearch(args: any = {}): void {
+        if (this.getMDCtrl() && this.isLoadDefault) {
+            const tag = this.getMDCtrl().name;
+            this.setViewState2({ tag: tag, action: 'load', viewdata: this.view.viewparams });
+        }
+        this.isLoadDefault = true;
+    }
+
     /**
      * 处理实体界面行为
      *
@@ -372,6 +389,15 @@ export default class MDViewEngine extends ViewEngine {
         if (this.view && !this.view.isExpandSearchForm) {
             Object.assign(arg, { query: this.view.query });
         }
+        // 快速分组和快速搜索栏
+        let otherQueryParam:any = {};
+        if(this.view && this.view.qucikGroupData){
+            Object.assign(otherQueryParam,this.view.qucikGroupData);
+        }
+        if(this.view && this.view.qucikFormData){
+            Object.assign(otherQueryParam,this.view.qucikFormData);
+        }
+        Object.assign(arg,{viewparams:otherQueryParam});
     }
 
     /**

src/store/index.ts

@@ -7,6 +7,7 @@ import * as mutations from './mutations';
 import * as getters from './getters';
 
 import viewaction from './modules/view-action'
+import unifiedresource from './modules/unified-resource'
 
 const state = {
     ...rootstate
@@ -20,7 +21,8 @@ const store = new Vuex.Store({
     mutations,
     getters,
     modules: {
-        viewaction
+        viewaction,
+        unifiedresource
     },
 });
 

src/store/modules/unified-resource/actions.ts

+/**
+ * 提交统一资源数据
+ * 
+ * @param param0 
+ * @param data 
+ */
+export const commitResourceData = ({ commit, state }: { commit: any, state: any }, { unires, enablepermissionvalid }: { unires: Array<any>, enablepermissionvalid: boolean }) => {
+    if(unires && unires.length > 0){
+        commit('setResourceData', unires);
+    }
+    if(enablepermissionvalid){
+        commit('setEnablePermissionValid', enablepermissionvalid);
+    }
+}
\ No newline at end of file

src/store/modules/unified-resource/getters.ts

+/**
+ * 判断指定统一资源是否存在
+ * 
+ * @param state 
+ */
+export const getResourceData = (state: any) => (resourcetag: string) => {
+    let itemIndex: any = state.resourceData.findIndex((obj: any, objIndex: any, objs: any) => {
+        return Object.is(obj.unirescode, resourcetag);
+    })
+    return itemIndex === -1 ? false : true;
+}
+
+/**
+ * 获取是否开启权限认证
+ * 
+ * @param state 
+ */
+export const getEnablePermissionValid = (state: any) => {
+    return state.enablePermissionValid;
+}
\ No newline at end of file

src/store/modules/unified-resource/index.ts

+import { resourcestate } from './state';
+import * as actions from './actions';
+import * as mutations from './mutations';
+import * as getters from './getters';
+
+const state = {
+    ...resourcestate
+}
+
+export default {
+    namespaced: true,
+    state,
+    getters,
+    actions,
+    mutations
+}
\ No newline at end of file

src/store/modules/unified-resource/mutations.ts

+/**
+ * 设置统一资源数据
+ * 
+ * @param state 
+ * @param resourceArray
+ */
+export const setResourceData = (state: any, resourceArray:Array<any>) => {
+    if(resourceArray && resourceArray.length === 0){
+        return;
+    }
+    state.resourceData = resourceArray;
+}
+
+/**
+ * 设置是否开启权限认证
+ * 
+ * @param state 
+ * @param resourceArray
+ */
+export const setEnablePermissionValid = (state: any, enablepermissionvalid:boolean) => {
+    state.enablePermissionValid = enablepermissionvalid;
+}

src/store/modules/unified-resource/state.ts

+/**
+ * 所有资源状态
+ */
+export const resourcestate: any = {
+    // 统一资源数据
+    resourceData: [],
+    // 是否开启权限认证
+    enablePermissionValid: false
+}
\ No newline at end of file

src/styles/default.less

@@ -206,6 +206,31 @@
         padding-bottom: 16px;
     }
 }
+
+.view-container.degridview, .view-container.degridview9, .view-container.dewfgridview{
+  >.view-card.view-no-caption{
+    >.ivu-card-body{
+      height: 100%;
+    }
+  }
+  >.view-card{
+    >.ivu-card-body{
+        >.content-container{
+            .quick-group-container,.quick-search-input{
+                float: left;
+                margin-top: 6px;
+                margin-bottom: 6px;
+            }
+            .quick-search-container{
+                float: left;
+                margin-top: -2px;
+                margin-bottom: 6px;
+            }
+        }
+    }
+  }
+}
+
 /***    END:多数据视图属性布局    ***/
 
 // 看板视图，卡片模式

src/utils/app-modal/app-modal.less

@@ -10,6 +10,9 @@
             .ivu-modal-body {
                 padding: 0;
                 height: calc(100% - 52px);
+                .view-container{
+                  padding: 15px;
+                }
             }
         }
     }

src/utils/auth-guard/auth-guard.ts

@@ -53,9 +53,21 @@ export class AuthGuard {
             const get: Promise<any> = Http.getInstance().get(url);
             get.then((response: any) => {
                 if (response && response.status === 200) {
-                    const { data }: { data: any } = response;
+                    let { data }: { data: any } = response;
                     if (data) {
+                        // token认证把用户信息放入应用级数据
+                        if(localStorage.getItem('user')){
+                            let user:any = JSON.parse(localStorage.getItem('user') as string);
+                            let localAppData:any = {};
+                            if(user.sessionParams){
+                                localAppData = {context:user.sessionParams};
+                                Object.assign(localAppData,data);
+                            }
+                            data = JSON.parse(JSON.stringify(localAppData));
+                        }
                         router.app.$store.commit('addAppData', data);
+                        // 提交统一资源数据
+                        router.app.$store.dispatch('unifiedresource/commitResourceData', data);
                     }
                 }
                 resolve(true);