@kmkf-fe-packages/basic-components 0.6.3-alpha.44 → 0.6.3-alpha.47

package/dist/apaas/ApaasAddress/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 interface Option {
     value: string | number;
     label: string;
@@ -10,5 +9,5 @@ interface ProvinceType {
     disabled: boolean;
     onChange: (value: any, selectedOptions: any) => void;
 }
-declare const Province: (props: Partial<ProvinceType>) => React.JSX.Element;
+declare const Province: (props: Partial<ProvinceType>) => JSX.Element;
 export default Province;

package/dist/apaas/ApaasCascader/index.d.ts

@@ -1,3 +1,2 @@
-import React from 'react';
-declare function ApaasCascader(props: any): React.JSX.Element;
+declare function ApaasCascader(props: any): JSX.Element;
 export default ApaasCascader;

package/dist/apaas/ApaasCheckbox/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import { CheckboxGroupProps, CheckboxValueType } from 'antd/es/checkbox/Group';
 type OptionsType = {
     label: string;
@@ -18,5 +17,5 @@ export interface ApaasCheckboxProps extends Omit<CheckboxGroupProps, 'onChange'
     value?: CheckboxValue;
     [key: string]: any;
 }
-declare function ApaasCheckbox(props: ApaasCheckboxProps): React.JSX.Element;
+declare function ApaasCheckbox(props: ApaasCheckboxProps): JSX.Element;
 export default ApaasCheckbox;

package/dist/apaas/ApaasDate/index.d.ts

@@ -1,9 +1,8 @@
-import React from 'react';
 declare const DateType: ["DATE", "DATE_TIME", "DATE_RANGE", "DATE_TIME_RANGE"];
 export declare type ButtonType = typeof DateType[number];
 export interface ApaasDate {
     dateType?: ButtonType;
     [propName: string]: any;
 }
-declare const ApaasDate: (props: ApaasDate) => React.JSX.Element;
+declare const ApaasDate: (props: ApaasDate) => JSX.Element;
 export default ApaasDate;

package/dist/apaas/ApaasInput/index.d.ts

@@ -1,8 +1,7 @@
-import React from 'react';
 import { InputProps } from 'antd';
 export interface ApaasInputProps extends InputProps {
     isNumber?: boolean;
     replaceWarn?: boolean;
 }
-declare function ApaasInput(props: ApaasInputProps): React.JSX.Element;
+declare function ApaasInput(props: ApaasInputProps): JSX.Element;
 export default ApaasInput;

package/dist/apaas/ApaasInputNumber/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import { InputNumberProps } from 'antd';
-declare function ApaasInputNumber(props: InputNumberProps): React.JSX.Element;
+declare function ApaasInputNumber(props: InputNumberProps): JSX.Element;
 export default ApaasInputNumber;

package/dist/apaas/ApaasMultipleSelect/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import { ApaasSelectProps } from '../ApaasSelect/index';
-declare function ApaasMultipleSelect(props: ApaasSelectProps): React.JSX.Element;
+declare function ApaasMultipleSelect(props: ApaasSelectProps): JSX.Element;
 export default ApaasMultipleSelect;

package/dist/apaas/ApaasSelect/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import { SelectProps } from 'antd';
 type OptionsType = {
     label: string;
@@ -9,5 +8,5 @@ export interface ApaasSelectProps extends SelectProps<string[]> {
     options?: OptionsType[];
     [propName: string]: any;
 }
-declare function ApaasSelect(props: ApaasSelectProps): React.JSX.Element;
+declare function ApaasSelect(props: ApaasSelectProps): JSX.Element;
 export default ApaasSelect;

package/dist/apaas/ApaasTextArea/index.d.ts

@@ -1,8 +1,7 @@
-import React from 'react';
 import { TextAreaProps } from 'antd/es/input';
 export interface ITextAreaProps {
     minRows?: number;
     maxRows?: number;
 }
-declare function ApaasTextArea(props: TextAreaProps & ITextAreaProps): React.JSX.Element;
+declare function ApaasTextArea(props: TextAreaProps & ITextAreaProps): JSX.Element;
 export default ApaasTextArea;

package/dist/apaas/ApaasUpload/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import { UploadProps } from 'antd';
 declare type UploadValue = string[];
 export interface ApaasUploadProps extends Omit<UploadProps, 'onChange' | 'value'> {
@@ -10,5 +9,5 @@ export interface ApaasUploadProps extends Omit<UploadProps, 'onChange' | 'value'
     onChange?: (value: UploadValue) => void;
     value?: UploadValue;
 }
-declare const ApaasUpload: ({ maxCount, maxSize, uploadText, onChange, value, accept, canPreview, disabled, ...resetProps }: ApaasUploadProps) => React.JSX.Element;
+declare const ApaasUpload: ({ maxCount, maxSize, uploadText, onChange, value, accept, canPreview, disabled, ...resetProps }: ApaasUploadProps) => JSX.Element;
 export default ApaasUpload;

package/dist/apaas/ApaasUploadAsync/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import { UploadProps } from 'antd';
 declare type UploadValue = string[];
 export interface ApaasUploadProps extends Omit<UploadProps, 'onChange' | 'value'> {
@@ -13,5 +12,5 @@ export interface ApaasUploadProps extends Omit<UploadProps, 'onChange' | 'value'
     hostUrl?: string;
     actionUrl?: string;
 }
-declare const ApaasUploadAsync: ({ maxCount, maxSize, uploadText, onChange, value, accept, canPreview, disabled, uniqueKey, hostUrl, actionUrl, ...resetProps }: ApaasUploadProps) => React.JSX.Element;
+declare const ApaasUploadAsync: ({ maxCount, maxSize, uploadText, onChange, value, accept, canPreview, disabled, uniqueKey, hostUrl, actionUrl, ...resetProps }: ApaasUploadProps) => JSX.Element;
 export default ApaasUploadAsync;

package/dist/apaas/hoc/withFormItem.d.ts

@@ -9,4 +9,4 @@ export interface WithFormItemProps {
     initialValue?: string;
     [prop: string]: any;
 }
-export default function withFormItem(WrappedComponent: React.ComponentType<WithFormItemProps>): (props: WithFormItemProps) => React.JSX.Element;
+export default function withFormItem(WrappedComponent: React.ComponentType<WithFormItemProps>): (props: WithFormItemProps) => JSX.Element;

package/dist/basics/FormItem/index.d.ts

@@ -1,3 +1,2 @@
-import React from 'react';
-declare const FormItem: (props: any) => React.JSX.Element;
+declare const FormItem: (props: any) => JSX.Element;
 export default FormItem;

package/dist/business/AliPay/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 interface AliPayValueType {
     name?: string;
     user?: string;
@@ -10,5 +9,5 @@ interface AliPayProps {
     onChange: (value: AliPayValueType) => void;
     onBlur?: (value: string, type: string) => void;
 }
-declare const AliPay: (props: Partial<AliPayProps>) => React.JSX.Element;
+declare const AliPay: (props: Partial<AliPayProps>) => JSX.Element;
 export default AliPay;

package/dist/business/BuyerNick/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 interface BuyerNickValueType {
     buyerNick?: string;
     buyerOpenUid?: string;
@@ -11,5 +10,5 @@ interface BuyerNickProps {
     onChange: (value: BuyerNickValueType) => void;
     onBlur: (value: string, type: string) => void;
 }
-declare const BuyerNick: (props: Partial<BuyerNickProps>) => React.JSX.Element;
+declare const BuyerNick: (props: Partial<BuyerNickProps>) => JSX.Element;
 export default BuyerNick;

package/dist/business/ChooseBaby/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import { GoodsProps } from '../../common/Goods';
-declare const ChooseBaby: (props: Partial<GoodsProps>) => React.JSX.Element;
+declare const ChooseBaby: (props: Partial<GoodsProps>) => JSX.Element;
 export default ChooseBaby;

package/dist/business/ExpressLogistics/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import { LogisticsType } from '../../common/Logistics/index.d';
-declare const ExpressLogistics: (props: Partial<LogisticsType>) => React.JSX.Element;
+declare const ExpressLogistics: (props: Partial<LogisticsType>) => JSX.Element;
 export default ExpressLogistics;

package/dist/business/Invoice/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import './index.less';
 export interface InvoiceValueType {
     ordinaryTaitou: string;
@@ -11,5 +10,5 @@ export interface InvoiceProps {
     disabled?: boolean;
     onChange: (value: InvoiceValueType) => void;
 }
-declare const Invoice: (props: Partial<InvoiceProps>) => React.JSX.Element;
+declare const Invoice: (props: Partial<InvoiceProps>) => JSX.Element;
 export default Invoice;

package/dist/business/LogisticsInterception/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 interface LogisticsInterceptionValueType {
     interceptCompany: string;
     interceptCode: string;
@@ -19,5 +18,5 @@ interface LogisticsInterceptionProps {
     isEditing: boolean;
     onChange: (value: Partial<LogisticsInterceptionValueType>) => void;
 }
-declare const LogisticsInterception: (props: Partial<LogisticsInterceptionProps>) => React.JSX.Element;
+declare const LogisticsInterception: (props: Partial<LogisticsInterceptionProps>) => JSX.Element;
 export default LogisticsInterception;

package/dist/business/Payment/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 export interface PaymentProps {
     value: any;
     zhiFubaoRequired: boolean;
@@ -11,5 +10,5 @@ export interface PaymentProps {
     onSearch: (value: any) => void;
     onBlur: (value: any, type: string) => void;
 }
-declare const Payment: (props: Partial<PaymentProps>) => React.JSX.Element;
+declare const Payment: (props: Partial<PaymentProps>) => JSX.Element;
 export default Payment;

package/dist/business/Remark/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 interface ValueType {
     remark?: string;
     flag?: number;
@@ -9,5 +8,5 @@ interface RemarkType {
     value: ValueType;
     onChange: (value: ValueType) => void;
 }
-declare const RemarkInput: (props: Partial<RemarkType>) => React.JSX.Element;
+declare const RemarkInput: (props: Partial<RemarkType>) => JSX.Element;
 export default RemarkInput;

package/dist/business/ShopName/index.d.ts

@@ -1,9 +1,8 @@
-import React from 'react';
 interface ShopNameType {
     value: number;
     onChange: (value: number) => void;
     disabled: boolean;
     style: any;
 }
-declare const ShopNameSelect: (props: Partial<ShopNameType>) => React.JSX.Element;
+declare const ShopNameSelect: (props: Partial<ShopNameType>) => JSX.Element;
 export default ShopNameSelect;

package/dist/business/Status/index.d.ts

@@ -1,12 +1,3 @@
-/**
- * props
- * isUseCustomStatus true/false 是否自定义文案
- * customStatusText 自定义文案内容
- * isSelectStyle  true/false  是否为下拉框
- * require true/false 是否必填
- * originCustomer和isEditing  当状态组件处于编辑状态下，工单状态从未处理切换到已处理时候，我们需要将客服重置为初始值
- */
-import React from 'react';
 export interface StatusProps {
     shopId: string;
     customStatusText: string;
@@ -21,5 +12,5 @@ export interface StatusProps {
     required: boolean;
     onChange: (value: any) => void;
 }
-declare const Status: (props: StatusProps) => React.JSX.Element;
+declare const Status: (props: StatusProps) => JSX.Element;
 export default Status;

package/dist/business/Supplier/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import { GoodsProps } from '../../common/Goods';
-declare const Supplier: (props: Partial<GoodsProps>) => React.JSX.Element;
+declare const Supplier: (props: Partial<GoodsProps>) => JSX.Element;
 export default Supplier;

package/dist/business/TBGoodId/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import { GoodsProps } from '../../common/Goods';
-declare const TBGoodId: (props: Partial<GoodsProps>) => React.JSX.Element;
+declare const TBGoodId: (props: Partial<GoodsProps>) => JSX.Element;
 export default TBGoodId;

package/dist/business/TBGoodSerial/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import { GoodsProps } from '../../common/Goods';
-declare const TBGoodSerial: (props: Partial<GoodsProps>) => React.JSX.Element;
+declare const TBGoodSerial: (props: Partial<GoodsProps>) => JSX.Element;
 export default TBGoodSerial;

package/dist/business/TradeId/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import { InputProps } from 'antd';
 interface TradeIdProps extends InputProps {
     value: string;
@@ -7,5 +6,5 @@ interface TradeIdProps extends InputProps {
     disabled?: boolean;
     onSearch: (value: any) => void;
 }
-declare function TradeId(props: Partial<TradeIdProps>): React.JSX.Element;
+declare function TradeId(props: Partial<TradeIdProps>): JSX.Element;
 export default TradeId;

package/dist/common/ExpressCompany/index.d.ts

@@ -1,8 +1,7 @@
-import React from 'react';
 type ExpressCompanyProps = {
     options: any[];
     value: string;
     onChange: (v: string) => void;
 };
-declare const ExpressCompany: (props: ExpressCompanyProps) => React.JSX.Element;
+declare const ExpressCompany: (props: ExpressCompanyProps) => JSX.Element;
 export default ExpressCompany;

package/dist/common/Goods/goodModel.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import './index.less';
 interface GoodModelProps {
     visible: boolean;
@@ -12,5 +11,5 @@ interface GoodModelProps {
     onSubmit: (...args: any[]) => any;
     onCancel: (...args: any[]) => any;
 }
-declare const GoodsModal: (props: GoodModelProps) => React.JSX.Element;
+declare const GoodsModal: (props: GoodModelProps) => JSX.Element;
 export default GoodsModal;

package/dist/common/Goods/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import './index.less';
 export interface GoodsProps {
     value?: GoodsValues;
@@ -34,5 +33,5 @@ export interface IEditState {
     itemId?: string | null;
     supplierName: string | null;
 }
-declare const Goods: (props: Partial<GoodsProps>) => React.JSX.Element;
+declare const Goods: (props: Partial<GoodsProps>) => JSX.Element;
 export default Goods;

package/dist/common/GoodsTable/goodModel.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import './index.less';
 interface GoodModelProps {
     visible: boolean;
@@ -10,5 +9,5 @@ interface GoodModelProps {
     onSubmit: (...args: any[]) => any;
     onCancel: (...args: any[]) => any;
 }
-declare const GoodsModal: (props: GoodModelProps) => React.JSX.Element;
+declare const GoodsModal: (props: GoodModelProps) => JSX.Element;
 export default GoodsModal;

package/dist/common/Logistics/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import { LogisticsType } from './index.d';
-declare const Logistics: (props: Partial<LogisticsType>) => React.JSX.Element;
+declare const Logistics: (props: Partial<LogisticsType>) => JSX.Element;
 export default Logistics;

package/dist/config/utils.d.ts

@@ -1,2 +1,3 @@
+export declare const toTree: (list: any[] | undefined, parId: number) => any[];
 export declare const keepDecimals: (value: string) => string;
 export declare function dataURLtoFile(dataurl: string, filename: string): File;

package/dist/index.esm.js

@@ -2,7 +2,6 @@ import React, { useRef, useState, useEffect, useMemo, forwardRef, useImperativeH
 import { Cascader, DatePicker, Input, InputNumber, Select, Upload, Image, message, Radio, Space, Spin, Checkbox, Row, Col, Slider, Rate, Form, Tabs, Modal, Button, ConfigProvider, Pagination, Popover } from 'antd';
 import { EyeOutlined, DeleteOutlined } from '@ant-design/icons';
 import request, { extend } from 'umi-request';
-import { AddressData } from '@kmkf-fe-packages/kmkf-utils';
 import zhCN from 'antd/lib/locale/zh_CN';
 
 function _iterableToArrayLimit(arr, i) {
@@ -855,6 +854,37 @@ function ApaasRadio(props) {
   }))));
 }
 
+/*
+ * @Author: wangzhenggui jianjia.wzg@raycloud.com
+ * @Date: 2022-09-20 14:29:14
+ * @LastEditors: litian
+ * @LastEditTime: 2022-09-27 13:49:32
+ * @FilePath: /raycloud-apaas-fe-setup/packages/apaas-react-basics-widgets/src/config/utils.ts
+ * @Description:
+ *
+ * Copyright (c) 2022 by wangzhenggui jianjia.wzg@raycloud.com, All Rights Reserved.
+ */
+//组装地址
+var toTree = function toTree() {
+  var list = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  var parId = arguments.length > 1 ? arguments[1] : undefined;
+  var len = list === null || list === void 0 ? void 0 : list.length;
+  function loop(parId) {
+    var res = [];
+    for (var i = 0; i < len; i++) {
+      var item = list[i];
+      if (item.parentId === Number(parId)) {
+        item.children = loop(item.id);
+        res.push(_objectSpread2(_objectSpread2({}, item), {}, {
+          label: item.name,
+          value: item.id
+        }));
+      }
+    }
+    return res;
+  }
+  return loop(parId);
+};
 var keepDecimals = function keepDecimals(value) {
   value = value.replace(/[^\d.]/g, ''); //清除"数字"和"."以外的字符
   value = value.replace(/^\./g, ''); //验证第一个字符是数字
@@ -1332,7 +1362,18 @@ function ApaasRate(props) {
   }));
 }
 
-var address = AddressData.getInstance();
+/*
+ * @Author: wangzhenggui jianjia.wzg@raycloud.com
+ * @Date: 2022-09-13 11:06:09
+ * @LastEditors: wangzhenggui jianjia.wzg@raycloud.com
+ * @LastEditTime: 2022-11-04 15:55:10
+ * @FilePath: /raycloud-apaas-fe-setup/packages/apaas-react-basics-widgets/src/common/request.ts
+ * @Description:
+ *
+ * Copyright (c) 2022 by wangzhenggui jianjia.wzg@raycloud.com, All Rights Reserved.
+ */
+var extendRequest = extend({});
+
 var Province = function Province(props) {
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
@@ -1341,11 +1382,35 @@ var Province = function Province(props) {
   var isFirst = useRef(false);
   var initPageSource = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var apaasAddress, apaasSaveTime, isExpire, _yield$request, list, arr;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            setOptions(address.addressOptions || []);
-          case 1:
+            apaasAddress = window.localStorage.getItem('apaasAddress');
+            apaasSaveTime = window.localStorage.getItem('apaasSaveTime'); //判断是否过期 缓存7天
+            isExpire = apaasSaveTime ? Number(apaasSaveTime) + 7 * 3600 * 24 * 1000 < new Date().getTime() : true;
+            if (!(apaasAddress && !isExpire)) {
+              _context.next = 6;
+              break;
+            }
+            setOptions(JSON.parse(apaasAddress));
+            return _context.abrupt("return");
+          case 6:
+            _context.next = 8;
+            return extendRequest('/qy/gdfw/template/queryAreas', {
+              method: 'get',
+              params: {
+                apiName: 'queryAreas'
+              }
+            });
+          case 8:
+            _yield$request = _context.sent;
+            list = _yield$request.data;
+            arr = toTree(list, 0);
+            setOptions(arr[0].children);
+            window.localStorage.setItem('apaasAddress', JSON.stringify(arr[0].children));
+            window.localStorage.setItem('apaasSaveTime', new Date().getTime().toString());
+          case 14:
           case "end":
             return _context.stop();
         }
@@ -1648,18 +1713,6 @@ var AliPay = function AliPay(props) {
   })));
 };
 
-/*
- * @Author: wangzhenggui jianjia.wzg@raycloud.com
- * @Date: 2022-09-13 11:06:09
- * @LastEditors: wangzhenggui jianjia.wzg@raycloud.com
- * @LastEditTime: 2022-11-04 15:55:10
- * @FilePath: /raycloud-apaas-fe-setup/packages/apaas-react-basics-widgets/src/common/request.ts
- * @Description:
- *
- * Copyright (c) 2022 by wangzhenggui jianjia.wzg@raycloud.com, All Rights Reserved.
- */
-var extendRequest = extend({});
-
 var css_248z$4 = ".goodsBox {\n  display: flex;\n  flex-wrap: wrap;\n}\n.goodsBox .goodBox-Img {\n  width: 80px;\n  margin: 0 10px 10px 0;\n}\n.goodsBox .right-context {\n  font-size: 12px;\n}\n.goodsBox .right-context .ant-input {\n  font-size: 12px;\n  width: 80px;\n  height: 20px;\n  padding-left: 5px;\n  padding-right: 5px;\n}\n.goodsBox .right-context .ant-input.id-textarea {\n  width: 80px;\n  resize: none;\n  height: 45px;\n}\n.goodsBox.goodsBox-item-horizontal--box {\n  flex-direction: row;\n  width: auto;\n}\n.goods-imgBox {\n  position: relative;\n  width: 80px;\n  height: 80px;\n  border-radius: 4px;\n  border: 1px solid #f2f3f5;\n  margin: 0 10px 10px 0;\n  text-align: center;\n  background-color: #f2f3f5;\n}\n.goods-imgBox .add-btn {\n  color: #86909c;\n}\n.goods-imgBox .text {\n  color: #86909c;\n}\n.icon-close {\n  position: absolute;\n  top: -5px;\n  right: -5px;\n  width: 13px;\n  height: 13px;\n  display: flex;\n  justify-content: center;\n  align-items: center;\n  border-radius: 50%;\n  z-index: 3;\n  background-color: #fff;\n  cursor: pointer;\n}\n.img {\n  width: 100%;\n  height: 100%;\n  -o-object-fit: contain;\n     object-fit: contain;\n}\n.goods-title {\n  margin: 0 0 10px 5px;\n  color: #4e5969;\n}\n.searchBox {\n  display: flex;\n  justify-content: space-between;\n  flex-wrap: wrap;\n  margin-bottom: 10px;\n}\n.searchBox .search {\n  width: 150px;\n  margin-left: 6px;\n}\n.deg90 {\n  transform: rotate(90deg);\n}\n.goodsMain {\n  display: flex;\n  flex-wrap: wrap;\n  height: 400px;\n  overflow-y: auto;\n  margin-bottom: 10px;\n}\n.goodsMain .goodItem {\n  width: 142px;\n  height: 184px;\n  padding: 7px;\n  margin: 0 16px 16px 0;\n  border-radius: 4px;\n  background: #ffffff;\n  box-sizing: border-box;\n  /* 主题色/常规 */\n  border: 1px solid #c9cdd4;\n}\n.goodsMain .goodItem .goodImg {\n  width: 128px;\n  height: 128px;\n  border-radius: 4px;\n  overflow: hidden;\n}\n.goodsMain .goodItem .goodImg img {\n  width: 100%;\n  height: 100%;\n  -o-object-fit: contain;\n     object-fit: contain;\n}\n.goodsMain .goodItem .goodText {\n  text-align: center;\n  font-size: 12px;\n  color: #4e5969;\n  overflow: hidden;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n}\n.goodsMain .goodItem .goodPrice {\n  text-align: center;\n  font-size: 14px;\n  color: #1d2129;\n}\n.goodsMain .goodItem.active {\n  border: 1px solid #1b5bf3;\n}\n@media screen and (max-width: 500px) {\n  .goodsMain {\n    display: grid;\n    grid-template-columns: repeat(3, 1fr);\n    grid-gap: 8px;\n    height: 300px;\n  }\n  .goodsMain .goodItem {\n    height: 126px;\n    width: 83px;\n    padding: 4px;\n    margin: 0;\n    border-radius: 4px;\n    background: #FFFFFF;\n    box-sizing: border-box;\n    border: 1px solid rgba(0, 0, 0, 0.15);\n  }\n  .goodsMain .goodItem .goodImg {\n    width: 98%;\n    height: 77px;\n  }\n  .goodsMain .goodItem .goodText {\n    overflow: hidden;\n    text-overflow: ellipsis;\n    white-space: nowrap;\n  }\n  .goodsMain .goodItem.active {\n    border: 1px solid #3089dc;\n  }\n  .searchBox {\n    display: flex;\n    flex-wrap: wrap;\n    justify-content: initial;\n  }\n  .searchBox .classify {\n    width: 120px;\n  }\n  .goodModal .ant-modal-body {\n    padding: 8px;\n  }\n}\n.goods-uploaded-count {\n  color: #ff3638;\n}\n.footer {\n  display: flex;\n  justify-content: flex-end;\n}\n.right-context {\n  display: flex;\n  flex-direction: column;\n}\n.right-context .info-row {\n  width: 80px;\n  display: flex;\n  align-items: center;\n  padding: 0px 8px;\n  border-radius: 2px;\n  cursor: pointer;\n  background: #f2f3f5;\n  margin-bottom: 4px;\n}\n.right-context .info-row > div {\n  text-overflow: ellipsis;\n  display: -webkit-box;\n  -webkit-box-orient: vertical;\n  -webkit-line-clamp: 2;\n  overflow: hidden;\n  word-break: break-all;\n}\n.sphPagination {\n  display: flex;\n  align-items: center;\n}\n.sphPagination .shpBtn {\n  display: flex;\n  justify-content: center;\n  align-items: center;\n  padding: 0 8px;\n  height: 32px;\n  border: 1px solid #d9d9d9;\n  border-radius: 2px;\n  cursor: pointer;\n  margin: 0 8px;\n}\n.sphPagination .shpBtn.unCursor {\n  color: #eee;\n  cursor: not-allowed;\n}\n";
 styleInject(css_248z$4);
 

package/dist/index.js

@@ -6,7 +6,6 @@ var React = require('react');
 var antd = require('antd');
 var icons = require('@ant-design/icons');
 var request = require('umi-request');
-var kmkfUtils = require('@kmkf-fe-packages/kmkf-utils');
 var zhCN = require('antd/lib/locale/zh_CN');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -865,6 +864,37 @@ function ApaasRadio(props) {
   }))));
 }
 
