Merge branch 'dev'

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

@@ -9,6 +9,9 @@
           :disabled="disabled"
           :file-list="files"
           :action="uploadUrl"
+          :limit="multiple ? limit: 1"
+          :accept="accept"
+          :multiple="multiple"
           :headers="{}"
           :before-upload="beforeUpload"
           :before-remove="onRemove"
@@ -17,6 +20,7 @@
           :on-preview="onDownload"
           :drag="isdrag"
           :show-file-list="!rowPreview"
+          :on-exceed = "handleExceed"
           >
             <el-button v-if="!isdrag" size='small' icon='el-icon-upload' :disabled="disabled">{{this.$t('app.fileUpload.caption')}}</el-button>
           <i v-if="isdrag" class="el-icon-upload"></i>
@@ -173,6 +177,30 @@ export default class AppFileUpload extends Vue {
      */
     @Prop() public exportparams?: any;
 
+    /**
+     * 是否支持多个文件上传
+     *
+     * @type {string}
+     * @memberof AppFileUpload
+     */
+    @Prop({default: true}) public multiple!: boolean;
+
+    /**
+     * 最大允许上传个数
+     *
+     * @type {*}
+     * @memberof AppImageUpload
+     */
+    @Prop({default: 9999}) public limit!: number;
+
+    /**
+     * 接受上传的文件类型
+     *
+     * @type {*}
+     * @memberof AppImageUpload
+     */
+    @Prop({default: '*'}) public accept!: string;
+
     /**
      * 上传文件路径
      *
@@ -473,6 +501,14 @@ export default class AppFileUpload extends Vue {
      */
     public showActions: boolean = false;
 
+    /**
+     * 处理多选超出
+     *
+     * @memberof AppFileUpload
+     */
+    public handleExceed(files: any, fileList: any) {
+      this.$message.warning(`${this.$t('components.appFileUpload.limitselect')} ${this.limit}`);
+    }
 
 }
 </script>

src/components/app-icon-menus/app-icon-menus.vue

 <template>
   <div class="app-icon-menus">
     <template v-for="(item,index) in menus">
-      <div :bordered="false" v-if="item.items && Array.isArray(item.items)" :key="index" :class="item.textcls">
-        <p @click="$emit('menuClick',item.name, [item.name])">
-          <span>{{$t('app.menus.' + ctrlName + '.' + item.name)}}</span>
-          <span class="line"></span>
-        </p>
-        <p style=" display: 'flex' ">
-          <app-icon-menus :menus="item.items" :ctrlName = "ctrlName" @menuClick="menuClick"></app-icon-menus>
-        </p>
-      </div>
-      <el-card
-        :key="index"
-        shadow="never"
-        :class="item.textcls"
-        v-else
-      >
-        <div @click="menuClick(item.name,[item.name])" class="menuIcon" >
-          <span v-if="isIcon(item.icon,item.iconcls)">
-
-            <i :class="item.icon" v-if="!Object.is(item.icon, '')" />
-            <i :class="item.iconcls" v-else-if="!Object.is(item.iconcls, '')" />
-            <i class="fa fa-cogs" v-else></i>
-          </span>
-          <span v-else>
-            <img :src="item.icon" v-if="!Object.is(item.icon, '')" />
-            <img :src="item.iconcls" v-else-if="!Object.is(item.iconcls, '')" />
-            <i class="fa fa-cogs" v-else></i>
-          </span>
-          <h4>{{$t('app.menus.' + ctrlName + '.' + item.name)}}</h4>
+      <template v-if="!item.hidden">
+        <div :bordered="false" v-if="item.items && Array.isArray(item.items)" :key="index" :class="item.textcls">
+          <p @click="$emit('menuClick',item.name, [item.name])">
+            <span>{{$t('app.menus.' + ctrlName + '.' + item.name)}}</span>
+            <span class="line"></span>
+          </p>
+          <p style=" display: 'flex' ">
+            <app-icon-menus :menus="item.items" :ctrlName = "ctrlName" @menuClick="menuClick"></app-icon-menus>
+          </p>
         </div>
