feat(Col): 新增offset属性

Imshann
1 parent 45883b16
Showing 12 changed files with 21 additions and 9 deletions Show diff stats
build/..js
build/BreadcrumbItem/BreadcrumbItem.html
build/BreadcrumbItem/BreadcrumbItem.js
build/Col/Col.html
build/Col/Col.js
build/Table/Table.html
src/BreadcrumbItem/BreadcrumbItem.html
src/BreadcrumbItem/BreadcrumbItem.js
src/Col/Col.html
src/Col/Col.js
src/Table/Table.html
webpack.config.js
 <span>
-    <span class="ant-breadcrumb-link" ng-transclude></span>
+    <span class="ant-breadcrumb-link">
+        <a ng-href="{{href}}" target="_self" ng-transclude></a>
+    </span>
     <span class="ant-breadcrumb-separator">/</span>
 </span>
 \ No newline at end of file
@@ -5,6 +5,9 @@ angular.module(&quot;esNgAntd&quot;).directive(&quot;antdBreadcrumbItem&quot;, function () {
         restrict: "E",
         transclude: true,
         replace: true,
+        scope: {
+            href: "@",
+        },
         template: template,
     };
 });
-<div ng-class="'ant-col'+(span?' ant-col-'+span:'')" ng-style="{paddingLeft:antdRow.state.gutterHalf+'px',paddingRight:antdRow.state.gutterHalf+'px'}" ng-transclude></div>
 \ No newline at end of file
+<div ng-class="'ant-col'+(span?' ant-col-'+span:'')+(offset?' ant-col-offset-'+offset:'')" ng-style="{paddingLeft:antdRow.state.gutterHalf+'px',paddingRight:antdRow.state.gutterHalf+'px'}" ng-transclude></div>
 \ No newline at end of file
@@ -11,6 +11,7 @@ angular.module(&quot;esNgAntd&quot;).directive(&quot;antdCol&quot;, function (esNgAntd) {
         replace: true,
         scope: {
             span: "@",
+            offset: "@",
         },
         template: template,
         controller: function ($scope, $element, $attrs) {
@@ -30,7 +30,7 @@
                     </tr>
                 </thead>
                 <tbody class="ant-table-tbody">
-                    <tr ng-repeat="(key, record) in state.dataSource track by record[state.rowKey]" class="ant-table-row">
+                    <tr ng-repeat="(key, record) in state.dataSource track by record[state.rowKey]+'-'+$index" class="ant-table-row">
                         <td ng-if="rowSelection" class="ant-table-selection-column">
                             <span>
                                 <antd-checkbox checked="{{record.checked}}" disabled="{{record.disabled}}" on-change="handleSelect(event,$index)" />
 <span>
-    <span className="ant-breadcrumb-link">{children}</span>
+    <span className="ant-breadcrumb-link">
+        <a ng-href={href} target="_self">{children}</a>
+    </span>
     <span className="ant-breadcrumb-separator">/</span>
 </span>
 \ No newline at end of file
 import template from "./BreadcrumbItem.html";
 class BreadcrumbItem {
+    props = {
+        href: String,
+    };
     template = template;
-}
 \ No newline at end of file
+}
-<div className={"ant-col"+(span?" ant-col-"+span: "")} style={{ paddingLeft: antdRow.state.gutterHalf + 'px', paddingRight: antdRow.state.gutterHalf + 'px' }}>{children}</div>
 \ No newline at end of file
+<div className={"ant-col"+(span?" ant-col-"+span: "")+(offset?" ant-col-offset-"+offset: "")} style={{ paddingLeft: antdRow.state.gutterHalf + 'px', paddingRight: antdRow.state.gutterHalf + 'px' }}>{children}</div>
 \ No newline at end of file
@@ -10,6 +10,7 @@ class Col {
     props = {
         span: String,
+        offset: String
     };
     state = {
@@ -34,7 +34,7 @@
                 </thead>
                 <tbody className="ant-table-tbody">
                     {state.dataSource.map(function (record, key) {
-                        return <tr className="ant-table-row" key="record[state.rowKey]">
+                        return <tr className="ant-table-row" key="record[state.rowKey]+'-'+$index">
                         {rowSelection && <td className="ant-table-selection-column">
                             <span>
                                 <antd-checkbox checked={record.checked} disabled={record.disabled}
@@ -6,13 +6,13 @@ module.exports = {
     entry: "./build/index.js",
     output: {
         // bpms
-        // path: "/Users/shann/Project/essa/bpms/bpms-webapp/src/main/webapp/lib/ng-antd",
+        path: "/Users/shann/Project/essa/bpms/bpms-webapp/src/main/webapp/lib/ng-antd",
         // boss
         // path: "/Users/shann/Project/essa/boss/trunk/vendor-lib/ng-antd",
         // mvo
         // path: "/Users/shann/Project/essa/mvo/mvo-webapp/public/browser-vendor/ng-antd",
         // local
-        path: path.resolve(__dirname, "dist"),
+        // path: path.resolve(__dirname, "dist"),
         filename: "ng-antd.js",
     },
     module: {