From 4b23b387145b66a2f7561985ef5ca50600fbe67e Mon Sep 17 00:00:00 2001
From: Imshann <851188611@qq.com>
Date: Wed, 19 Jan 2022 16:09:41 +0800
Subject: [PATCH] feat(pagination): 优化组件

---
 build/Form/Form.js               | 4 ++++
 build/Pagination/Pagination.html | 2 +-
 build/Pagination/Pagination.js   | 1 +
 src/Form/Form.js                 | 4 ++++
 src/Pagination/Pagination.html   | 2 +-
 src/Pagination/Pagination.js     | 1 +
 webpack.config.js                | 4 ++--
 7 files changed, 14 insertions(+), 4 deletions(-)

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 @@
         </button>
     </li>
     <li class="ant-pagination-options">
-        <es-select ng-if="showSizeChanger==='true'" class="ant-pagination-options-size-changer" size="{{size}}" value="{{defaultPageSize}}" get-popup-container="getPopupContainer" on-change="handleSelectChange(value)">
+        <es-select ng-if="showSizeChanger==='true'" class="ant-pagination-options-size-changer" size="{{size}}" value="{{state.defaultPageSize}}" get-popup-container="getPopupContainer" on-change="handleSelectChange(value)">
             <es-select-option value="10">10 条/页</es-select-option>
             <es-select-option value="20">20 条/页</es-select-option>
             <es-select-option value="50">50 条/页</es-select-option>
diff --git a/build/Pagination/Pagination.js b/build/Pagination/Pagination.js
index 3711ebb..28cf7d7 100644
--- a/build/Pagination/Pagination.js
+++ b/build/Pagination/Pagination.js
@@ -31,6 +31,7 @@ angular.module("esNgAntd").directive("esPagination", function (esNgAntd) {
                 pageSize: null,
                 pageNum: null,
                 pageNumList: null,
+                defaultPageSize: $scope.defaultPageSize || 10,
             };
             $scope.watch = {
                 total: function (newVal, oldVal) {
diff --git a/src/Form/Form.js b/src/Form/Form.js
index 6867654..f8cb3af 100644
--- a/src/Form/Form.js
+++ b/src/Form/Form.js
@@ -20,6 +20,10 @@ class Form {
 
     constructor() {
         esNgAntd.createStyle("ant-form", style);
+
+        if (this.form !== undefined) {
+            this.form = $scope;
+        }
         
         if (this.props.name) {
             let inputs = $element[0].querySelectorAll("input");
diff --git a/src/Pagination/Pagination.html b/src/Pagination/Pagination.html
index cdbad55..bb437b6 100644
--- a/src/Pagination/Pagination.html
+++ b/src/Pagination/Pagination.html
@@ -23,7 +23,7 @@
         </button>
     </li>
     <li className="ant-pagination-options">
-        {showSizeChanger === 'true' && <es-select className="ant-pagination-options-size-changer" size="{{size}}" value={defaultPageSize} get-popup-container="getPopupContainer" on-change="handleSelectChange(value)">
+        {showSizeChanger === 'true' && <es-select className="ant-pagination-options-size-changer" size="{{size}}" value={state.defaultPageSize} get-popup-container="getPopupContainer" on-change="handleSelectChange(value)">
             <es-select-option value="10">10 条/页</es-select-option>
             <es-select-option value="20">20 条/页</es-select-option>
             <es-select-option value="50">50 条/页</es-select-option>
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