@innoways/drip-form-theme-antd 6.3.2 → 6.3.3

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Change Log
 
+## 6.3.3
+
+### Patch Changes
+
+- feature: place auto complete search feature added, version 6.3.3
+- Updated dependencies
+  - @innoways/hooks@6.3.3
+  - @innoways/utils@6.3.3
+
 ## 6.3.2
 
 ### Patch Changes

package/dist/index.js

@@ -17,20 +17,20 @@ import 'antd/es/col/style';
 import _Col from 'antd/es/col';
 import 'antd/es/select/style';
 import _Select from 'antd/es/select';
+import _asyncToGenerator from '@babel/runtime/helpers/asyncToGenerator';
 import 'antd/es/message/style';
 import _message from 'antd/es/message';
-import _asyncToGenerator from '@babel/runtime/helpers/asyncToGenerator';
 import 'antd/es/form/style';
 import _Form from 'antd/es/form';
 import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
 import _regeneratorRuntime from '@babel/runtime/regenerator';
+import { fetchFn, typeCheck, isEmpty, binaryData2Blob, checkImg, isValidHttpUrl, fetchFnJsonKey } from '@innoways/utils';
 import 'antd/es/radio/style';
 import _Radio from 'antd/es/radio';
 import reactIs from 'react-is';
 import 'antd/es/tooltip/style';
 import _Tooltip from 'antd/es/tooltip';
 import { QuestionCircleOutlined, InboxOutlined, PlusOutlined, UploadOutlined } from '@ant-design/icons';
-import { typeCheck, isEmpty, binaryData2Blob, checkImg, isValidHttpUrl, fetchFnJsonKey } from '@innoways/utils';
 import { Collapse, Button, Popconfirm } from 'antd';
 import 'antd/es/input-number/style';
 import _InputNumber from 'antd/es/input-number';
