增加树形数据对话框选择

src/bootstrap-table.js

@@ -220,6 +220,48 @@
       base + 'mos-multiselect2.html'
     );
 
+    //MOSTreeSelect2
+    var mostreeselect2 = function(name, schema, options) {
+      if (schema.format === 'mos-treeselect2') {
+        var f = schemaFormProvider.stdFormObj(name, schema, options);
+        f.key  = options.path;
+        f.type = 'mos-treeselect2';
+        options.lookup[sfPathProvider.stringify(options.path)] = f;
+        return f;
+      }
+    };
+    schemaFormProvider.defaults.string.unshift(mostreeselect2);
+    schemaFormDecoratorsProvider.addMapping(
+      'bootstrapDecorator',
+      'mos-treeselect2',
+      base + 'mos-treeselect2.html'
+    );
+    schemaFormDecoratorsProvider.createDirective(
+      'mos-treeselect2',
+      base + 'mos-treeselect2.html'
+    );
+
+    //MOS-treeMultiselect2
+    var mostreemultiselect2 = function(name, schema, options) {
+      if (schema.format === 'mos-treemultiselect2') {
+        var f = schemaFormProvider.stdFormObj(name, schema, options);
+        f.key  = options.path;
+        f.type = 'mos-treemultiselect2';
+        options.lookup[sfPathProvider.stringify(options.path)] = f;
+        return f;
+      }
+    };
+    schemaFormProvider.defaults.string.unshift(mostreemultiselect2);
+    schemaFormDecoratorsProvider.addMapping(
+      'bootstrapDecorator',
+      'mos-treemultiselect2',
+      base + 'mos-treemultiselect2.html'
+    );
+    schemaFormDecoratorsProvider.createDirective(
+      'mos-treemultiselect2',
+      base + 'mos-treemultiselect2.html'
+    );
+
     var mostemplate = function(name, schema, options) {
       if (schema.format === 'mos-template') {
         var f = schemaFormProvider.stdFormObj(name, schema, options);
@@ -567,6 +609,8 @@
       'mos-commit-info' : base + 'mos-commit-info.html',//自定义提交资料
       'mos-select2' : base + 'mos-select2.html',//选择组件v2
       'mos-multiselect2' : base + 'mos-multiselect2.html',//多选组件v2
+      'mos-treeselect2' : base + 'mos-treeselect2.html',//选择树形组件v2
+      'mos-treemultiselect2' : base + 'mos-treemultiselect2.html',//多选树形组件v2
       'mos-template' : base + 'mos-template.html',//文本显示模板
       'uploadpic' : base + 'uploadpic.html',//上传组件
       'uploadpics' : base + 'uploadpics.html',//多文件上传组

src/cutuploadpics.html

@@ -3,7 +3,7 @@
   <div class="joininputcol" ng-class="form.fieldHtmlClass">
     <div class="upload-img-one" ng-repeat="pic in $$value$$ track by $index">
       <div ng-style="{'background':'url('+(pic|formatImgUrl:form.options.suffix)+') left top / 100% 100% no-repeat'}" class="uploadimgscls"></div>
-      <div class="glyphicon glyphicon-remove-sign file-del" ng-click="$$value$$.splice($index, 1)"></div>
+      <div class="icon-activities_icon_close file-del" ng-click="$$value$$.splice($index, 1)"></div>
     </div>
     <div class="uploadimgscontent"><div class="uploadimgsbuttom" ng-if="form.options.maxNum ? form.options.maxNum > $$value$$.length : true"
          class="upload-img-one upload-btn" file-button file-change="$$value$$.push(image)"

src/mos-treemultiselect2.html

@@ -0,0 +1,24 @@
+<div class="form-group {{form.htmlClass}} schema-form-treemultiselect"
+     ng-class="{'has-error': form.disableErrorState !== true && hasError(), 'has-success': form.disableSuccessState !== true && hasSuccess()}">
+  <label ng-if="!form.notitle" class="control-label {{form.labelHtmlClass}}" ng-class="{'schema-form-required': form.inputrequired === true}" ng-show="showTitle()">{{form.title}}<span ng-if="form.inputrequired === true" class="join-required"></span></label>
+  <div class="joininputcol ui-select-container ui-select-multiple select2 select2-container select2-container-multi" ng-href="" ng-click="form.openSelect()">
+    <div ng-if="form.addDataOption" class="input-group"><ul class="select2-choices">
+      <li class="select2-search-field" ng-if="!$$value$$ || $$value$$.length == 0"><input type="text"  class="select2-input ui-select-search ng-pristine" readonly="readonly" placeholder="{{form.placeholder}}"></li>
+			<li class="ui-select-match-item select2-search-choice" ng-repeat="item in $$value$$">
+			<div ng-bind-html="$$value$$[form.map.displayProp]"></div>
+      <small ng-if="form.map.moreitemname1" ng-bind="$$value$$[form.map.moreitemname1]" style="padding-right: 10px;" ng-bind="item.uoiId.shortName"></small>
+      <small ng-if="form.map.moreitemname2" ng-bind="$$value$$[form.map.moreitemname2]"></small></li>
+		</ul>
+    <span class="input-group-btn"><button class="btn" ng-class="form.addDataOption.class" type="button" ng-click="form.addDataOption.cb($event,form)"><span class="icon-activities_icon_add" style="padding-right:5px;" ng-if="!form.addDataOption.title"></span>{{form.addDataOption.title||'新增'}}</button></span>
+  </div>
+  <ul ng-if="!form.addDataOption" class="select2-choices">
+    <li class="select2-search-field" ng-if="!$$value$$ || $$value$$.length == 0"><input type="text"  class="select2-input ui-select-search ng-pristine" readonly="readonly" placeholder="{{form.placeholder}}"></li>
+			<li class="ui-select-match-item select2-search-choice" ng-repeat="item in $$value$$">
+			<div ng-bind-html="item[form.map.displayProp]"></div>
+      <small ng-if="form.map.moreitemname1" ng-bind="item[form.map.moreitemname1]" style="padding-right: 10px;" ng-bind="item.uoiId.shortName"></small>
+      <small ng-if="form.map.moreitemname2" ng-bind="item[form.map.moreitemname2]"></small></li>
+		</ul>
+  <div class="help-block" sf-message="form.description"></div>
+  </div>
+
+</div>

src/mos-treeselect2.html

@@ -0,0 +1,22 @@
+<div class="form-group {{form.htmlClass}} schema-form-treeselect"
+     ng-class="{'has-error': form.disableErrorState !== true && hasError(), 'has-success': form.disableSuccessState !== true && hasSuccess(), 'has-feedback': form.feedback !== false }">
+  <label ng-if="!form.notitle" class="control-label {{form.labelHtmlClass}}" ng-show="showTitle()" ng-class="{'schema-form-required': form.inputrequired === true}">{{form.title}}<span ng-if="form.inputrequired === true" class="join-required"></span></label>
+  <div class="joininputcol ui-select-container ui-select-bootstrap dropdown" ng-href="" ng-click="form.openSelect()"><div ng-if="form.addDataOption" class="input-group"><div class="ui-select-match" ng-class="form.fieldHtmlClass">
+    <span tabindex="-1" class="btn btn-default form-control ui-select-toggle" style="outline: 0;">
+      <span class="ui-select-match-text pull-left"><div ng-bind-html="($$value$$?$$value$$[form.map.displayProp]:'') || form.placeholder"></div>
+          <small ng-if="$$value$$ && form.map.moreitemname1" ng-bind="$$value$$[form.map.moreitemname1]" style="padding-right: 10px;" ng-bind="item.uoiId.shortName"></small>
+          <small ng-if="$$value$$ && form.map.moreitemname2" ng-bind="$$value$$[form.map.moreitemname2]"></small>
+      </span> 
+      <i class="caret pull-right"></i> 
+    </span>
+  </div>
+  <span class="input-group-btn"><button class="btn" ng-class="form.addDataOption.class" type="button" ng-click="form.addDataOption.cb($event,form)"><span class="icon-activities_icon_add" style="padding-right:5px;" ng-if="!form.addDataOption.title"></span>{{form.addDataOption.title||'新增'}}</button>
+  </span></div><div ng-if="!form.addDataOption" class="ui-select-match" ng-class="form.fieldHtmlClass">
+    <span tabindex="-1" class="btn btn-default form-control ui-select-toggle" style="outline: 0;">
+      <span class="ui-select-match-text pull-left"><span ng-bind-html="$$value$$[form.map.displayProp] || form.placeholder"></span></span> 
+      <i class="caret pull-right"></i> 
+    </span>
+  </div>
+    <div class="help-block" sf-message="form.description"></div>
+  </div>
+</div>

src/uploadfiles.html

@@ -8,7 +8,7 @@
     <span class="file-progress" ng-show="$files[$index][form.options.progressKey] >= 0">
         <div style="width:{{$files[$index][form.options.progressKey]}}%" ng-bind="$files[$index][form.options.progressKey] + '%'"></div>
     </span>
-    <div ng-show="f" class="glyphicon glyphicon-remove-sign file-del"
+    <div ng-show="f" class="icon-activities_icon_close file-del"
          ng-click="form.options.deleteFn($$value$$, f)"></div>
   </div>
   <a ng-if="form.options.maxNum ? form.options.maxNum > $$value$$.length : true" ngf-multiple="true" class="btn btn-success uploadfilesbuttom" ngf-select ngf-change="form.options.uploadPics($files, form.options, $$value$$)"