+/*
+ * @Author: wangzhenggui jianjia.wzg@raycloud.com
+ * @Date: 2022-09-20 14:29:14
+ * @LastEditors: litian
+ * @LastEditTime: 2022-09-27 13:49:32
+ * @FilePath: /raycloud-apaas-fe-setup/packages/apaas-react-basics-widgets/src/config/utils.ts
+ * @Description:
+ *
+ * Copyright (c) 2022 by wangzhenggui jianjia.wzg@raycloud.com, All Rights Reserved.
+ */
+//组装地址
+var toTree = function toTree() {
+  var list = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  var parId = arguments.length > 1 ? arguments[1] : undefined;
+  var len = list === null || list === void 0 ? void 0 : list.length;
+  function loop(parId) {
+    var res = [];
+    for (var i = 0; i < len; i++) {
+      var item = list[i];
+      if (item.parentId === Number(parId)) {
+        item.children = loop(item.id);
+        res.push(_objectSpread2(_objectSpread2({}, item), {}, {
+          label: item.name,
+          value: item.id
+        }));
+      }
+    }
+    return res;
+  }
+  return loop(parId);
+};
 var keepDecimals = function keepDecimals(value) {
   value = value.replace(/[^\d.]/g, ''); //清除"数字"和"."以外的字符
   value = value.replace(/^\./g, ''); //验证第一个字符是数字
@@ -1342,7 +1372,18 @@ function ApaasRate(props) {
   }));
 }
 