@@ -66,10 +66,27 @@ import _TreeSelect from 'antd/es/tree-select';
 function ownKeys$f(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread$f(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$f(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$f(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+var searchTypes = [{
+  label: 'Google',
+  value: 'WGS84'
+}, {
+  label: 'Amap',
+  value: 'GCJ02'
+}];
 
 function GpsModal(_ref) {
   var isOpen = _ref.isOpen,
-      setIsOpen = _ref.setIsOpen;
+      setIsOpen = _ref.setIsOpen,
+      onChange = _ref.onChange;
+  var columns = [{
+    title: 'Address',
+    dataIndex: 'address',
+    key: 'address'
+  }, {
+    title: 'Location',
+    dataIndex: 'location',
+    key: 'location'
+  }];
 
   var _useState = useState({
     type: '',
@@ -81,19 +98,96 @@ function GpsModal(_ref) {
       gpsData = _useState2[0],
       setGpsData = _useState2[1];
 
-  var _useState3 = useState([]),
-      _useState4 = _slicedToArray(_useState3, 2);
-      _useState4[0];
-      _useState4[1];
+  var _useState3 = useState(3),
+      _useState4 = _slicedToArray(_useState3, 2),
+      pageSize = _useState4[0],
+      setPageSize = _useState4[1];
+
+  var _useState5 = useState([]),
+      _useState6 = _slicedToArray(_useState5, 2),
+      selectedRows = _useState6[0],
+      setSelectedRows = _useState6[1];
+
+  var _useState7 = useState([]),
+      _useState8 = _slicedToArray(_useState7, 2),
+      selectedRowKeys = _useState8[0],
+      setSelectedRowKeys = _useState8[1];
+
+  var _useState9 = useState(false),
+      _useState10 = _slicedToArray(_useState9, 2),
+      loading = _useState10[0],
+      setLoading = _useState10[1];
+
+  var _useState11 = useState([]),
+      _useState12 = _slicedToArray(_useState11, 2),
+      gpApiData = _useState12[0],
+      setGpApiData = _useState12[1];
 
   var _Form$useForm = _Form.useForm(),
       _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
       form = _Form$useForm2[0];
 
+  var baseSearchUrl = 'http://localhost:8000/api/v1/gps/searchGps';
+
   var handleGpsDataChange = function handleGpsDataChange(value, name) {
     setGpsData(_objectSpread$f(_objectSpread$f({}, gpsData), {}, _defineProperty({}, name, value)));
   };
 
+  var handleResult = function handleResult(result1, type, addressFg) {
+    if (type == searchTypes[1].value) {
+      if (result1.status == '1') {
+        if (addressFg) {
+          //By Address
+          if (result1.geocodes) {
+            return result1.geocodes.map(function (item) {
+              return {
+                key: item.formatted_address,
+                address: item.formatted_address,
+                location: item.location,
+                longitude: item.location.split(',')[0],
+                latitude: item.location.split(',')[1]
+              };
+            });
+          }
+        } else {
+          //By Location
+          if (result1.regeocode) {
+            var _result1$regeocode = result1.regeocode,
+                formatted_address = _result1$regeocode.formatted_address,
+                addressComponent = _result1$regeocode.addressComponent;
+            return [{
+              key: formatted_address,
+              address: formatted_address,
+              location: addressComponent.streetNumber.location,
+              longitude: addressComponent.streetNumber.location.split(',')[0],
+              latitude: addressComponent.streetNumber.location.split(',')[1]
+            }];
+          }
+        }
+      }
+    } else {
+      //谷歌
+      if (result1.status == 'OK') {
+        //By Address & By Location
+        if (result1.results) {
+          return result1.results.map(function (item) {
+            return {
+              key: item.formatted_address,
+              address: item.formatted_address,
+              location: "".concat(item.geometry.location.lng, ",").concat(item.geometry.location.lat),
+              longitude: item.geometry.location.lng,
+              latitude: item.geometry.location.lat
+            };
+          });
+        }
+      }
+    }
+
+    _message.error('Location not found!', 2);
+
+    return [];
+  };
+
   var handleValidate = function handleValidate() {
     form.validateFields(['type', 'address']);
     var type = gpsData.type,
@@ -139,38 +233,41 @@ function GpsModal(_ref) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
+              setLoading(true);
+
               if (!handleValidate()) {
-                _context.next = 3;
+                _context.next = 4;
                 break;
               }
 
-              _context.next = 3;
-              return fetch("https://api.a4appz.com/apim/getlocation?type=".concat(gpsData.type, "&address=").concat(gpsData.address, "&ostype=DynamicForm"), {
-                method: 'GET',
-                headers: {
-                  'X-SiiA-Api-Key': '0726e1cf-a8b3-426c-bb7b-3857704ff011',
-                  'User-Agent': 'Apifox/1.0.0 (https://apifox.com)',
-                  Accept: '*/*',
-                  Host: 'api.a4appz.com',
-                  Connection: 'keep-alive',
-                  'Content-Type': 'application/json'
-                }
-              }).then(function (res) {
-                return res.json();
+              _context.next = 4;
+              return fetchFn({
+                url: baseSearchUrl,
+                params: [{
+                  key: 'type',
+                  value: gpsData.type
+                }, {
+                  key: 'address',
+                  value: gpsData.address
+                }, {
+                  key: 'ostype',
+                  value: 'DynamicForm'
+                }],
+                method: 'POST'
               }).then(function (res) {
-                if (res.status === 200) {
-                  var _res$data;
-
-                  var getDetails = res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.data;
-                  console.log(getDetails); // setGpsData(getDetails)
+                if (res.Code === 0) {
+                  var getDetails = res.Data;
+                  setGpApiData(handleResult(getDetails, gpsData.type, true));
+                } else {
+                  _message.error('Address not found!', 2);
                 }
-              })["catch"](function (err) {
-                console.log('err', err === null || err === void 0 ? void 0 : err.response);
-
+              })["catch"](function () {
                 _message.error('Address not found!', 2);
+              })["finally"](function () {
+                setLoading(false);
               });
 
-            case 3:
+            case 4:
             case "end":
               return _context.stop();
           }
@@ -195,29 +292,33 @@ function GpsModal(_ref) {
               }
 
               _context2.next = 3;
-              return fetch("https://api.a4appz.com/apim/getlocation?type=".concat(gpsData.type, "&location=").concat(gpsData.latitude, ",").concat(gpsData.longitude, "&ostype=DynamicForm"), {
-                method: 'GET',
-                headers: {
-                  'X-SiiA-Api-Key': '0726e1cf-a8b3-426c-bb7b-3857704ff011',
-                  'User-Agent': 'Apifox/1.0.0 (https://apifox.com)',
-                  Accept: '*/*',
-                  Host: 'api.a4appz.com',
-                  Connection: 'keep-alive',
-                  'Content-Type': 'application/json'
-                }
+              return fetchFn({
+                url: baseSearchUrl,
+                params: [{
+                  key: 'type',
+                  value: gpsData.type
+                }, {
+                  key: 'latitude',
+                  value: gpsData.latitude
+                }, {
+                  key: 'longitude',
+                  value: gpsData.longitude
+                }, {
+                  key: 'ostype',
+                  value: 'DynamicForm'
+                }],
+                method: 'POST'
               }).then(function (res) {
-                return res.json();
-              }).then(function (res) {
-                if (res.status === 200) {
-                  var _res$data2;
-
-                  var getDetails = res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.data;
-                  console.log(getDetails); // setGpsData(getDetails)
+                if (res.Code === 0) {
+                  var getDetails = res.Data;
+                  setGpApiData(handleResult(getDetails, gpsData.type, false));
+                } else {
+                  _message.error('Location not found!', 2);
                 }
-              })["catch"](function (err) {
-                console.log('err', err === null || err === void 0 ? void 0 : err.response);
-
+              })["catch"](function () {
                 _message.error('Location not found!', 2);
+              })["finally"](function () {
+                setLoading(false);
               });
 
             case 3:
@@ -233,12 +334,51 @@ function GpsModal(_ref) {
     };
   }();
 
+  var rowSelection = {
+    type: 'radio',
+    onChange: function onChange(selRowKeys, selRows) {
+      setSelectedRowKeys(selRowKeys);
+      setSelectedRows(selRows);
+    },
+    selectedRowKeys: selectedRowKeys
+  };
+
+  var beforeSearch = function beforeSearch() {
+    setLoading(true);
+    setSelectedRows([]);
+    setSelectedRowKeys([]);
+  };
+
+  var reset = function reset() {
+    setSelectedRows([]);
+    setSelectedRowKeys([]);
+    setGpApiData([]);
+    setGpsData({
+      type: '',
+      address: '',
+      latitude: '',
+      longitude: ''
+    });
+    form.resetFields();
+    setLoading(false);
+    setIsOpen(false);
+  };
+
   return /*#__PURE__*/React.createElement(_Modal, {
     title: "Modal",
     visible: isOpen,
-    onOk: function onOk() {},
+    okButtonProps: {
+      disabled: selectedRows.length === 0
+    },
+    onOk: function onOk() {
+      if (selectedRows.length > 0) {
+        onChange(selectedRows[0].address || '');
+      }
+
+      reset();
+    },
     onCancel: function onCancel() {
-      return setIsOpen(false);
+      reset();
     },
     okText: "Save",
     cancelText: "Cancel"
@@ -254,13 +394,7 @@ function GpsModal(_ref) {
       message: 'Please select type!'
     }]
   }, /*#__PURE__*/React.createElement(_Select, {
-    options: [{
-      label: 'Google',
-      value: 'WGS84'
-    }, {
-      label: 'Amap',
-      value: 'GCJ02'
-    }],
+    options: searchTypes,
     value: gpsData.type,
     onChange: function onChange(e) {
       return handleGpsDataChange(e, 'type');
@@ -292,7 +426,8 @@ function GpsModal(_ref) {
   }, /*#__PURE__*/React.createElement(_Button, {
     color: "primary",
     onClick: function onClick() {
-      return handleAddressSearch();
+      beforeSearch();
+      handleAddressSearch();
     }
   }, "Search")))), /*#__PURE__*/React.createElement(_Col, {
     span: 24
@@ -336,11 +471,29 @@ function GpsModal(_ref) {
     },
     color: "primary",
     onClick: function onClick() {
-      return handleLocationSearch();
+      beforeSearch();
+      handleLocationSearch();
     }
   }, "Search")))))), /*#__PURE__*/React.createElement("div", {
     className: "servicesTable mb-1 mt-1"
-  }, /*#__PURE__*/React.createElement(_Table, null)));
+  }, /*#__PURE__*/React.createElement(_Table, {
+    pagination: {
+      pageSize: pageSize,
+      pageSizeOptions: ['3', '10', '20', '50'],
+      total: gpApiData.length,
+      showSizeChanger: true,
+      showTotal: function showTotal(total) {
+        return "Total ".concat(total, " items");
+      },
+      onChange: function onChange(page, pageSize) {
+        setPageSize(pageSize);
+      }
+    },
+    columns: columns,
+    dataSource: gpApiData,
+    rowSelection: rowSelection,
+    loading: loading
+  })));
 }
 
 /**
@@ -492,7 +645,8 @@ var PlaceAutoCompleteField = function PlaceAutoCompleteField(_ref) {
     style: style
   }, restProps)), /*#__PURE__*/React.createElement(GpsModal, {
     isOpen: globalState.webModalForPlaceAutoCompleteField === fieldKey,
-    setIsOpen: handleIsGPSModalOpen
+    setIsOpen: handleIsGPSModalOpen,
+    onChange: _onChange
   }));
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@innoways/drip-form-theme-antd",
-	"version": "6.3.2",
+	"version": "6.3.3",
 	"author": "JDFED",
 	"description": "drip-form antd主题包",
 	"main": "dist/index.js",
@@ -31,8 +31,8 @@
 	"dependencies": {
 		"@ant-design/icons": "^4.7.0",
 		"@babel/runtime": "^7.10.2",
-		"@innoways/hooks": "^6.3.2",
-		"@innoways/utils": "^6.3.2",
+		"@innoways/hooks": "^6.3.3",
+		"@innoways/utils": "^6.3.3",
 		"antd": "^4.16.13",
 		"flatpickr": "^4.6.13",
 		"moment": "^2.26.0",