Merge branch 'dev'

src/app-register.ts

@@ -28,7 +28,6 @@ import AppCheckboxList from './components/app-checkbox-list/app-checkbox-list.vu
 import AppRadioGroup from './components/app-radio-group/app-radio-group.vue'
 import AppEmbedPicker from './components/app-embed-picker/app-embed-picker.vue'
 import AppTreePicker from './components/app-tree-picker/app-tree-picker.vue'
-import AppRichTextEditor from './components/app-rich-text-editor/app-rich-text-editor.vue'
 import AppFileUpload from './components/app-file-upload/app-file-upload.vue'
 import AppImageUpload from './components/app-image-upload/app-image-upload.vue'
 import PropertyLayout from './components/property-layout/property-layout.vue'
@@ -53,7 +52,6 @@ import AppRate from './components/app-rate/app-rate.vue'
 import AppSwitch from './components/app-switch/app-switch.vue'
 import AppSlider from './components/app-slider/app-slider.vue'
 import AppStepper from './components/app-stepper/app-stepper.vue'
-import AppPortalDesign from './components/app-portal-design/app-portal-design.vue'
 import DatePickerRange from './components/date-picker-range/date-picker-range.vue'
 import AppRangeDate from './components/app-range-date/app-range-date.vue'
 import AppActionBar from './components/app-actionbar/app-actionbar.vue'
@@ -63,7 +61,6 @@ import AppStudioAction from './components/app-studioaction/app-studioaction.vue'
 import AppDebugActions from './components/app-debug-actions/app-debug-actions.vue'
 import AppHeaderMenus from './components/app-header-menus/app-header-menus.vue'
 import AppColumnLink from './components/app-column-link/app-column-link.vue'
-import AppDataUploadView from './components/app-data-upload/app-data-upload.vue'
 import DropDownListDynamic from './components/dropdown-list-dynamic/dropdown-list-dynamic.vue'
 import AppImagePreview from './components/app-image-preview/app-image-preview.vue'
 import AppFormatData from './components/app-format-data/app-format-data.vue'