-var address = kmkfUtils.AddressData.getInstance();
+/*
+ * @Author: wangzhenggui jianjia.wzg@raycloud.com
+ * @Date: 2022-09-13 11:06:09
+ * @LastEditors: wangzhenggui jianjia.wzg@raycloud.com
+ * @LastEditTime: 2022-11-04 15:55:10
+ * @FilePath: /raycloud-apaas-fe-setup/packages/apaas-react-basics-widgets/src/common/request.ts
+ * @Description:
+ *
+ * Copyright (c) 2022 by wangzhenggui jianjia.wzg@raycloud.com, All Rights Reserved.
+ */
+var extendRequest = request.extend({});
+
 var Province = function Province(props) {
   var _useState = React.useState([]),
     _useState2 = _slicedToArray(_useState, 2),
@@ -1351,11 +1392,35 @@ var Province = function Province(props) {
   var isFirst = React.useRef(false);
   var initPageSource = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var apaasAddress, apaasSaveTime, isExpire, _yield$request, list, arr;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            setOptions(address.addressOptions || []);
-          case 1:
+            apaasAddress = window.localStorage.getItem('apaasAddress');
+            apaasSaveTime = window.localStorage.getItem('apaasSaveTime'); //判断是否过期 缓存7天
+            isExpire = apaasSaveTime ? Number(apaasSaveTime) + 7 * 3600 * 24 * 1000 < new Date().getTime() : true;
+            if (!(apaasAddress && !isExpire)) {
+              _context.next = 6;
+              break;
+            }
+            setOptions(JSON.parse(apaasAddress));
+            return _context.abrupt("return");
+          case 6:
+            _context.next = 8;
+            return extendRequest('/qy/gdfw/template/queryAreas', {
+              method: 'get',
+              params: {
+                apiName: 'queryAreas'
+              }
+            });
+          case 8:
+            _yield$request = _context.sent;
+            list = _yield$request.data;
+            arr = toTree(list, 0);
+            setOptions(arr[0].children);
+            window.localStorage.setItem('apaasAddress', JSON.stringify(arr[0].children));
+            window.localStorage.setItem('apaasSaveTime', new Date().getTime().toString());
+          case 14:
           case "end":
             return _context.stop();
         }
@@ -1658,18 +1723,6 @@ var AliPay = function AliPay(props) {
   })));
 };
 
