From d6436262cba5ffa5fafe3d7c215f2ca938133ff2 Mon Sep 17 00:00:00 2001
From: Imshann <851188611@qq.com>
Date: Thu, 10 Feb 2022 10:12:57 +0800
Subject: [PATCH] feat(Col): 新增offset属性

---
 build/..js                               | 0
 build/BreadcrumbItem/BreadcrumbItem.html | 4 +++-
 build/BreadcrumbItem/BreadcrumbItem.js   | 3 +++
 build/Col/Col.html                       | 2 +-
 build/Col/Col.js                         | 1 +
 build/Table/Table.html                   | 2 +-
 src/BreadcrumbItem/BreadcrumbItem.html   | 4 +++-
 src/BreadcrumbItem/BreadcrumbItem.js     | 5 ++++-
 src/Col/Col.html                         | 2 +-
 src/Col/Col.js                           | 1 +
 src/Table/Table.html                     | 2 +-
 webpack.config.js                        | 4 ++--
 12 files changed, 21 insertions(+), 9 deletions(-)
 delete mode 100644 build/..js

diff --git a/build/..js b/build/..js
deleted file mode 100644
index e69de29..0000000
--- a/build/..js
+++ /dev/null
diff --git a/build/BreadcrumbItem/BreadcrumbItem.html b/build/BreadcrumbItem/BreadcrumbItem.html
index bf81b23..6ad3d21 100644
--- a/build/BreadcrumbItem/BreadcrumbItem.html
+++ b/build/BreadcrumbItem/BreadcrumbItem.html
@@ -1,4 +1,6 @@
 <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
diff --git a/build/BreadcrumbItem/BreadcrumbItem.js b/build/BreadcrumbItem/BreadcrumbItem.js
index 726ebd4..8f78e20 100644
--- a/build/BreadcrumbItem/BreadcrumbItem.js
+++ b/build/BreadcrumbItem/BreadcrumbItem.js
@@ -5,6 +5,9 @@ angular.module("esNgAntd").directive("antdBreadcrumbItem", function () {
         restrict: "E",
         transclude: true,
         replace: true,
+        scope: {
+            href: "@",
+        },
         template: template,
     };
 });
diff --git a/build/Col/Col.html b/build/Col/Col.html
index 0d6641f..a447d00 100644
--- a/build/Col/Col.html
+++ b/build/Col/Col.html
@@ -1 +1 @@
-<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
diff --git a/build/Col/Col.js b/build/Col/Col.js
index db6e16d..8e13ecc 100644
--- a/build/Col/Col.js
+++ b/build/Col/Col.js
@@ -11,6 +11,7 @@ angular.module("esNgAntd").directive("antdCol", function (esNgAntd) {
         replace: true,
         scope: {
             span: "@",
+            offset: "@",
         },
         template: template,
         controller: function ($scope, $element, $attrs) {
diff --git a/build/Table/Table.html b/build/Table/Table.html
index 0a698a0..be9b161 100644
--- a/build/Table/Table.html
+++ b/build/Table/Table.html
@@ -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)" />
diff --git a/src/BreadcrumbItem/BreadcrumbItem.html b/src/BreadcrumbItem/BreadcrumbItem.html
index c0f5481..121b465 100644
--- a/src/BreadcrumbItem/BreadcrumbItem.html
+++ b/src/BreadcrumbItem/BreadcrumbItem.html
@@ -1,4 +1,6 @@
 <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
diff --git a/src/BreadcrumbItem/BreadcrumbItem.js b/src/BreadcrumbItem/BreadcrumbItem.js
index 686d752..5e520d9 100644
--- a/src/BreadcrumbItem/BreadcrumbItem.js
+++ b/src/BreadcrumbItem/BreadcrumbItem.js
@@ -1,5 +1,8 @@
 import template from "./BreadcrumbItem.html";
 
 class BreadcrumbItem {
+    props = {
+        href: String,
+    };
     template = template;
-}
\ No newline at end of file
+}
diff --git a/src/Col/Col.html b/src/Col/Col.html
index 44a948e..6237616 100644
--- a/src/Col/Col.html
+++ b/src/Col/Col.html
@@ -1 +1 @@
-<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
diff --git a/src/Col/Col.js b/src/Col/Col.js
index 02058f7..b4dca69 100644
--- a/src/Col/Col.js
+++ b/src/Col/Col.js
@@ -10,6 +10,7 @@ class Col {
 
     props = {
         span: String,
+        offset: String
     };
 
     state = {
diff --git a/src/Table/Table.html b/src/Table/Table.html
index acf1182..fdca6ea 100644
--- a/src/Table/Table.html
+++ b/src/Table/Table.html
@@ -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}
diff --git a/webpack.config.js b/webpack.config.js
index 075a231..8aeae93 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -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: {
--
libgit2 0.21.2