-      </el-card>
+        <el-card
+          :key="index"
+          shadow="never"
+          :class="item.textcls"
+          v-else
+        >
+          <div @click="menuClick(item.name,[item.name])" class="menuIcon" >
+            <span v-if="isIcon(item.icon,item.iconcls)">
+
+              <i :class="item.icon" v-if="!Object.is(item.icon, '')" />
+              <i :class="item.iconcls" v-else-if="!Object.is(item.iconcls, '')" />
+              <i class="fa fa-cogs" v-else></i>
+            </span>
+            <span v-else>
+              <img :src="item.icon" v-if="!Object.is(item.icon, '')" />
+              <img :src="item.iconcls" v-else-if="!Object.is(item.iconcls, '')" />
+              <i class="fa fa-cogs" v-else></i>
+            </span>
+            <h4>{{$t('app.menus.' + ctrlName + '.' + item.name)}}</h4>
+          </div>
+        </el-card>
+      </template>
     </template>
   </div>
 </template>

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

@@ -32,11 +32,14 @@
     <!-- 文件上传 -->
     <el-upload 
       v-if = "multiple || files.length === 0" 
+      :limit="multiple ? limit: 1"
       :class = "{'el-upload-disabled':disabled}"
       :disabled = "disabled"
       :action = "uploadUrl"
       :headers = "{ 'srfappdata': appData }"
       :show-file-list = "false"
+      :multiple="multiple"
+      :accept="accept"
       list-type =  "picture-card"
       :file-list =  "files"
       :before-upload = "beforeUpload"
@@ -44,6 +47,7 @@
       :before-remove = "onRemove"
       :on-error = "onError"
       :on-preview = "onDownload"
+      :on-exceed = "handleExceed"
       >
       <i class="el-icon-plus"></i>
     </el-upload>
@@ -180,6 +184,22 @@ export default class AppImageUpload extends Vue {
      */
     @Prop() public customparams?: any;
 
+    /**
+     * 最大允许上传个数
+     *
+     * @type {*}
+     * @memberof AppImageUpload
+     */
+    @Prop({default: 9999}) public limit!: number;
+
+    /**
+     * 接受上传的文件类型
+     *
+     * @type {*}
+     * @memberof AppImageUpload
+     */
+    @Prop({default: 'image/*'}) public accept!: string;
+
     /**
      * 上传文件路径
      *
@@ -472,6 +492,15 @@ export default class AppImageUpload extends Vue {
         this.dialogImageUrl = file.url;
         this.dialogVisible = true;
     }
+
+    /**
+     * 处理多选超出
+     *
+     * @memberof AppImageUpload
+     */
+    public handleExceed(files: any, fileList: any) {
+      this.$message.warning(`${this.$t('components.appImageUpload.limitselect')} ${this.limit}`);
+    }
 }
 </script>
 <style lang = "less">

src/locale/lanres/components/components_en_US_base.ts

@@ -68,6 +68,7 @@ function getLocaleResourceBase(){
         uploadText: 'Drag files here，or <em>Click</em> to upload',
         fileTypeErrorTitle: 'File type incorrect',
         fileTypeErrorInfo: 'Please select files with picture types，such as JPEG，GIF，PNG，BMP',
+        limitselect: 'The current number of restricted choices is ',
       },
       appFormDRUIPart: {
         blockUITipInfo: 'Please save the major data first',
@@ -208,7 +209,8 @@ function getLocaleResourceBase(){
         groupSelect:'Group selection', 
       },
       appImageUpload:{
-        uploadFail:'Upload failed'
+        uploadFail:'Upload failed',
+        limitselect: 'The current number of restricted choices is ',
       },
       appOrgSelect:{
         loadFail:'Failed to load data'

src/locale/lanres/components/components_zh_CN_base.ts

@@ -69,6 +69,7 @@ function getLocaleResourceBase(){
         uploadError: '上传失败',
         fileTypeErrorTitle: '文件类型错误',
         fileTypeErrorInfo: '请选择图片类型的文件，如JPEG，GIF，PNG，BMP',
+        limitselect: '当前限制选择数量为 ',
       },
       appFormDRUIPart: {
         blockUITipInfo: '请先保存主数据',
@@ -209,7 +210,8 @@ function getLocaleResourceBase(){
         groupSelect:'分组选择', 
       },
       appImageUpload:{
-        uploadFail:'上传失败'
+        uploadFail:'上传失败',
+        limitselect: '当前限制选择数量为 ',
       },
       appOrgSelect:{
         loadFail:'加载数据失败'

src/styles/default.less

@@ -278,6 +278,10 @@
 .start-workflow-select-wraper {
     z-index: 3000 !important;
 }
+// tooltip最大宽度1166px
+.el-tooltip__popper.is-dark{
+  max-width: 1166px;
+}
 
 /***    END:多数据视图属性布局    ***/