-/*
- * @Author: wangzhenggui jianjia.wzg@raycloud.com
- * @Date: 2022-09-13 11:06:09
- * @LastEditors: wangzhenggui jianjia.wzg@raycloud.com
- * @LastEditTime: 2022-11-04 15:55:10
- * @FilePath: /raycloud-apaas-fe-setup/packages/apaas-react-basics-widgets/src/common/request.ts
- * @Description:
- *
- * Copyright (c) 2022 by wangzhenggui jianjia.wzg@raycloud.com, All Rights Reserved.
- */
-var extendRequest = request.extend({});
-
 var css_248z$4 = ".goodsBox {\n  display: flex;\n  flex-wrap: wrap;\n}\n.goodsBox .goodBox-Img {\n  width: 80px;\n  margin: 0 10px 10px 0;\n}\n.goodsBox .right-context {\n  font-size: 12px;\n}\n.goodsBox .right-context .ant-input {\n  font-size: 12px;\n  width: 80px;\n  height: 20px;\n  padding-left: 5px;\n  padding-right: 5px;\n}\n.goodsBox .right-context .ant-input.id-textarea {\n  width: 80px;\n  resize: none;\n  height: 45px;\n}\n.goodsBox.goodsBox-item-horizontal--box {\n  flex-direction: row;\n  width: auto;\n}\n.goods-imgBox {\n  position: relative;\n  width: 80px;\n  height: 80px;\n  border-radius: 4px;\n  border: 1px solid #f2f3f5;\n  margin: 0 10px 10px 0;\n  text-align: center;\n  background-color: #f2f3f5;\n}\n.goods-imgBox .add-btn {\n  color: #86909c;\n}\n.goods-imgBox .text {\n  color: #86909c;\n}\n.icon-close {\n  position: absolute;\n  top: -5px;\n  right: -5px;\n  width: 13px;\n  height: 13px;\n  display: flex;\n  justify-content: center;\n  align-items: center;\n  border-radius: 50%;\n  z-index: 3;\n  background-color: #fff;\n  cursor: pointer;\n}\n.img {\n  width: 100%;\n  height: 100%;\n  -o-object-fit: contain;\n     object-fit: contain;\n}\n.goods-title {\n  margin: 0 0 10px 5px;\n  color: #4e5969;\n}\n.searchBox {\n  display: flex;\n  justify-content: space-between;\n  flex-wrap: wrap;\n  margin-bottom: 10px;\n}\n.searchBox .search {\n  width: 150px;\n  margin-left: 6px;\n}\n.deg90 {\n  transform: rotate(90deg);\n}\n.goodsMain {\n  display: flex;\n  flex-wrap: wrap;\n  height: 400px;\n  overflow-y: auto;\n  margin-bottom: 10px;\n}\n.goodsMain .goodItem {\n  width: 142px;\n  height: 184px;\n  padding: 7px;\n  margin: 0 16px 16px 0;\n  border-radius: 4px;\n  background: #ffffff;\n  box-sizing: border-box;\n  /* 主题色/常规 */\n  border: 1px solid #c9cdd4;\n}\n.goodsMain .goodItem .goodImg {\n  width: 128px;\n  height: 128px;\n  border-radius: 4px;\n  overflow: hidden;\n}\n.goodsMain .goodItem .goodImg img {\n  width: 100%;\n  height: 100%;\n  -o-object-fit: contain;\n     object-fit: contain;\n}\n.goodsMain .goodItem .goodText {\n  text-align: center;\n  font-size: 12px;\n  color: #4e5969;\n  overflow: hidden;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n}\n.goodsMain .goodItem .goodPrice {\n  text-align: center;\n  font-size: 14px;\n  color: #1d2129;\n}\n.goodsMain .goodItem.active {\n  border: 1px solid #1b5bf3;\n}\n@media screen and (max-width: 500px) {\n  .goodsMain {\n    display: grid;\n    grid-template-columns: repeat(3, 1fr);\n    grid-gap: 8px;\n    height: 300px;\n  }\n  .goodsMain .goodItem {\n    height: 126px;\n    width: 83px;\n    padding: 4px;\n    margin: 0;\n    border-radius: 4px;\n    background: #FFFFFF;\n    box-sizing: border-box;\n    border: 1px solid rgba(0, 0, 0, 0.15);\n  }\n  .goodsMain .goodItem .goodImg {\n    width: 98%;\n    height: 77px;\n  }\n  .goodsMain .goodItem .goodText {\n    overflow: hidden;\n    text-overflow: ellipsis;\n    white-space: nowrap;\n  }\n  .goodsMain .goodItem.active {\n    border: 1px solid #3089dc;\n  }\n  .searchBox {\n    display: flex;\n    flex-wrap: wrap;\n    justify-content: initial;\n  }\n  .searchBox .classify {\n    width: 120px;\n  }\n  .goodModal .ant-modal-body {\n    padding: 8px;\n  }\n}\n.goods-uploaded-count {\n  color: #ff3638;\n}\n.footer {\n  display: flex;\n  justify-content: flex-end;\n}\n.right-context {\n  display: flex;\n  flex-direction: column;\n}\n.right-context .info-row {\n  width: 80px;\n  display: flex;\n  align-items: center;\n  padding: 0px 8px;\n  border-radius: 2px;\n  cursor: pointer;\n  background: #f2f3f5;\n  margin-bottom: 4px;\n}\n.right-context .info-row > div {\n  text-overflow: ellipsis;\n  display: -webkit-box;\n  -webkit-box-orient: vertical;\n  -webkit-line-clamp: 2;\n  overflow: hidden;\n  word-break: break-all;\n}\n.sphPagination {\n  display: flex;\n  align-items: center;\n}\n.sphPagination .shpBtn {\n  display: flex;\n  justify-content: center;\n  align-items: center;\n  padding: 0 8px;\n  height: 32px;\n  border: 1px solid #d9d9d9;\n  border-radius: 2px;\n  cursor: pointer;\n  margin: 0 8px;\n}\n.sphPagination .shpBtn.unCursor {\n  color: #eee;\n  cursor: not-allowed;\n}\n";
 styleInject(css_248z$4);
 