@@ -115,7 +112,7 @@ export const AppComponents = {
         v.component('app-radio-group',AppRadioGroup);
         v.component('app-embed-picker', AppEmbedPicker);
         v.component('app-tree-picker', AppTreePicker);
-        v.component('app-rich-text-editor',AppRichTextEditor);
+        v.component('app-rich-text-editor', () => import('./components/app-rich-text-editor/app-rich-text-editor.vue'));
         v.component('app-file-upload',AppFileUpload);
         v.component('app-image-upload',AppImageUpload);
         v.component('property-layout',PropertyLayout);
@@ -140,7 +137,7 @@ export const AppComponents = {
         v.component('app-switch', AppSwitch);
         v.component('app-slider', AppSlider);
         v.component('app-stepper', AppStepper);
-        v.component('app-portal-design',AppPortalDesign);
+        v.component('app-portal-design', () => import('./components/app-portal-design/app-portal-design.vue'));
         v.component('date-picker-range',DatePickerRange);
         v.component('app-range-date', AppRangeDate);
         v.component('app-actionbar', AppActionBar);
@@ -150,7 +147,7 @@ export const AppComponents = {
         v.component('app-debug-actions', AppDebugActions);
         v.component('app-header-menus', AppHeaderMenus);
         v.component('app-column-link', AppColumnLink);
-        v.component('app-data-upload', AppDataUploadView);
+        v.component('app-data-upload', () => import('./components/app-data-upload/app-data-upload.vue'));
         v.component('dropdown-list-dynamic', DropDownListDynamic);
         v.component('app-image-preview', AppImagePreview);
         v.component('app-format-data', AppFormatData);

src/components/app-file-upload/app-file-upload.vue

@@ -100,6 +100,22 @@ export default class AppFileUpload extends Vue {
      */
     @Prop() public data!: string;
 
+    /**
+     * 视图参数
+     *
+     * @type {*}
+     * @memberof AppFormDRUIPart
+     */
+    @Prop() public viewparams!: any;
+
+    /**
+     * 视图上下文
+     *
+     * @type {*}
+     * @memberof AppAutocomplete
+     */
+    @Prop() public context!: any;
+
     /**
      * 初始化值
      *
@@ -146,7 +162,7 @@ export default class AppFileUpload extends Vue {
      * @type {string}
      * @memberof AppFileUpload
      */
-    @Prop() public uploadparams?: string;
+    @Prop() public uploadparams?: any;
 
     /**
      * 下载参数
@@ -154,15 +170,7 @@ export default class AppFileUpload extends Vue {
      * @type {string}
      * @memberof AppFileUpload
      */
-    @Prop() public exportparams?: string;
-
-    /**
-     * 自定义参数
-     *
-     * @type {*}
-     * @memberof AppFileUpload
-     */
-    @Prop() public customparams?: any;
+    @Prop() public exportparams?: any;
 
     /**
      * 上传文件路径
@@ -186,20 +194,20 @@ export default class AppFileUpload extends Vue {
     public files = [];
 
     /**
-     * 上传keys
+     * 上传params
      *
      * @type {Array<any>}
      * @memberof AppFileUpload
      */
-    public upload_keys: Array<any> = [];
+    public upload_params: Array<any> = [];
 
     /**
-     * 导出keys
+     * 导出params
      *
      * @type {Array<any>}
      * @memberof AppFileUpload
      */
-    public export_keys: Array<any> = [];
+    public export_params: Array<any> = [];
 
     /**
      * 自定义数组
@@ -239,31 +247,37 @@ export default class AppFileUpload extends Vue {
      * @memberof AppFileUpload
      */
     private dataProcess(): void {
-        let upload_arr: Array<string> = [];
-        let export_arr: Array<string> = [];
-        const _data: any = JSON.parse(this.data);
-        this.upload_keys.forEach((key: string) => {
-            upload_arr.push(`${key}=${_data[key]}`);
-        });
-        this.export_keys.forEach((key: string) => {
-            export_arr.push(`${key}=${_data[key]}`);
-        });
 
         let _url = `${Environment.BaseUrl}${Environment.UploadFile}`;
-        if (upload_arr.length > 0 || this.custom_arr.length > 0) {
-            _url = `${_url}?${upload_arr.join('&')}${upload_arr.length > 0 ? '&' : ''}${this.custom_arr.join('&')}`;
+        if (this.upload_params.length > 0 ) {
+            _url +='?';
+            this.upload_params.forEach((item:any,i:any)=>{
+                _url += `${Object.keys(item)[0]}=${Object.values(item)[0]}`;
+                if(i<this.upload_params.length-1){
+                    _url += '&';
+                }
+            })    
         }
+        
         this.uploadUrl = _url;
-
+        
         this.files.forEach((file: any) => {
             let url = `${this.downloadUrl}/${file.id}`;
-            if (upload_arr.length > 0 || this.custom_arr.length > 0) {
-                url = `${url}?${upload_arr.join('&')}${upload_arr.length > 0 ? '&' : ''}${this.custom_arr.join('&')}`;
+            if (this.export_params.length > 0) {
+                url +='?';
+            this.export_params.forEach((item:any,i:any)=>{
+                url += `${Object.keys(item)[0]}=${Object.values(item)[0]}`;
+                if(i<this.export_params.length-1){
+                    url += '&';
+                }
+            })
             }
             file.url = url;
         });
     }
 
+    
+
     /**
      * vue 生命周期
      *
@@ -290,28 +304,37 @@ export default class AppFileUpload extends Vue {
     public mounted() {
         this.appData = this.$store.getters.getAppData();
 
-        let uploadparams: string = '';
-        let exportparams: string = '';
+        let uploadparams: any = {};
+        let exportparams: any = {};
 
-        let upload_keys: Array<string> = [];
-        let export_keys: Array<string> = [];
+        let upload_params: Array<string> = [];
+        let export_params: Array<string> = [];
         let custom_arr: Array<string> = [];
+
+        let param:any = this.viewparams;
+        let context:any = this.context;
+        let _data:any = JSON.parse(this.data);
+
         if (this.uploadparams && !Object.is(this.uploadparams, '')) {
             uploadparams = this.uploadparams;
-            upload_keys = uploadparams.split(';');
+            upload_params = this.$util.computedNavData(_data,param,context,uploadparams);    
         }
+
         if (this.exportparams && !Object.is(this.exportparams, '')) {
             exportparams = this.exportparams;
-            export_keys = exportparams.split(';');
+            export_params = this.$util.computedNavData(_data,param,context,exportparams);
         }
-        if (this.customparams && !Object.is(this.customparams, '')) {
-            Object.keys(this.customparams).forEach((name: string) => {
-                custom_arr.push(`${name}=${this.customparams[name]}`);
-            });
+
+        for (const item in upload_params) {
+            this.upload_params.push({
+                [item]:upload_params[item]
+            })
+        }
+        for (const item in export_params) {
+            this.export_params.push({
+                [item]:export_params[item]
+            })
         }
-        this.upload_keys = upload_keys;
-        this.export_keys = export_keys;
-        this.custom_arr = custom_arr;
 
         this.setFiles(this.value);
         this.dataProcess();

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

 .app-form-group {
+
     >.ivu-card-head {
         >p {
             >i {
@@ -7,9 +8,12 @@
             }
         }
     }
+
     >.ivu-card-extra {
+
         .item-extract-mode {
             display: flex;
+
             .item {
                 margin-left: 12px;
             }
@@ -18,6 +22,7 @@
 }
 
 .app-form-group.app-group-collapse-contant {
+
     .ivu-card-body {
         display: none;
     }
@@ -25,9 +30,12 @@
 
 .app-group-flex {
     height: 100%;
-    overflow: auto;
-    > .ivu-card-body {
+    overflow-y: auto;
+    overflow-x: hidden;
+
+    >.ivu-card-body {
         height: calc(100% - 51px);
-        overflow: auto;
+        overflow-y: auto;
+        overflow-x: hidden;
     }
 }
\ No newline at end of file

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

 <template>
-    <div class="app-form-group">
-        <div v-if="uiStyle=='STYLE2'">
+    <div :class="classes">
+        <template v-if="uiStyle=='STYLE2'">
             <app-form-group2
                 :caption="caption"
                 :uiStyle="uiStyle"
@@ -10,8 +10,8 @@
                 :titleBarCloseMode="titleBarCloseMode">
                    <slot></slot>
                 </app-form-group2>
-        </div>
-        <div v-else>
+        </template>
+        <template v-else>
             <card v-if="isShowCaption === true" :bordered="false" :dis-hover="true" :class="classes">
                 <p class='' slot='title'>
                      <icon v-if="titleBarCloseMode !== 0" :type="collapseContant ? 'ios-arrow-dropright-circle' : 'ios-arrow-dropdown-circle'"
@@ -87,17 +87,17 @@
                         </template>
                     </a >
                 </template>
-                <div v-if="Object.is(layoutType, 'FLEX')">
+                <template v-if="Object.is(layoutType, 'FLEX')">
                     <slot></slot>
-                </div>
-                <div v-if="!Object.is(layoutType, 'FLEX')">
+                </template>
+                <template v-if="!Object.is(layoutType, 'FLEX')">
                     <row :gutter="10"><slot></slot></row>
-                </div>
+                </template>
             </card>
-            <row v-if="isShowCaption === false" :class="classes">
-               <slot></slot>
-            </row>
-        </div>
+            <template v-if="isShowCaption === false">
+                <slot></slot>
+            </template>
+        </template>
     </div>
 </template>
 

src/components/app-form-item/app-form-item.less

 .app-form-item {
-    // margin-bottom: 16px;
-    >.ivu-form-item-label {
-        text-decoration: none;
-        display: block;
-        overflow: hidden;
-        white-space: nowrap;
-    }
-    >.ivu-form-item-content {
-        min-height: 36px;
-    }
+  height: 100%;
+  .editor {
+      height: 100%;
+      .ivu-form-item-content {
+          height: 100%;
+          min-height: 36px;
+      }
+  }
+  .app-form-item-label {
+      padding: 6px 10px 6px 0px;
+
+  }
 }
-.app-form-item-label-top {
-    >.ivu-form-item-label {
-        float: none;
-        display: inline-block;
-        padding: 0 0 10px;
-    }
+
+.app-form-item.label-top, .app-form-item.label-bottom {
+  .app-form-item-label {
+      display: block;
+  }
 }
 
-.app-form-item-label-left{
-  .app-form-item-label{
-    float: left;
-    text-align: right;
-    padding-right: 12px;
+.app-form-item.label-left, .app-form-item.label-right {
+  .app-form-item-label, .editor {
+      height: 100%;
   }
 }
-.app-form-item-label-right{
-  .app-form-item-label{
-    float: right;
-    text-align: left;
-    padding-left: 12px;
+
+.app-form-item.label-left {
+  .app-form-item-label {
+      float: left;
+      text-align: right;
   }
 }
-.app-form-item-label-top{
-  .app-form-item-label{
-    display: block;
-    padding-bottom: 10px;
+
+.app-form-item.label-right {
+  .app-form-item-label {
+      float: right;
+      padding: 6px 0px 6px 10px;
   }
 }
-.app-form-item-label-bottom{
-  .app-form-item-label{
-    display: block;
-    padding-top: 10px;
+
+.app-form-item.label-none {
+  .app-form-item-label {
+      display: none !important;
   }
 }
\ No newline at end of file

src/components/app-image-upload/app-image-upload.vue

@@ -98,6 +98,22 @@ export default class AppImageUpload extends Vue {
      */
     @Prop() public data!: string;
 
+    /**
+     * 视图参数
+     *
+     * @type {*}
+     * @memberof AppFormDRUIPart
+     */
+    @Prop() public viewparams!: any;
+
+    /**
+     * 视图上下文
+     *
+     * @type {*}
+     * @memberof AppAutocomplete
+     */
+    @Prop() public context!: any;
+
     /**
      * 初始化值
      *
@@ -185,20 +201,20 @@ export default class AppImageUpload extends Vue {
     @Provide() public files = [];
 
     /**
-     * 上传keys
+     * 上传params
      *
      * @type {Array<any>}
      * @memberof AppImageUpload
      */
-    public upload_keys: Array<any> = [];
+    public upload_params: Array<any> = [];
 
     /**
-     * 导出keys
+     * 导出params
      *
      * @type {Array<any>}
      * @memberof AppImageUpload
      */
-    public export_keys: Array<any> = [];
+    public export_params: Array<any> = [];
 
     /**
      * 自定义数组
@@ -238,26 +254,31 @@ export default class AppImageUpload extends Vue {
      * @memberof AppImageUpload
      */
     private dataProcess(): void {
-        let upload_arr: Array<string> = [];
-        let export_arr: Array<string> = [];
-        const _data: any = JSON.parse(this.data);
-        this.upload_keys.forEach((key: string) => {
-            upload_arr.push(`${key}=${_data[key]}`);
-        });
-        this.export_keys.forEach((key: string) => {
-            export_arr.push(`${key}=${_data[key]}`);
-        });
 
         let _url = `${Environment.BaseUrl}${Environment.UploadFile}`;
-        if (upload_arr.length > 0 || this.custom_arr.length > 0) {
-            _url = `${_url}?${upload_arr.join('&')}${upload_arr.length > 0 ? '&' : ''}${this.custom_arr.join('&')}`;
+        if (this.upload_params.length > 0 ) {
+            _url +='?';
+            this.upload_params.forEach((item:any,i:any)=>{
+                _url += `${Object.keys(item)[0]}=${Object.values(item)[0]}`;
+                if(i<this.upload_params.length-1){
+                    _url += '&';
+                }
+            })
+            
         }
+        
         this.uploadUrl = _url;
-
+        
         this.files.forEach((file: any) => {
             let url = `${this.downloadUrl}/${file.id}`;
-            if (upload_arr.length > 0 || this.custom_arr.length > 0) {
-                url = `${url}?${upload_arr.join('&')}${upload_arr.length > 0 ? '&' : ''}${this.custom_arr.join('&')}`;
+            if (this.export_params.length > 0) {
+                url +='?';
+                this.export_params.forEach((item:any,i:any)=>{
+                    url += `${Object.keys(item)[0]}=${Object.values(item)[0]}`;
+                    if(i<this.export_params.length-1){
+                        url += '&';
+                    }
+                })
             }
             file.url = url;
         });
@@ -288,28 +309,35 @@ export default class AppImageUpload extends Vue {
     public mounted() {
         this.appData = this.$store.getters.getAppData();
 
-        let uploadparams: string = '';
-        let exportparams: string = '';
+        let uploadparams: any = {};
+        let exportparams: any = {};
 
-        let upload_keys: Array<string> = [];
-        let export_keys: Array<string> = [];
+        let upload_params: Array<string> = [];
+        let export_params: Array<string> = [];
         let custom_arr: Array<string> = [];
+
+        let param:any = this.viewparams;
+        let context:any = this.context;
+        let _data:any = JSON.parse(this.data);
         if (this.uploadparams && !Object.is(this.uploadparams, '')) {
             uploadparams = this.uploadparams;
-            upload_keys = uploadparams.split(';');
+            upload_params = this.$util.computedNavData(_data,param,context,uploadparams);
         }
         if (this.exportparams && !Object.is(this.exportparams, '')) {
             exportparams = this.exportparams;
-            export_keys = exportparams.split(';');
+            export_params = this.$util.computedNavData(_data,param,context,exportparams);
         }
-        if (this.customparams && !Object.is(this.customparams, '')) {
-            Object.keys(this.customparams).forEach((name: string) => {
-                custom_arr.push(`${name}=${this.customparams[name]}`);
-            });
+        
+        for (const item in upload_params) {
+            this.upload_params.push({
+                [item]:upload_params[item]
+            })
+        }
+        for (const item in export_params) {
+            this.export_params.push({
+                [item]:export_params[item]
+            })
         }
-        this.upload_keys = upload_keys;
-        this.export_keys = export_keys;
-        this.custom_arr = custom_arr;
 
         this.setFiles(this.value);
         this.dataProcess();

src/components/login/login.vue

@@ -160,7 +160,10 @@ export default class Login extends Vue {
      * @memberof Login
      */
     public handleSubmit(): void {
-        document.cookie = "";
+        // 清除cookie
+        let leftTime = new Date();
+        leftTime.setTime(leftTime.getSeconds() - 1000);
+        document.cookie = "ibzuaa-token=;expires=" + leftTime.toUTCString();
         const form: any = this.$refs.loginForm;
         let validatestate: boolean = true;
         form.validate((valid: boolean) => {

src/service/app/navdata-service.ts

+export interface NavDataElement {
+
+    /**
+     * 主键标识
+     *
+     * @memberof NavDataElement
+     */
+    id: string;
+
+    /**
+     * 视图标题
+     *
+     * @memberof NavDataElement
+     */
+    title: any;
+
+    /**
+     * 上下文
+     *
+     * @memberof NavDataElement
+     */
+    context:any;
+
+    /**
+     * 视图参数
+     *
+     * @memberof NavDataElement
+     */
+    viewparams:any;
+
+    /**
+     * 视图数据
+     *
+     * @memberof NavDataElement
+     */   
+    data:any;
+
+}
+
+/**
+ * 导航数据服务
+ * 
+ * @export
+ * @class CodeListService
+ */
+export default class NavDataService {
+
+    /**
+     * 导航数据栈
+     * 
+     * @memberof NavDataService
+     */
+    public navDataStack:Array<NavDataElement> = [];
+
+    /**
+     * 导航数据存储仓库
+     * 
+     * @memberof NavDataService
+     */
+    public sessionStore:any;
+
+    /**
+     * 初始化实例
+     * 
+     * @memberof NavDataService
+     */
+    constructor(opts:any = {}){
+        this.sessionStore = window.sessionStorage;
+        this.initNavData();
+    }
+
+    /**
+     * 初始化基础导航数据
+     * 
+     * @memberof NavDataService
+     */
+    public initNavData(){
+        if(this.sessionStore && this.sessionStore.getItem('srfnavdata')){
+            this.navDataStack = JSON.parse(this.sessionStore.getItem('srfnavdata'));
+        }
+    }
+
+    /**
+     * 添加基础导航数据到栈中
+     * 
+     * @memberof NavDataService
+     */
+    public addNavData(curNavData:NavDataElement){
+        if(this.navDataStack.length >0){
+            let tempIndex:number = this.navDataStack.findIndex((element:NavDataElement) =>{
+                return Object.is(element.id,curNavData.id);
+            })
+            if(tempIndex === -1){
+                this.navDataStack.push(curNavData);
+                this.sessionStore.setItem('srfnavdata',JSON.stringify(this.navDataStack));
+                return curNavData;
+            }else{
+                this.setNavDataById(curNavData.id,curNavData);
+            }
+        }else{
+            this.navDataStack.push(curNavData);
+            this.sessionStore.setItem('srfnavdata',JSON.stringify(this.navDataStack));
+            return curNavData;
+        }
+    }
+
+    /**
+     * 设置指定数据到基础导航数据栈中
+     * 
+     * @memberof NavDataService
+     */
+    public setNavDataById(id:string,curNavData:NavDataElement){
+        if(this.navDataStack.length >0){
+            let tempIndex:number = this.navDataStack.findIndex((element:NavDataElement) =>{
+                return Object.is(element.id,id);
+            })
+            this.navDataStack[tempIndex] = curNavData;
+            this.sessionStore.setItem('srfnavdata',JSON.stringify(this.navDataStack));
+            return curNavData;
+        }else{
+            return null;
+        }
+    }
+
+    /**
+     * 从导航数据栈中删除指定数据
+     * 
+     * @memberof NavDataService
+     */
+    public removeNavData(id:string){
+        if(this.navDataStack.length >0){
+            let tempIndex:number = this.navDataStack.findIndex((element:NavDataElement) =>{
+                return Object.is(element.id,id);
+            })
+            let removeNavData = this.navDataStack.splice(tempIndex);
+            this.sessionStore.setItem('srfnavdata',JSON.stringify(this.navDataStack));
+            return removeNavData;
+        }else{
+            return null;
+        }
+    }
+
+    /**
+     * 从导航数据栈中获取指定数据
+     * 
+     * @memberof NavDataService
+     */
+    public getNavDataById(id:string){
+        if(this.navDataStack.length >0){
+            let tempIndex:number = this.navDataStack.findIndex((element:NavDataElement) =>{
+                return Object.is(element.id,id);
+            })
+            return this.navDataStack[tempIndex];
+        }else{
+            return null;
+        }
+    }
+
+    /**
+     * 从导航数据栈中获取指定数据的前一条数据
+     * 
+     * @memberof NavDataService
+     */
+    public getPreNavDataById(id:string){
+        if(this.navDataStack.length >0){
+            let tempIndex:number = this.navDataStack.findIndex((element:NavDataElement) =>{
+                return Object.is(element.id,id);
+            })
+            return this.navDataStack[tempIndex-1];
+        }else{
+            return null;
+        }
+    }
+
+    /**
+     * 清空导航数据栈数据
+     * 
+     * @memberof NavDataService
+     */
+    public clearNavData(id:string){
+        this.navDataStack = [];
+        this.sessionStore.setItem('srfnavdata',JSON.stringify(this.navDataStack));
+    }
+}
\ No newline at end of file