Merge pull request #63 from ffan-fe/dev

small fix
ffan-fe · May 18, 2017 · 95c98df · 95c98df
2 parents 116c256 + 0ef2a35
commit 95c98df
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 588 deletions.
diff --git a/example/app/components/omniTable/OmniTable.controller.js b/example/app/components/omniTable/OmniTable.controller.js
@@ -58,6 +58,20 @@ export default class OmniTableController extends Base {
                      class="f-input f-input-lg">`*/
       },
       {
+        label: '门店名称',
+        type: 'select',
+        name: 'storeName',
+        options: [{
+          text: 'qqqqq',
+          value: '11111'
+        }]
+        /*tpl: `<input type="text"
+                     placeholder="{{field.placeholder}}"
+                     ng-model="vm.query[field.name]"
+                     class="f-input f-input-lg">`*/
+      },
+      {
+        type: 'text',
         label: '商户名称',
         name: 'merchantName'
       },
@@ -72,10 +86,14 @@ export default class OmniTableController extends Base {
         name: 'plazaName'
       },
       {
+        type: 'text',
+
         label: '门店名称1',
         name: 'storeName1'
       },
       {
+        type: 'text',
+
         label: '商户名称1',
         name: 'merchantName1'
       },

diff --git a/lib/Directive/bpFieldError.js b/lib/Directive/bpFieldError.js
diff --git a/lib/Directive/bpLargeThan.js b/lib/Directive/bpLargeThan.js
diff --git a/lib/Directive/index.js b/lib/Directive/index.js
@@ -1,41 +1,12 @@
 import dateModelFormat from './dateModelFormat.js'
 import dateViewFormat from './dateViewFormat.js'
-import BpFieldError from './bpFieldError.js'
-import BpLargeThan from './bpLargeThan.js'
 import fEnter from './f-enter.js'
 import fBindHtml from './f-bind-html.js'
 
 let bpDirectives = angular.module('bp.directives', [])
   .directive('dateModelFormat', ()=>dateModelFormat)
   .directive('dateViewFormat', ()=>dateViewFormat)
-  .directive('bpFieldError', ($compile) => {
-    'ngInject'
-    return new BpFieldError($compile);
-  })
-  .directive('bpLargeThan', () => new BpLargeThan())
   .directive('fEnter', () => fEnter)
   .directive('fBindHtml', () => fBindHtml)
-  .filter('error', function (Errors) {
-    return function (name, customMessages) {
-      if (customMessages) {
-        customMessages = JSON.parse(customMessages);
-      }
-
-      let errors = angular.extend({}, Errors, customMessages);
-      console.info('extended errors', errors);
-
-      return errors[name] || name;
-    };
-  })
-  .constant('Errors', {
-    email: '不是有效格式的邮件地址',
-    url: '不是有效格式的url',
-    required: '此项不能为空',
-    same: '此项必须与密码相同',
-    max: '超过上限',
-    min: '低于下限',
-    number: '必须为数字',
-    parse: '根据验证规则，已重置无效值'
-  });
 
 export default bpDirectives;
diff --git a/lib/OmniTable/OmniTable.html b/lib/OmniTable/OmniTable.html
@@ -2,7 +2,7 @@
   <form class="f-form f-form-horizontal f-advanced-search-form" ng-if="vm.search">
     <div class="f-row" style="margin-left: -20px; margin-right: -20px;">
       <div ng-repeat="field in vm.viewSearch" class="f-col-8" style="padding-left: 20px; padding-right: 20px;">
-        <div class="f-row f-form-item">
+        <div class="f-row f-form-item" ng-if="field.type == 'text'">
           <div class="f-col-5 f-form-item-label"><label class="">{{field.label}}</label></div>
           <div class="f-col-19 f-form-item-control-wrapper">
             <div class="f-form-item-control has-success">
@@ -13,6 +13,17 @@
             </div>
           </div>
         </div>
+        <div class="f-row f-form-item" ng-if="field.type == 'select'">
+          <div class="f-col-5 f-form-item-label"><label class="">{{field.label}}</label></div>
+          <div class="f-col-19 f-form-item-control-wrapper">
+            <div class="f-form-item-control has-success">
+              <select class="f-input f-input-lg"
+                      ng-options="option.value as option.text for option in field.options"
+                      ng-model="vm.query[field.name]">
+              </select>
+            </div>
+          </div>
+        </div>
       </div>
     </div>
     <div class="f-row">