package/dist/jst/Goods/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 interface JstGoodsProps {
     value: any[];
     type: number;
@@ -7,5 +6,5 @@ interface JstGoodsProps {
     onChange: (val: any[]) => void;
     showField: string;
 }
-declare const jstGoods: (props: Partial<JstGoodsProps>) => React.JSX.Element;
+declare const jstGoods: (props: Partial<JstGoodsProps>) => JSX.Element;
 export default jstGoods;

package/dist/jst/ItemList/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import './index.less';
 export interface GoodsProps {
     value: any[];
@@ -16,5 +15,5 @@ export interface GoodsItem {
     price: string;
     [key: string]: any;
 }
-declare const ItemList: (props: Partial<GoodsProps>) => React.JSX.Element;
+declare const ItemList: (props: Partial<GoodsProps>) => JSX.Element;
 export default ItemList;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "0.6.3-alpha.44",
+  "version": "0.6.3-alpha.47",
   "description": "> TODO: description",
   "homepage": "",
   "license": "ISC",
@@ -19,7 +19,7 @@
     "watch": "nodemon --ignore dist/ --ignore node_modules/ --watch src/ -C -e ts,tsx,less --debug -x 'yarn async'"
   },
   "dependencies": {
-    "@kmkf-fe-packages/kmkf-utils": "^0.6.3-alpha.44",
+    "@kmkf-fe-packages/kmkf-utils": "^0.6.3-alpha.47",
     "umi-request": "^1.4.0"
   },
   "devDependencies": {
@@ -42,5 +42,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "cbdb203dd7951559af410da4c7a1d2339bd45878"
+  "gitHead": "de3581c3b39bce27541b2e0ee33e376be31aea90"
 }