diff --git a/build/Form/Form.js b/build/Form/Form.js
index e1ce10c..496fb52 100644
--- a/build/Form/Form.js
+++ b/build/Form/Form.js
@@ -52,6 +52,10 @@ angular.module("esNgAntd").directive("esForm", function (esNgAntd) {
link: function ($scope, $element, $attrs, $controllers, $transclude) {
esNgAntd.createStyle("ant-form", style);
+ if ($scope.form !== undefined) {
+ $scope.form = $scope;
+ }
+
if ($scope.name) {
let inputs = $element[0].querySelectorAll("input");
diff --git a/build/Pagination/Pagination.html b/build/Pagination/Pagination.html
index 21b29e5..de9752c 100644
--- a/build/Pagination/Pagination.html
+++ b/build/Pagination/Pagination.html
@@ -21,7 +21,7 @@
- {showSizeChanger === 'true' &&
+ {showSizeChanger === 'true' &&
10 条/页
20 条/页
50 条/页
diff --git a/src/Pagination/Pagination.js b/src/Pagination/Pagination.js
index 2231c9a..540fa93 100644
--- a/src/Pagination/Pagination.js
+++ b/src/Pagination/Pagination.js
@@ -26,6 +26,7 @@ class Pagination {
pageSize: null,
pageNum: null,
pageNumList: null,
+ defaultPageSize: this.props.defaultPageSize || 10
};
watch = {
diff --git a/webpack.config.js b/webpack.config.js
index ca2f468..8aeae93 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -6,13 +6,13 @@ module.exports = {
entry: "./build/index.js",
output: {
// bpms
- // path: "/Usersc/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