uploadFile

bower.json

@@ -1,7 +1,7 @@
 {
-  "name": "join-admin",
-  "version": "1.0.13",
-  "description": "join admin project",
+  "name": "angular-schema-form-table",
+  "version": "1.0.14",
+  "description": "table add-on for schema form",
   "main": "app.js",
   "keywords": [
     "mos"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-schema-form-table",
-  "version": "1.0.13",
+  "version": "1.0.14",
   "description": "table add-on for schema form",
   "scripts": {
     "test": "rm -fr coverage && ./node_modules/karma/bin/karma start --single-run --browsers PhantomJS karma.conf.js"

src/uploadfile.html

@@ -2,19 +2,20 @@
      ng-init="form.options.resultKey='url' ; form.options.progressKey='progress' ; form.options.errorMsgKey='errorMsg'" ng-class="{'has-error': form.disableErrorState !== true && hasError(), 'has-success': form.disableSuccessState !== true && hasSuccess(), 'has-feedback': form.feedback !== false }">
   <label class="control-label {{form.labelHtmlClass}}" ng-class="{'sr-only': !showTitle(), 'schema-form-required': form.inputrequired === true}" for="{{form.key.slice(-1)[0]}}">{{form.title}}<span ng-if="form.inputrequired === true" class="join-required"></span></label>
   <div class="joininputcol" ng-class="form.fieldHtmlClass">
-  <div class="uploadfilebody"><a class="uploadfilecls" ng-if="form.options.showThumb" href="{{$$value$$}}" target="_blank">{{$$value$$.substring($$value$$.lastIndexOf('/')+1)}}</a>
+  <div class="uploadfilebody">
   <a class="btn btn-success uploadfilebuttom" ngf-select ngf-change="form.options.uploadPic($file, form.options, arrayIndex)"
           ngf-fix-orientation="true" ngf-validate="form.options.uploadvalidate?form.options.uploadvalidate:{size: {max: '20MB', min: '10B'}}" ng-class="form.class" tabindex="-1">
-    <span ng-if="!$file[form.options.resultKey]">上传文件</span>
+    <span ng-if="!$file[form.options.resultKey]" ng-bind="$$value$$ ? '重新上传':'上传文件'"></span>
     <span class="file-progress" ng-if="!$file[form.options.resultKey]"
           ng-show="$file[form.options.progressKey] >= 0">
       <span style="width:{{$file[form.options.progressKey]}}%"
             ng-bind="$file[form.options.progressKey] + '%'"> </span>
     </span>
     <span ng-show="$file[form.options.resultKey]">上传成功</span>
-  </a>
+  </a> <span class="uploadfilecls" ng-if="form.options.showThumb && form.options.fileName"> 已上传： {{form.options.fileName}}</span>
   <br ng-if="form.options.suggestBottom" />
-  <span class="uploadfilelabel" ng-if="form.options.suggestlabel" ng-style="{'padding-left': (form.options.suggestBottom? '0px' : '10px')}" ng-bind="form.options.suggestlabel"></span></div>
+  <span class="uploadfilelabel" ng-if="form.options.suggestlabel" ng-style="{'padding-left': (form.options.suggestBottom? '0px' : '10px')}" ng-bind="form.options.suggestlabel"></span>
+  </div>
   <span ng-if="$file[form.options.errorMsgKey]" class="sr-only">错误: {{$file[form.options.errorMsgKey]}}</span>
   <div class="help-block" sf-message="form.description"></div></div>
 </div>