Merge branch 'dev'

public/environments/environment.js

+window.Environment = {
+    // 应用基础路径
+    BaseUrl: '',
+    // 是否为开发模式
+    devMode: true,
+    // 是否为pc端应用
+    isAppMode:true,
+    // 是否开启权限认证
+    enablePermissionValid:false,
+    // 打开目标工具，可选参数：sln、mos
+    debugOpenMode:'mos',
+    // 配置平台地址
+    StudioUrl: "http://172.16.170.145/mos/",
+    // 中心标识
+    SlnId: "B4BF5C84-D020-4D9A-A986-8FA4FD72816C",
+    // 系统标识
+    SysId: "B428B5BE-EA90-4101-A493-BA7085D89F0A",
+    // 前端应用标识
+    AppId: "6e0b7357169ef4eba84e1347ed94bd84",
+}
\ No newline at end of file

src/app-register.ts

@@ -85,6 +85,8 @@ import AppFullScren from './components/app-full-scren/app-full-scren.vue'
 import AppLockScren from './components/app-lock-scren/app-lock-scren.vue'
 import ActionTimeline from './components/action-timeline/action-timeline.vue'
 import CronEditor from './components/cron-editor/cron-editor.vue'
+import AppMessagePopover from './components/app-message-popover/app-message-popover.vue'
+
 // 全局挂载UI实体服务注册中心
 window['uiServiceRegister'] = uiServiceRegister;
 // 全局挂载实体权限服务注册中心
@@ -183,5 +185,6 @@ export const AppComponents = {
         v.component('app-menu-item', AppMenuItem);
         v.component('action-timeline', ActionTimeline);
         v.component('cron-editor', CronEditor);
+        v.component('app-message-popover', AppMessagePopover);
     },
 };
\ No newline at end of file

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

@@ -12,6 +12,7 @@
 <script lang="ts">
 import { Vue, Component, Prop, Model, Emit,Inject, Watch } from "vue-property-decorator";
 import { Subject,Subscription } from "rxjs";
