From 5eeb16ede45298b3ec531af01122d7c3e4a7ecfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=80=AA=E4=BF=8A=E6=9D=B0?= <1006312908@qq.com>
Date: Fri, 11 May 2018 19:32:20 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E8=AE=A9=E4=B8=8A=E4=BC=A0=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E5=9C=A8=E6=B2=A1=E6=9C=89=E5=BE=97=E5=88=B0url?=
 =?UTF-8?q?=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B=EF=BC=8C=E4=B8=8D=E5=85=81?=
 =?UTF-8?q?=E8=AE=B8=E6=94=BE=E5=A4=A7=E9=A2=84=E8=A7=88=E5=92=8C=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../JRUpload/components/FileUnit/index.html     |  4 ++--
 .../form/JRUpload/components/FileUnit/index.js  | 17 ++++++++++-------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/js/components/form/JRUpload/components/FileUnit/index.html b/src/js/components/form/JRUpload/components/FileUnit/index.html
index 31837d35..3ddb7fb0 100644
--- a/src/js/components/form/JRUpload/components/FileUnit/index.html
+++ b/src/js/components/form/JRUpload/components/FileUnit/index.html
@@ -1,7 +1,7 @@
 <div class="m-file-unit">
     <div class="m-content">
         {#if type === 'image'}
-            <div class="m-img-wrapper" on-click={this.onPreview()}>
+            <div class="m-img-wrapper" on-click={this.onPreview()} r-style={ {cursor: url?'zoom-in':'auto'} }>
                 <img class="u-img" src={url}/>
             </div>
         {#elseif type === 'unknown'}
@@ -24,7 +24,7 @@
                         </span>
                     </span>
                 </span>
-            {#elseif status === 'success'}
+            {#elseif status === 'success' && url}
                 <span class="u-uploaded">
                     <a class="u-uploaded-zone" href={url} download={filename}>{this.$trans('DOWNLOAD_FILE')}<i class="u-icon u-icon-export"></i></a>
                 </span>
diff --git a/src/js/components/form/JRUpload/components/FileUnit/index.js b/src/js/components/form/JRUpload/components/FileUnit/index.js
index 08e292c9..4788b892 100644
--- a/src/js/components/form/JRUpload/components/FileUnit/index.js
+++ b/src/js/components/form/JRUpload/components/FileUnit/index.js
@@ -170,13 +170,16 @@ const FileUnit = Component.extend({
 
   onPreview(e) {
     const data = this.data;
-    const emitItem = {
-      sender: this,
-      event: e,
-      file: data.file,
-      status: data.status,
-    };
-    this.$emit('preview', emitItem);
+    // 如果url不存在，则不允许预览
+    if (data.url) {
+      var emitItem = {
+        sender: this,
+        event: e,
+        file: data.file,
+        status: data.status
+      };
+      this.$emit('preview', emitItem);
+    }
   },
 });
 

From 04795342d34b85513c4e96334c8e0fe42b1c8f6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=80=AA=E4=BF=8A=E6=9D=B0?= <1006312908@qq.com>
Date: Mon, 14 May 2018 14:01:28 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=8A=A0deleteOnly=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../form/JRUpload/components/FileUnit/index.html       | 10 +++++++---
 .../form/JRUpload/components/FileUnit/index.js         |  5 +++--
 src/js/components/form/JRUpload/index.md               |  2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/js/components/form/JRUpload/components/FileUnit/index.html b/src/js/components/form/JRUpload/components/FileUnit/index.html
index 3ddb7fb0..91da24e5 100644
--- a/src/js/components/form/JRUpload/components/FileUnit/index.html
+++ b/src/js/components/form/JRUpload/components/FileUnit/index.html
@@ -1,7 +1,11 @@
 <div class="m-file-unit">
     <div class="m-content">
-        {#if type === 'image'}
-            <div class="m-img-wrapper" on-click={this.onPreview()} r-style={ {cursor: url?'zoom-in':'auto'} }>
+        {#if type === 'image' && url && !deleteOnly)}
+            <div class="m-img-wrapper" on-click={this.onPreview()}>
+                <img class="u-img" src={url}/>
+            </div>
+        {#elseif type === 'image' && (!url || deleteOnly)}
+            <div class="m-img-wrapper" style="cursor: auto">
                 <img class="u-img" src={url}/>
             </div>
         {#elseif type === 'unknown'}
@@ -24,7 +28,7 @@
                         </span>
                     </span>
                 </span>
-            {#elseif status === 'success' && url}
+            {#elseif status === 'success' && url && !deleteOnly}
                 <span class="u-uploaded">
                     <a class="u-uploaded-zone" href={url} download={filename}>{this.$trans('DOWNLOAD_FILE')}<i class="u-icon u-icon-export"></i></a>
                 </span>
diff --git a/src/js/components/form/JRUpload/components/FileUnit/index.js b/src/js/components/form/JRUpload/components/FileUnit/index.js
index 4788b892..edfb937a 100644
--- a/src/js/components/form/JRUpload/components/FileUnit/index.js
+++ b/src/js/components/form/JRUpload/components/FileUnit/index.js
@@ -19,6 +19,7 @@ const FileUnit = Component.extend({
       name: '',
       readonly: false,
       data: {},
+      deleteOnly: false,
     });
 
     _.extend(data, {
@@ -172,11 +173,11 @@ const FileUnit = Component.extend({
     const data = this.data;
     // 如果url不存在，则不允许预览
     if (data.url) {
-      var emitItem = {
+      const emitItem = {
         sender: this,
         event: e,
         file: data.file,
-        status: data.status
+        status: data.status,
       };
       this.$emit('preview', emitItem);
     }
diff --git a/src/js/components/form/JRUpload/index.md b/src/js/components/form/JRUpload/index.md
index 34b58a4c..fb562584 100644
--- a/src/js/components/form/JRUpload/index.md
+++ b/src/js/components/form/JRUpload/index.md
@@ -98,7 +98,7 @@ var component = new JRUI.Component({
 <div class="m-example"></div>
 
 ```xml
-<jr-upload action='https://nos.kaolafed.com/upload' num-max={2}></jr-upload>
+<jr-upload deleteOnly={true} action='https://nos.kaolafed.com/upload' num-max={1}></jr-upload>
 ```
 <!-- demo_end -->
 

From b776db94208ed2da1495fb9cf969e58aae59090d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=80=AA=E4=BF=8A=E6=9D=B0?= <1006312908@qq.com>
Date: Mon, 14 May 2018 14:24:48 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=85=88=E6=81=A2=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../form/JRUpload/components/FileUnit/index.html       | 10 +++-------
 .../form/JRUpload/components/FileUnit/index.js         |  1 -
 src/js/components/form/JRUpload/index.md               |  2 +-
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/js/components/form/JRUpload/components/FileUnit/index.html b/src/js/components/form/JRUpload/components/FileUnit/index.html
index 91da24e5..3ddb7fb0 100644
--- a/src/js/components/form/JRUpload/components/FileUnit/index.html
+++ b/src/js/components/form/JRUpload/components/FileUnit/index.html
@@ -1,11 +1,7 @@
 <div class="m-file-unit">
     <div class="m-content">
-        {#if type === 'image' && url && !deleteOnly)}
-            <div class="m-img-wrapper" on-click={this.onPreview()}>
-                <img class="u-img" src={url}/>
-            </div>
-        {#elseif type === 'image' && (!url || deleteOnly)}
-            <div class="m-img-wrapper" style="cursor: auto">
+        {#if type === 'image'}
+            <div class="m-img-wrapper" on-click={this.onPreview()} r-style={ {cursor: url?'zoom-in':'auto'} }>
                 <img class="u-img" src={url}/>
             </div>
         {#elseif type === 'unknown'}
@@ -28,7 +24,7 @@
                         </span>
                     </span>
                 </span>
-            {#elseif status === 'success' && url && !deleteOnly}
+            {#elseif status === 'success' && url}
                 <span class="u-uploaded">
                     <a class="u-uploaded-zone" href={url} download={filename}>{this.$trans('DOWNLOAD_FILE')}<i class="u-icon u-icon-export"></i></a>
                 </span>
diff --git a/src/js/components/form/JRUpload/components/FileUnit/index.js b/src/js/components/form/JRUpload/components/FileUnit/index.js
index edfb937a..04eee7b9 100644
--- a/src/js/components/form/JRUpload/components/FileUnit/index.js
+++ b/src/js/components/form/JRUpload/components/FileUnit/index.js
@@ -19,7 +19,6 @@ const FileUnit = Component.extend({
       name: '',
       readonly: false,
       data: {},
-      deleteOnly: false,
     });
 
     _.extend(data, {
diff --git a/src/js/components/form/JRUpload/index.md b/src/js/components/form/JRUpload/index.md
index fb562584..1c6f129f 100644
--- a/src/js/components/form/JRUpload/index.md
+++ b/src/js/components/form/JRUpload/index.md
@@ -98,7 +98,7 @@ var component = new JRUI.Component({
 <div class="m-example"></div>
 
 ```xml
-<jr-upload deleteOnly={true} action='https://nos.kaolafed.com/upload' num-max={1}></jr-upload>
+<jr-upload action='https://nos.kaolafed.com/upload' num-max={1}></jr-upload>
 ```
 <!-- demo_end -->
 

From 355ecd5033647ddf28223fdf587abddfe2016ab5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=80=AA=E4=BF=8A=E6=9D=B0?= <1006312908@qq.com>
Date: Tue, 15 May 2018 14:51:41 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E5=8A=A0closeonly=E5=8F=82=E6=95=B0=EF=BC=8C=E5=8F=AF=E9=80=89?=
 =?UTF-8?q?=EF=BC=8C=E6=98=AF=E5=90=A6=E4=B8=8D=E5=85=81=E8=AE=B8=E6=94=BE?=
 =?UTF-8?q?=E5=A4=A7=E9=A2=84=E8=A7=88=E5=92=8C=E4=B8=8B=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../form/JRUpload/components/FileUnit/index.html         | 4 ++--
 .../form/JRUpload/components/FileUnit/index.js           | 5 +++--
 .../form/JRUpload/components/UploadBase/index.js         | 5 ++++-
 .../form/JRUpload/components/UploadCard/index.html       | 1 +
 .../form/JRUpload/components/UploadList/index.html       | 1 +
 src/js/components/form/JRUpload/index.html               | 1 +
 src/js/components/form/JRUpload/index.js                 | 2 ++
 src/js/components/form/JRUpload/index.md                 | 9 +++++++++
 8 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/js/components/form/JRUpload/components/FileUnit/index.html b/src/js/components/form/JRUpload/components/FileUnit/index.html
index 3ddb7fb0..72648e80 100644
--- a/src/js/components/form/JRUpload/components/FileUnit/index.html
+++ b/src/js/components/form/JRUpload/components/FileUnit/index.html
@@ -1,7 +1,7 @@
 <div class="m-file-unit">
     <div class="m-content">
         {#if type === 'image'}
-            <div class="m-img-wrapper" on-click={this.onPreview()} r-style={ {cursor: url?'zoom-in':'auto'} }>
+            <div class="m-img-wrapper" on-click={this.onPreview()} r-style={ {cursor: url && !closeonly? 'zoom-in' : 'auto'} }>
                 <img class="u-img" src={url}/>
             </div>
         {#elseif type === 'unknown'}
@@ -24,7 +24,7 @@
                         </span>
                     </span>
                 </span>
-            {#elseif status === 'success' && url}
+            {#elseif status === 'success' && url && !closeonly}
                 <span class="u-uploaded">
                     <a class="u-uploaded-zone" href={url} download={filename}>{this.$trans('DOWNLOAD_FILE')}<i class="u-icon u-icon-export"></i></a>
                 </span>
diff --git a/src/js/components/form/JRUpload/components/FileUnit/index.js b/src/js/components/form/JRUpload/components/FileUnit/index.js
index 04eee7b9..f9089576 100644
--- a/src/js/components/form/JRUpload/components/FileUnit/index.js
+++ b/src/js/components/form/JRUpload/components/FileUnit/index.js
@@ -19,6 +19,7 @@ const FileUnit = Component.extend({
       name: '',
       readonly: false,
       data: {},
+      closeonly: false,
     });
 
     _.extend(data, {
@@ -170,8 +171,8 @@ const FileUnit = Component.extend({
 
   onPreview(e) {
     const data = this.data;
-    // 如果url不存在，则不允许预览
-    if (data.url) {
+    // 如果url不存在，或closeonly为true，则不允许预览
+    if (data.url && !data.closeonly) {
       const emitItem = {
         sender: this,
         event: e,
diff --git a/src/js/components/form/JRUpload/components/UploadBase/index.js b/src/js/components/form/JRUpload/components/UploadBase/index.js
index 55e1d017..ed93d49b 100644
--- a/src/js/components/form/JRUpload/components/UploadBase/index.js
+++ b/src/js/components/form/JRUpload/components/UploadBase/index.js
@@ -36,6 +36,7 @@ const JRImagePreview = require('../../../../widget/JRImagePreview');
  * @param {number}     [options.data.max-size]       => 可选，上传文件大小的最大允许值, 支持数值大小以及KB,MB,GB为单元的指定
  * @param {boolean}    [options.data.readonly]       => 可选，是否开启预览模式，可选值true/false，true预览模式，只能预览和下载图片，
  *                                                       默认false，允许上传和删除图片
+ * @param {boolean}    [options.data.closeonly=false]       => 可选，是否不允许放大预览和下载
  * @param {number}     [options.data.image-width]    => 可选，指定上传图片文件的宽度, 值为数值，单位为px，如800
  * @param {number}     [options.data.image-height]   => 可选，指定上传图片文件的高度, 值为数值，单位为px, 如600
  * @param {string}     [options.data.image-scale]    => 可选，指定上传图片文件的宽高比, 值为冒号分隔的宽高比例字符串，如'4:3'
@@ -61,6 +62,7 @@ const UploadBase = Component.extend({
       numPerline: Infinity,
       maxSize: Config.sizeMap.GB,
       readonly: false,
+      closeonly: false,
       imageWidth: Infinity,
       imageHeight: Infinity,
       imageScale: '',
@@ -444,6 +446,7 @@ const UploadBase = Component.extend({
       url: opts.action,
       name: opts.name,
       readonly: opts.readonly,
+      closeonly: opts.closeonly,
       data: opts.data,
     };
   },
@@ -588,4 +591,4 @@ const UploadBase = Component.extend({
 })
   .component('file-unit', FileUnit);
 
-module.exports = UploadBase;
\ No newline at end of file
+module.exports = UploadBase;
diff --git a/src/js/components/form/JRUpload/components/UploadCard/index.html b/src/js/components/form/JRUpload/components/UploadCard/index.html
index d34d1649..10484933 100644
--- a/src/js/components/form/JRUpload/components/UploadCard/index.html
+++ b/src/js/components/form/JRUpload/components/UploadCard/index.html
@@ -43,6 +43,7 @@
                                 name={name}
                                 status={fileunit.status}
                                 readonly={readonly}
+                                closeonly={closeonly}
                                 data={data}
                                 onLoadInterceptor={onLoadInterceptor}
                                 onErrorInterceptor={onErrorInterceptor}
diff --git a/src/js/components/form/JRUpload/components/UploadList/index.html b/src/js/components/form/JRUpload/components/UploadList/index.html
index ea691a35..aa195610 100644
--- a/src/js/components/form/JRUpload/components/UploadList/index.html
+++ b/src/js/components/form/JRUpload/components/UploadList/index.html
@@ -15,6 +15,7 @@
                       name={name}
                       status={fileunit.status}
                       readonly={readonly}
+                      closeonly={closeonly}
                       data={data}
                       autoUpload={autoUpload}
                       onLoadInterceptor={onLoadInterceptor}
diff --git a/src/js/components/form/JRUpload/index.html b/src/js/components/form/JRUpload/index.html
index 7d09d9ec..8f955365 100644
--- a/src/js/components/form/JRUpload/index.html
+++ b/src/js/components/form/JRUpload/index.html
@@ -14,6 +14,7 @@
             numPerline={numPerline}
             maxSize={maxSize}
             readonly={readonly}
+            closeonly={closeonly}
             imageWidth={imageWidth}
             imageHeight={imageHeight}
             imageScale={imageScale}
diff --git a/src/js/components/form/JRUpload/index.js b/src/js/components/form/JRUpload/index.js
index 075cff64..80c261ee 100644
--- a/src/js/components/form/JRUpload/index.js
+++ b/src/js/components/form/JRUpload/index.js
@@ -34,6 +34,7 @@ const tpl = require('./index.html');
  * @param {string}     [options.data.max-size=1GB]         => 可选，上传文件大小的最大允许值, 支持数值大小以及KB,MB,GB为单元的指定
  * @param {boolean}    [options.data.readonly=false]       => 可选，是否开启预览模式，可选值true/false，true预览模式，只能预览和下载图片，
  *                                                             默认false，允许上传和删除图片
+ * @param {boolean}    [options.data.closeonly=false]       => 可选，是否不允许放大预览和下载
  * @param {boolean}    [options.data.hideTip=false]        => 是否显示校验错误信息，默认false显示
  * @param {number}     [options.data.image-width]          => 可选，指定上传图片文件的宽度, 值为数值，单位为px，如800
  * @param {number}     [options.data.image-height]         => 可选，指定上传图片文件的高度, 值为数值，单位为px, 如600
@@ -69,6 +70,7 @@ const JRUpload = Component.extend({
       numPerline: Infinity,
       maxSize: Config.sizeMap.GB,
       readonly: false,
+      closeonly: false,
       hideTip: false,
       imageWidth: Infinity,
       imageHeight: Infinity,
diff --git a/src/js/components/form/JRUpload/index.md b/src/js/components/form/JRUpload/index.md
index 1c6f129f..7b1f07e9 100644
--- a/src/js/components/form/JRUpload/index.md
+++ b/src/js/components/form/JRUpload/index.md
@@ -102,6 +102,15 @@ var component = new JRUI.Component({
 ```
 <!-- demo_end -->
 
+<!-- demo_start -->
+### 文件上传后不提供放大和下载功能
+<div class="m-example"></div>
+
+```xml
+<jr-upload closeonly={true} action='https://nos.kaolafed.com/upload' num-max={2}></jr-upload>
+```
+<!-- demo_end -->
+
 <!-- demo_start -->
 ### 行布局
 <div class="m-example"></div>