Merge branch 'dev'

src/app-register.ts

@@ -97,6 +97,7 @@ import AppFormPart from './components/app-form-part/app-form-part.vue'
 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'
 
 // 全局挂载UI实体服务注册中心
 window['uiServiceRegister'] = uiServiceRegister;
@@ -209,5 +210,6 @@ 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)
     },
 };
\ No newline at end of file

src/components/app-actionbar/app-actionbar.vue

@@ -100,6 +100,8 @@ export default class AppActionBar extends Vue {
    * @memberof AppActionBar
    */
   public calcActionItemAuthState(data:any,ActionModel:any,UIService:any){
+    if(!UIService.isEnableDEMainState)
+      return;    
     for (const key in ActionModel) {
         if (!ActionModel.hasOwnProperty(key)) {
             return;

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

@@ -279,7 +279,7 @@ export default class AppColumnLink extends Vue {
         if (result.datas && Array.isArray(result.datas)) {
             Object.assign(item, result.datas[0]);
         }
-        console.log(item);
+        this.$emit('refresh',item);
     }
 
     /**

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

@@ -158,6 +158,8 @@ export default class AppFormGroup extends Vue {
      * @memberof AppFormGroup
      */
     public calcActionItemAuthState(data:any,ActionModel:any,UIService:any){
+        if(!UIService.isEnableDEMainState)
+            return;
         for (const key in ActionModel) {
             if (!ActionModel.hasOwnProperty(key)) {
                 return;

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

@@ -47,7 +47,7 @@ export default class AppFormatData extends Vue {
    * @memberof AppFormatData
    */
   getcurValue(){
-    if(this.data){
+    if(this.data || this.data == 0){
       if(Object.is(this.dataType,"DECIMAL") || Object.is(this.dataType,"FLOAT") || Object.is(this.dataType,"CURRENCY")){
         let number = Number(this.data);
         let precision = Number(this.precision);

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

+<template>
+  <div class='app-image-preview'>
+      <el-image :src="data[name]" :previewSrcList="previewList" :disabled="disabled">
+      </el-image>
+  </div>
+</template>
+<script lang = 'ts'>
+import { Vue, Component, Prop, Watch, Provide } from 'vue-property-decorator';
+import { Subject, Unsubscribable } from 'rxjs';
+
+@Component({})
+export default class AppImageRomate extends Vue {
+
+    /**
+     * 表单状态
+     *
+     * @type {any}
+     * @memberof AppImageRomate
+     */
+    @Prop() public formState: any;
+
+    /**
+     * 图片数据
+     *
+     * @type {any}
+     * @memberof AppImageRomate
+     */
+    @Prop() public data!: any;
+
+    /**
+     * 字段名
+     *
+     * @type {any}
+     * @memberof AppImageRomate
+     */
+    @Prop() public name: any;
+
+    /**
+     * 禁用状态
+     *
+     * @type {boolean}
+     * @memberof AppImageRomate
+     */
+    @Prop() public disabled: boolean = false;
+
+    /**
+     * 预览图片数组
+     *
+     * @type {boolean}
+     * @memberof AppImageRomate
+     */
+    public previewList:Array<any> = [];
+
+    /**
+     * 表单状态事件
+     *
+     * @private
+     * @type {(Unsubscribable | undefined)}
+     * @memberof AppImageUpload
+     */
+    private formStateEvent: Unsubscribable | undefined;
+
+    /**
+     * Vue生命周期
+     *
+     * @type {boolean}
+     * @memberof AppImageRomate
+     */
+    public created() {
+        if (this.formState) {
+            this.formStateEvent = this.formState.subscribe(($event: any) => {
+                // 表单加载完成
+                if(this.data && this.name) {
+                    this.handleData();
+                }
+            });
+        }
+    }
+
+    /**
+     * 数据处理
+     *
+     * @type {boolean}
+     * @memberof AppImageRomate
+     */
+    public handleData() {
+        this.previewList.push(this.data[this.name]);
+    }  
+    
+    /**
+     * 组件销毁
+     *
+     * @memberof AppImageRomate
+     */
+    public destroyed(): void {
+        if (this.formStateEvent) {
+            this.formStateEvent.unsubscribe();
+        }
+    }
+}
+
+</script>
\ No newline at end of file

src/components/app-orgsector/app-orgsector.vue

@@ -22,6 +22,7 @@
   </div>
 </template>
 <script lang = 'ts'>
+import { Http } from '@/utils/http/http';
 import { Vue, Component, Inject } from "vue-property-decorator";
 
 @Component({})
@@ -110,17 +111,33 @@ export default class AppOrgSector extends Vue {
     let item: any = this.selectedOrgArray.find((_item: any) => {
       return _item.srforgsectorid === data;
     });
-    if (item.srforgsectorid && item.srforgsectorname) {
-      this.selectedOrgId = item.srforgsectorid;
-      this.selectedOrgName = item.srforgsectorname;
-      this.reload();
+    this.switchDepartment(data).then((response:any) =>{
+        if (response.status == 200) {
+          if (item.srforgsectorid && item.srforgsectorname) {
+            this.selectedOrgId = item.srforgsectorid;
+            this.selectedOrgName = item.srforgsectorname;
+          }
+          this.updateStoreOrgData(item);
+          this.reload();
+        }else{
+          this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data?response.data.message:(this.$t('components.appOrgSector.errorSwitch') as string) });
+        }
+    }).catch((error:any) =>{
+        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: (this.$t('components.appOrgSector.errorSwitch') as string) });
+    })
+  }
 
-    }
-    this.updateStoreOrgData(item);
+  /**
+   * 调用远端切换部门接口
+   *
+   * @memberof AppOrgSector
+   */
+  public async switchDepartment(data:any){
+    return await Http.getInstance().post(`/oumaps/switch`,data,false);
   }
 
   /**
-   * 更新仓库Org信息
+   * 更新仓库部门信息
    *
    * @memberof AppOrgSector
    */

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

@@ -37,7 +37,7 @@
     </div>
     <div v-else-if="Object.is(editortype, 'dropdown')" class='app-picker'>
         <el-select ref="appPicker" remote :remote-method="(query) => this.onSearch(query, null, true)" :value="refvalue" size='small' filterable
-            @change="onSelect" :disabled="disabled" style='width:100%;' clearable
+            @change="onSelect" :disabled="disabled" style='width:100%;' clearable popper-class="app-picker-dropdown"
             @clear="onClear" @visible-change="onSelectOpen">
             <template v-if="items">
                 <template v-for="_item in items">
@@ -260,6 +260,14 @@ export default class AppPicker extends Vue {
      */
     public selectValue = this.value;
 
+    /**
+     * 下拉列表节点元素
+     *
+     * @type {*}
+     * @memberof AppPicker
+     */
+    public dropdownDom:any = {};
+
     /**
      * 获取关联数据项值
      *
@@ -314,6 +322,8 @@ export default class AppPicker extends Vue {
      * @memberof AppPicker
      */
     public mounted() {
+        const dropdownDom:any = this.$el.getElementsByClassName('app-picker-dropdown')[0];
+        this.dropdownDom = dropdownDom;
     }
 
     /**
@@ -331,10 +341,22 @@ export default class AppPicker extends Vue {
     public onSelectOpen(flag: boolean): void {
         this.open = flag;
         if (this.open) {
+            //设置下拉列表的最大宽度
+            this.setDropdownWidth();
             this.onSearch(this.curvalue, null, true);
         }
     }
 
+    /**
+     * 设置下拉列表最大宽度使下拉列表宽度和编辑器宽度一致
+     *
+     * @memberof AppPicker
+     */
+    public setDropdownWidth(){
+        const elInput:any = this.$el.getElementsByClassName('el-input__inner')[0];
+        this.dropdownDom.style.maxWidth = elInput.offsetWidth+'px';
+    }
+
     /**
      * 执行搜索数据
      * @param query 
@@ -434,10 +456,10 @@ export default class AppPicker extends Vue {
      */
     public onClear($event: any): void {
         if (this.valueitem) {
-            this.$emit('formitemvaluechange', { name: this.valueitem, value: '' });
+            this.$emit('formitemvaluechange', { name: this.valueitem, value: null });
         }
         if (this.name) {
-            this.$emit('formitemvaluechange', { name: this.name, value: '' });
+            this.$emit('formitemvaluechange', { name: this.name, value: null });
         }
         this.fillPickUpData();
         this.$forceUpdate();

src/components/app-rawitem/app-rawitem.vue

 <template>
-    <div>
-        <span v-if="caption">{{caption}}</span>
-        <div :class="contentStyle" :style="sizeStyle">
-            <template v-if="Object.is(contentType,'RAW')">
-                {{rawContent ? rawContent : ''}}
-            </template>
-            <template v-else-if="Object.is(contentType,'HTML')">
-                {{htmlContent ? htmlContent : ''}}
-            </template>
-            <template v-else-if="Object.is(contentType,'IMAGE')">
-                <i :class="imageClass ? imageClass : ''"></i>
-            </template>
+    <div :style="sizeStyle">
+        <span>{{caption}}</span>
+        <div v-if="Object.is(contentType,'RAW')" :class="contentStyle">
+            <slot></slot>
+        </div>
+        <div v-else-if="Object.is(contentType,'HTML')" :class="contentStyle" v-html="htmlContent" />
+        <div v-else-if="Object.is(contentType,'IMAGE')" :class="contentStyle">
+             <i :class="imageClass ? imageClass : ''"></i>
         </div>
     </div>
 </template>
@@ -22,20 +18,28 @@ import { Component, Vue, Prop, Model, Watch } from "vue-property-decorator";
 export default class AppRawItem extends Vue {
 
     /**
-    * 内容类型
+    * 应用上下文
     * 
     * @type {string}
     * @memberof AppRawItem
     */
-    @Prop() public contentType!: string;
+    @Prop() public context!: any;
 
     /**
-     * 直接内容
-     * 
-     * @type {strin}
-     * @memberof AppRawItem
-     */
-    @Prop() public rawContent?: string;
+    * 视图参数
+    * 
+    * @type {string}
+    * @memberof AppRawItem
+    */
+    @Prop() public viewparams!: any;
+
+    /**
+    * 内容类型
+    * 
+    * @type {string}
+    * @memberof AppRawItem
+    */
+    @Prop() public contentType!: string;
 
     /**
      * html内容
@@ -46,7 +50,7 @@ export default class AppRawItem extends Vue {
     @Prop() public htmlContent?: string;
 
     /**
-     * html内容
+     * 图片
      * 
      * @type {strin}
      * @memberof AppRawItem

src/components/login/login.vue

@@ -183,6 +183,9 @@ export default class Login extends Vue {
                     localStorage.setItem('token', data.token);
                     this.setCookie('ibzuaa-token',data.token,0);
                 }
+                if(data && data.user){
+                    localStorage.setItem('user', JSON.stringify(data.user));
+                }
                 // 设置cookie,保存账号密码7天
                 this.setCookie("loginname",loginname, 7);
                 // 跳转首页

src/engine/view/tab-exp-view-engine.ts

@@ -44,4 +44,14 @@ export default class TabExpViewEngine extends ViewEngine {
             this.setViewState2({ tag: _item.name, action: 'load', viewdata: this.view.context });
         });
     }
+
+    /**
+     * 计算按钮状态
+     *
+     * @memberof TabExpViewEngine
+     */
+    public computeToolbarState(state:boolean,data:any){
+        this.calcToolbarItemState(state);
+        this.calcToolbarItemAuthState(data);
+    }
 }
\ No newline at end of file

src/engine/view/view-engine.ts

@@ -187,6 +187,8 @@ export default class ViewEngine {
      */
     public calcToolbarItemAuthState(data:any){
         const _this: any = this;
+        if(!_this.view.appUIService.isEnableDEMainState)
+            return;
         for (const key in _this.view.toolBarModels) {
             if (!_this.view.toolBarModels.hasOwnProperty(key)) {
                 return;

src/locale/lanres/components/components_en_US.ts

@@ -11,6 +11,10 @@ export default {
         indexPage: 'home page',
         continue: 'to continue browsing',
     },
+    appOrgSector:{
+      successSwitch:'The switch was successful',
+      errorSwitch:'The switchover failed',
+    },
     appAutocomplete: {
         error: 'Error',
         miss: 'Missing parameter ',

src/locale/lanres/components/components_zh_CN.ts

@@ -11,6 +11,10 @@ export default {
         indexPage: '首页',
         continue: '继续浏览',
     },
+    appOrgSector:{
+      successSwitch:'切换成功',
+      errorSwitch:'切换失败',
+    },
     appAutocomplete: {
         error: '错误',
         miss: '缺少参数',

src/utils/view-tool/view-tool.ts

@@ -258,7 +258,7 @@ export class ViewTool {
                 return result;
             }
             const _item = ActionModel[key];
-            if(_item && _item['dataaccaction'] && UIService){
+            if(_item && _item['dataaccaction'] && UIService && UIService.isEnableDEMainState){
                 let dataActionResult:any;
                 if(Object.is(_item['actiontarget'],"NONE") || Object.is(_item['actiontarget'],"")){
                     dataActionResult = UIService.getResourceOPPrivs(_item['dataaccaction']);