+import { Environment } from '@/environments/environment';
 
 @Component({})
 export default class AppActionBar extends Vue {
@@ -99,6 +100,7 @@ export default class AppActionBar extends Vue {
    * @memberof AppActionBar
    */
   public calcActionItemAuthState(data:any,ActionModel:any,UIService:any){
+    if(Environment.enablePermissionValid){
       for (const key in ActionModel) {
           if (!ActionModel.hasOwnProperty(key)) {
               return;
@@ -132,6 +134,7 @@ export default class AppActionBar extends Vue {
           }
       }
     }
+  } 
 
   /**
    * 组件销毁

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

@@ -222,7 +222,12 @@ export default class AppEmbedPicker extends Vue {
         if(Object.is(newFormData[this.refreshitems], oldDormData[this.refreshitems])) {
             return;
         }
-        this.setValue([{srfmajortext: null, srfkey: null}]);
+        if (this.valueItem) {
+            this.$emit('formitemvaluechange', { name: this.valueItem, value: null });
+        }
+        if (this.name) {
+            this.$emit('formitemvaluechange', { name: this.name, value: null });
+        }
     }
 
     /**
@@ -231,6 +236,7 @@ export default class AppEmbedPicker extends Vue {
      * @memberof AppEmbedPicker
      */
     public created() {
+        this.setViewParam();
         if(this.formState) {
             this.formStateEvent = this.formState.subscribe(({ tag, action, data }) => {
                 if (Object.is('load', action)) {

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

@@ -108,6 +108,7 @@
 
 <script lang="ts">
 import { Vue, Component, Prop, Watch } from 'vue-property-decorator';
+import { Environment } from '@/environments/environment';
 
 @Component({})
 export default class AppFormGroup extends Vue {
@@ -157,6 +158,7 @@ export default class AppFormGroup extends Vue {
      * @memberof AppFormGroup
      */
     public calcActionItemAuthState(data:any,ActionModel:any,UIService:any){
+        if(Environment.enablePermissionValid){
             for (const key in ActionModel) {
                 if (!ActionModel.hasOwnProperty(key)) {
                     return;
@@ -190,6 +192,7 @@ export default class AppFormGroup extends Vue {
                 }
             }
         }
+    } 
 
     /**
      * 是否为管理容器

src/components/app-message-popover/app-message-popover.less

+.item {
+  height: 24px;
+  line-height: 24px;
+}
+
+.show-more {
+  text-align: center;
+  margin-top: 10px;
+  height: 20px;
+  color: #409eff;
+  label {
+    cursor: pointer;
+  }
+}
+
+#bellBtn {
+  height: 24px;
+  font-size: 19px;
+  padding-top: 2px;
+  padding-right: 2px;
+  color: #aaa;
+  cursor: pointer;
+}
+
+.Row {
+  min-height: 70px;
+  height: auto;
+  border-bottom: 1px solid lightgray;
+  display: flex;
+  align-items: center;
+
+  .column1 {
+    text-align: center;
+    border: 0px solid red;
+  }
+
+  .column2 {
+    border: 0px red solid;
+    .process-definition-name {
+      font-size: 14px;
+      padding-top: 5px; 
+    }
+    .description {
+      margin-top: 6px;
+      margin-bottom: 6px;
+      max-width: 95%;
+    }
+    .createtime {
+      padding-bottom: 5px;
+    }
+
+    .el-row {
+      display: flex;
+      .el-col {
+        flex-grow: 1;
+
+        div:first-child {
+          font-weight: 500;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+        }
+
+        div:nth-child(n+2) {
+          font-size: 12px;
+        }
+      }
+    }
+
+
+  }
+
+
+}

src/components/app-transfer/app-transfer.less

@@ -5,11 +5,21 @@
           display: none;
       }
       .el-transfer{
+          max-height: 200px;
           min-width: 100% !important;
           display: flex;
           justify-content: space-between;
           .el-transfer-panel{
               min-width: 25%;
+              .el-transfer-panel__body{
+                max-height: 160px;
+                .el-checkbox-group{
+                    max-height: 160px;
+                    .el-checkbox+.el-checkbox {
+                        margin-left: 0px; 
+                    }
+                }
+            }
           }
           .el-transfer__buttons{
               align-self: center;

src/components/app-wf-approval/app-wf-approval.vue

@@ -5,7 +5,9 @@
             <span>{{data.startUserName}}{{$t('components.appWFApproval.commit')}}</span>
         </div>
         <div class="app-wf-approval-content" v-if="data.usertasks && data.usertasks.length >0">
-            <div class="approval-content-item" v-for="(usertask,index) in data.usertasks" :key="index">
+            <template v-for="(usertask,index) in data.usertasks" >
+                <template v-if="usertask.identitylinks.length >0">
+                    <div class="approval-content-item" :key="index">
                         <div class="approval-content-item-left">
                             {{usertask.userTaskName}}
                         </div>
@@ -29,6 +31,9 @@
                             </div>
                         </div>
                     </div>
+                </template>
+            </template>
+            
         </div>
          <div class="app-wf-approval-bottom">
             <span v-if="data.endTime">{{data.endTime}}{{$t('components.appWFApproval.end')}}</span>

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

@@ -8,7 +8,7 @@
         :filterable="filterable"
         @on-open-change="onClick"
         :placeholder="$t('components.dropDownListDynamic.placeholder')">
-        <i-option v-for="(item, index) in items" :key="index" :value="item.value">{{($t('userCustom.'+tag+'.'+item.value)!== ('userCustom.'+tag+'.'+item.value))?$t('userCustom.'+tag+'.'+item.value) : item.text}}</i-option>
+        <i-option v-for="(item, index) in items" :key="index" :class="item.class" :value="item.value">{{($t('userCustom.'+tag+'.'+item.value)!== ('userCustom.'+tag+'.'+item.value))?$t('userCustom.'+tag+'.'+item.value) : item.text}}</i-option>
     </i-select>
 </template>
 

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

@@ -12,7 +12,7 @@
             :filterable="filterable"
             @on-open-change="onClick"
             :placeholder="$t('components.dropDownListMpicker.placeholder')">
-            <i-option v-for="(item, index) in items" :key="index" :value="item.value.toString()" :label="item.text">
+            <i-option v-for="(item, index) in items" :key="index" :class="item.class" :value="item.value.toString()" :label="item.text">
             <Checkbox :value = "(currentVal.indexOf(item.value.toString()))==-1?false:true">
                 {{Object.is(codelistType,'STATIC') ? $t('codelist.'+tag+'.'+item.value) : item.text}}
             </Checkbox>

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

@@ -9,7 +9,7 @@
         :filterable="filterable"
         @on-open-change="onClick"
         :placeholder="$t('components.dropDownList.placeholder')">
-        <i-option v-for="(item, index) in items" :key="index" :value="item.value">{{($t('codelist.'+tag+'.'+item.value)!== ('codelist.'+tag+'.'+item.value))?$t('codelist.'+tag+'.'+item.value) : item.text}}</i-option>
+        <i-option v-for="(item, index) in items" :key="index" :class="item.class" :value="item.value">{{($t('codelist.'+tag+'.'+item.value)!== ('codelist.'+tag+'.'+item.value))?$t('codelist.'+tag+'.'+item.value) : item.text}}</i-option>
         </i-select>
         <ibiz-select-tree v-if="hasChildren" class="tree-dropdown-list" :disabled="disabled" :NodesData="items" v-model="currentVal" :multiple="false"></ibiz-select-tree>
     </div>

src/engine/view/view-engine.ts

+import { Environment } from '@/environments/environment';
+
 /**
  * 
  *
@@ -184,6 +186,7 @@ export default class ViewEngine {
      * @memberof ViewEngine
      */
     public calcToolbarItemAuthState(data:any){
+        if(Environment.enablePermissionValid){
             const _this: any = this;
             for (const key in _this.view.toolBarModels) {
                 if (!_this.view.toolBarModels.hasOwnProperty(key)) {
@@ -218,5 +221,6 @@ export default class ViewEngine {
                 }
             }
         }
+    }   
 
 }
\ No newline at end of file

src/engine/view/wfdyna-exp-grid-view-engine.ts

@@ -76,4 +76,37 @@ export default class WFDynaExpGridViewEngine extends GridViewEngine {
     public GridLoad(args: any[]) {
         this.view.getWFStepModel();
     }
+
+    /**
+     * 选中变化
+     *
+     * @param {any[]} args
+     * @memberof WFDynaExpGridViewEngine
+     */
+    public selectionChange(args: any[]): void {
+        if (this.view) {
+            this.view.selectedData = args;
+            this.view.$emit('viewdataschange', args);
+        }
+        const state = args.length > 0 && !Object.is(args[0].srfkey, '') ? false : true;
+        this.calcToolbarItemState(state);
+    }
+
+    /**
+     * 计算工具栏状态
+     *
+     * @param {boolean} state
+     * @param {*} [dataaccaction]
+     * @memberof WFDynaExpGridViewEngine
+     */
+    public calcToolbarItemState(state: boolean, dataaccaction?: any) {
+        const _this: any = this;
+        if (!_this.view.linkModel || Object.keys(_this.view.linkModel).length === 0) {
+            return;
+        }
+        _this.view.linkModel.forEach((item:any) => {
+            item.disabled = state;
+        });
+        this.view.$forceUpdate();
+    }
 }
\ No newline at end of file

src/locale/lanres/components/components_en_US.ts

@@ -324,5 +324,9 @@ export default {
         error1: 'Date and day of the week cannot be "not specified" at the same time',
         error2: 'Both the date and the day of the week must be "not specified"',
       },
+    },
+    appMessagePopover: {
+      loadMore: 'Load more',
+      noMore: 'No more'
     }
 };
\ No newline at end of file

src/locale/lanres/components/components_zh_CN.ts

@@ -325,5 +325,9 @@ export default {
         error1: '日期与星期不可以同时为“不指定”',
         error2: '日期与星期必须有一个为“不指定”',
       },
+    },
+    appMessagePopover: {
+      loadMore: '加载更多',
+      noMore: '没有更多了'
     }
 };
\ No newline at end of file

src/model/form-detail/form-button.ts

@@ -11,7 +11,7 @@ export class FormButtonModel extends FormDetailModel {
 
     constructor(opts: any = {}) {
         super(opts);
-        this.disabled = opts.disabled;
+        this.$disabled = opts.disabled;
         this.uiaction = opts.uiaction;
     }
 
@@ -21,7 +21,7 @@ export class FormButtonModel extends FormDetailModel {
      * @type {boolean}
      * @memberof FormButtonModel
      */
-    public disabled:boolean = false;
+    private $disabled:boolean = false;
 
     /**
      * 按钮对应的界面行为
@@ -31,4 +31,26 @@ export class FormButtonModel extends FormDetailModel {
      */
     public uiaction:any;
 
+    /**
+     * 是否启用
+     *
+     * @type {boolean}
+     * @memberof FormButtonModel
+     */
+    public get disabled(): boolean {
+        return this.$disabled;
+    }
+
+    /**
+     * 设置是否启用
+     *
+     * @memberof FormButtonModel
+     */
+    public set disabled(val: boolean) {
+        if(this.isPower) {
+            this.$disabled = val;
+        }
+    }
+
+
 }
\ No newline at end of file

src/model/form-detail/form-detail.ts

@@ -6,6 +6,14 @@
  */
 export class FormDetailModel {
 
+    /**
+     * 是否有权限
+     *
+     * @type {boolean}
+     * @memberof FormDetailModel
+     */
+    public isPower: boolean = true;
+
     /**
      * 成员标题
      *
@@ -44,7 +52,7 @@ export class FormDetailModel {
      * @type {boolean}
      * @memberof FormDetailModel
      */
-    public visible: boolean = true;
+    public $visible: boolean = true;
 
     /**
      * 成员是否显示(旧)
@@ -83,12 +91,33 @@ export class FormDetailModel {
         this.detailType = !Object.is(opts.detailType, '') ? opts.detailType : '';
         this.form = opts.form ? opts.form : {};
         this.name = !Object.is(opts.name, '') ? opts.name : '';
-        this.visible = opts.visible ? true : false;
+        this.$visible = opts.visible ? true : false;
         this.oldVisible = opts.visible ? true : false;
         this.isShowCaption = opts.isShowCaption ? true : false;
         this.isControlledContent = opts.isControlledContent ? true : false;
     }
 
+    /**
+     * 设置成员是否隐藏
+     *
+     * @memberof FormDetailModel
+     */
+    public set visible(val: boolean) {
+        if(this.isPower) {
+            this.$visible = val;
+        }
+    }
+
+    /**
+     * 获取成员是否隐藏
+     *
+     * @memberof FormDetailModel
+     */
+    public get visible() {
+        return  this.$visible;
+    }
+
+
     /**
      * 设置显示与隐藏
      *
@@ -96,8 +125,10 @@ export class FormDetailModel {
      * @memberof FormDetailModel
      */
     public setVisible(state: boolean): void {
+        if(this.isPower) {
             this.visible = state;
         }
+    }
 
     /**
      * 设置显示标题栏

src/service/entity-service.ts

@@ -829,6 +829,32 @@ export default class EntityService {
         return Http.getInstance().get(`/wfcore/${this.SYSTEMNAME}-app-${this.APPNAME}/${this.APPDENAME}/${context[this.APPLYDEKEY]}/usertasks/${data['taskDefinitionKey']}/ways`);
     }
 
+    /**
+     * GetWFLinks接口方法(根据当前步骤和任务获取批量操作路径)
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof EntityService
+     */   
+    public async getWFLinks(context: any = {},data: any = {}, isloading?: boolean):Promise<any>{
+        return Http.getInstance().get(`/wfcore/${this.SYSTEMNAME}-app-${this.APPNAME}/${this.APPDENAME}/process-definitions/${data['processDefinitionKey']}/usertasks/${data['userTaskId']}/ways`);
+    }
+
+    /**
+     * wfSubmitBatch接口方法(批量提交)
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof EntityService
+     */   
+    public async wfSubmitBatch(context: any = {},data: any = {},localdata:any,isloading?: boolean):Promise<any>{
+        return Http.getInstance().post(`/wfcore/${this.SYSTEMNAME}-app-${this.APPNAME}/${this.APPDENAME}/process-definitions/${localdata['processDefinitionKey']}/usertasks/${localdata['taskDefinitionKey']}/ways/${localdata['sequenceFlowId']}/submit`,data);
+    }
+
     /**
      * GetWFHistory接口方法(根据业务主键获取工作流程记录)
      *

src/styles/default.less

@@ -2,6 +2,7 @@
 @import '../theme/blue.theme.less';
 @import '../theme/dark-blue.theme.less';
 @import '../theme/default.theme.less';
+@import './app-code-list.less';
 @import './var.css';
 
 .ibiz-page-tag .tags-body .tags-container .ivu-tag.tag-is-active .ivu-tag-text {

src/template.html

@@ -12,8 +12,6 @@
       <strong>We're sorry but app doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
     </noscript>
     <div id="app"></div>
-    <!-- <link rel="stylesheet" href="<%= BASE_URL %>assets/styles/loader.css">
-    <div class="loader" id="app-loader"></div> -->
-    <!-- built files will be auto injected -->
+    <script src="./environments/environment.js"></script>
   </body>
 </html>

src/utils/studio-action/StudioActionUtil.ts

@@ -119,8 +119,12 @@ export class StudioActionUtil {
                 }, '*');
                 Vue.prototype.$message.warning('请在已打开的配置平台查看!');
             } else {
-                console.log(`${Environment.StudioUrl}?ov=${JSON.stringify(params)}#/common_slnindex/srfkeys=${Environment.SlnId}/sysdesign_psdevslnsysmodeltreeexpview/srfkey=${Environment.SysId}`);
-                this.studioWin = window.open(`${Environment.StudioUrl}?ov=${encodeURIComponent(JSON.stringify(params))}#/common_slnindex/srfkeys=${Environment.SlnId}/sysdesign_psdevslnsysmodeltreeexpview/srfkey=${Environment.SysId}`, '_blank');
+                if(Environment.debugOpenMode === 'sln'){
+                    console.log("打开sln未支持");
+                    // this.studioWin = window.open(`${Environment.StudioUrl}?ov=${encodeURIComponent(JSON.stringify(params))}#/common_slnindex/srfkeys=${Environment.SlnId}/sysdesign_psdevslnsysmodeltreeexpview/srfkey=${Environment.SysId}`, '_blank');
+                }else{
+                    this.studioWin = window.open(`${Environment.StudioUrl}?ov=${encodeURIComponent(JSON.stringify(params))}#/common_mosindex/srfkeys=${Environment.SysId}`, '_blank');
+                }
             }
         }
     }

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

@@ -252,9 +252,10 @@ export class ViewTool {
      * @memberof ViewTool
      */
     public static calcActionItemAuthState(data:any,ActionModel:any,UIService:any){
+        let result: any[] = [];
         for (const key in ActionModel) {
             if (!ActionModel.hasOwnProperty(key)) {
-                return;
+                return result;
             }
             const _item = ActionModel[key];
             if(_item && _item['dataaccaction'] && UIService){
@@ -282,7 +283,9 @@ export class ViewTool {
                     _item.visabled = true;
                     _item.disabled = false;
                 }
+                result.push(dataActionResult);
             }
         }
+        return result;
     } 
 }
\ No newline at end of file