@cloudbase/weda-ui 2.0.10 → 2.0.11

package/src/mp/utils/destr.js

@@ -1,48 +1,49 @@
 // https://github.com/unjs/destr/blob/2f6612533dd798d2ff5786274f2244558f86d09c/src/index.ts
 // https://github.com/fastify/secure-json-parse
 // https://github.com/hapijs/bourne
-const suspectProtoRx = /"(?:_|\\u005[Ff])(?:_|\\u005[Ff])(?:p|\\u0070)(?:r|\\u0072)(?:o|\\u006[Ff])(?:t|\\u0074)(?:o|\\u006[Ff])(?:_|\\u005[Ff])(?:_|\\u005[Ff])"\s*:/;
-const suspectConstructorRx = /"(?:c|\\u0063)(?:o|\\u006[Ff])(?:n|\\u006[Ee])(?:s|\\u0073)(?:t|\\u0074)(?:r|\\u0072)(?:u|\\u0075)(?:c|\\u0063)(?:t|\\u0074)(?:o|\\u006[Ff])(?:r|\\u0072)"\s*:/;
+const suspectProtoRx =
+  /"(?:_|\\u005[Ff])(?:_|\\u005[Ff])(?:p|\\u0070)(?:r|\\u0072)(?:o|\\u006[Ff])(?:t|\\u0074)(?:o|\\u006[Ff])(?:_|\\u005[Ff])(?:_|\\u005[Ff])"\s*:/;
+const suspectConstructorRx =
+  /"(?:c|\\u0063)(?:o|\\u006[Ff])(?:n|\\u006[Ee])(?:s|\\u0073)(?:t|\\u0074)(?:r|\\u0072)(?:u|\\u0075)(?:c|\\u0063)(?:t|\\u0074)(?:o|\\u006[Ff])(?:r|\\u0072)"\s*:/;
 const JsonSigRx = /^["{[]|^-?[0-9][0-9.]{0,14}$/;
 function jsonParseTransform(key, value) {
-    if (key === '__proto__' || key === 'constructor') {
-        return;
-    }
-    return value;
+  if (key === '__proto__' || key === 'constructor') {
+    return;
+  }
+  return value;
 }
 export default function destr(val) {
-    if (typeof val !== 'string') {
-        return val;
-    }
-    const _lval = val.toLowerCase();
-    if (_lval === 'true') {
-        return true;
-    }
-    if (_lval === 'false') {
-        return false;
-    }
-    if (_lval === 'null') {
-        return null;
-    }
-    if (_lval === 'nan') {
-        return NaN;
-    }
-    if (_lval === 'infinity') {
-        return Infinity;
-    }
-    if (_lval === 'undefined') {
-        return undefined;
-    }
-    if (!JsonSigRx.test(val)) {
-        return val;
-    }
-    try {
-        if (suspectProtoRx.test(val) || suspectConstructorRx.test(val)) {
-            return JSON.parse(val, jsonParseTransform);
-        }
-        return JSON.parse(val);
-    }
-    catch (_e) {
-        return val;
-    }
+  if (typeof val !== 'string') {
+    return val;
+  }
+  const _lval = val.toLowerCase();
+  if (_lval === 'true') {
+    return true;
+  }
+  if (_lval === 'false') {
+    return false;
+  }
+  if (_lval === 'null') {
+    return null;
+  }
+  if (_lval === 'nan') {
+    return NaN;
+  }
+  if (_lval === 'infinity') {
+    return Infinity;
+  }
+  if (_lval === 'undefined') {
+    return undefined;
+  }
+  if (!JsonSigRx.test(val)) {
+    return val;
+  }
+  try {
+    if (suspectProtoRx.test(val) || suspectConstructorRx.test(val)) {
+      return JSON.parse(val, jsonParseTransform);
+    }
+    return JSON.parse(val);
+  } catch (_e) {
+    return val;
+  }
 }

package/src/mp/utils/dr_square_point.js

@@ -10,16 +10,20 @@
 function dr_square_point($lng, $lat, $distance = 0.5) {
   $distance = $distance ? $distance : 1;
   let $r = 6371; //地球半径，平均半径为6371km
-  let $dlng = 2 * Math.asin(Math.sin($distance / (2 * $r)) / Math.cos($lat * (Math.PI / 180)));
+  let $dlng =
+    2 *
+    Math.asin(
+      Math.sin($distance / (2 * $r)) / Math.cos($lat * (Math.PI / 180))
+    );
   $dlng = $dlng * (180 / Math.PI);
   let $dlat = $distance / $r;
   $dlat = $dlat * (180 / Math.PI);
   return {
-    'leftTop': [$lat + $dlat, $lng - $dlng],
-    'leftBottom': [$lat - $dlat, $lng - $dlng],
-    'rightBottom': [$lat - $dlat, $lng + $dlng],
-    'rightTop': [$lat + $dlat, $lng + $dlng],
+    leftTop: [$lat + $dlat, $lng - $dlng],
+    leftBottom: [$lat - $dlat, $lng - $dlng],
+    rightBottom: [$lat - $dlat, $lng + $dlng],
+    rightTop: [$lat + $dlat, $lng + $dlng],
   };
 }
 
-export default dr_square_point;
+export default dr_square_point;

package/src/setupTests.js

@@ -1,14 +1,14 @@
-require("regenerator-runtime");
+require('regenerator-runtime');
 Object.defineProperty(window, 'matchMedia', {
-    writable: true,
-    value: jest.fn().mockImplementation(query => ({
-      matches: false,
-      media: query,
-      onchange: null,
-      addListener: jest.fn(), // Deprecated
-      removeListener: jest.fn(), // Deprecated
-      addEventListener: jest.fn(),
-      removeEventListener: jest.fn(),
-      dispatchEvent: jest.fn(),
-    })),
-  });
+  writable: true,
+  value: jest.fn().mockImplementation((query) => ({
+    matches: false,
+    media: query,
+    onchange: null,
+    addListener: jest.fn(), // Deprecated
+    removeListener: jest.fn(), // Deprecated
+    addEventListener: jest.fn(),
+    removeEventListener: jest.fn(),
+    dispatchEvent: jest.fn(),
+  })),
+});

package/src/web/components/button/index.tsx

@@ -1,8 +1,12 @@
 import * as React from 'react';
-import { Button as TeaButton, ButtonProps, ConfigProvider } from 'tea-component';
+import {
+  Button as TeaButton,
+  ButtonProps,
+  ConfigProvider,
+} from 'tea-component';
 import classNames from '../../utils/classnames';
 import { usePlatform } from '../../utils/platform';
-import { CommonPropsType, unknownFunction } from '../../types';
+import type { CommonPropsType, unknownFunction } from '../../types';
 
 import './index.css';
 
@@ -15,7 +19,7 @@ const Button = ({
   formType,
   loading,
   disabled,
-  events = ({} as Record<string, unknownFunction>),
+  events = {} as Record<string, unknownFunction>,
   className,
   style,
   id,
@@ -38,48 +42,48 @@ const Button = ({
   });
   const onClick = (e) => events.tap({}, { originEvent: e });
 
-  if(platform === 'h5') {
+  if (platform === 'h5') {
     return (
       <button
-      className={cls}
-      disabled={disabled}
-      type={formType}
-      style={style}
-      id={id}
-      onClick={onClick}
+        className={cls}
+        disabled={disabled}
+        type={formType}
+        style={style}
+        id={id}
+        onClick={onClick}
       >
-      {loading && (
-        <span className="weui-btn_loading">
-          <i className="weui-loading" />
-        </span>
-      )}
-      {text ? text : contentSlot}
-    </button>
-  );
-}
+        {loading && (
+          <span className="weui-btn_loading">
+            <i className="weui-loading" />
+          </span>
+        )}
+        {text ? text : contentSlot}
+      </button>
+    );
+  }
 
-return (
-  <ConfigProvider classPrefix="wedatea2td">
-    <TeaButton
-      loading={loading}
-      onClick={onClick}
-      disabled={disabled}
-      htmlType={formType}
-      type={toTeaButtonType(type)}
-      style={style}
-      className={cls}
-      id={id}
+  return (
+    <ConfigProvider classPrefix="wedatea2td">
+      <TeaButton
+        loading={loading}
+        onClick={onClick}
+        disabled={disabled}
+        htmlType={formType}
+        type={toTeaButtonType(type)}
+        style={style}
+        className={cls}
+        id={id}
       >
-      {text ? text : contentSlot}
-    </TeaButton>
-  </ConfigProvider>
-);
+        {text ? text : contentSlot}
+      </TeaButton>
+    </ConfigProvider>
+  );
 };
 
-function toTeaButtonType(type: PropsType['type'] ): ButtonProps['type'] {
-  if(type === 'primary') return type;
-  if(type === 'warn') return 'error';
-  if(type === 'default') return 'primary';
+function toTeaButtonType(type: PropsType['type']): ButtonProps['type'] {
+  if (type === 'primary') return type;
+  if (type === 'warn') return 'error';
+  if (type === 'default') return 'primary';
   return 'primary';
 }
 
@@ -95,7 +99,7 @@ export interface PropsType extends CommonPropsType {
   /**
    * 大小
    */
-  size?: "default" | "mini" | "large";
+  size?: 'default' | 'mini' | 'large';
   /**
    * 是否禁用
    */
@@ -108,7 +112,7 @@ export interface PropsType extends CommonPropsType {
   /**
    * 用于 form 类型
    */
-  formType?: "button" | "submit" | "reset";
+  formType?: 'button' | 'submit' | 'reset';
   contentSlot?: string;
 }
 

package/src/web/components/carousel/index.tsx

@@ -9,7 +9,7 @@ import {
 } from '@react-hookz/web';
 
 import './index.css';
-import { CommonPropsType } from '../../types';
+import type { CommonPropsType } from '../../types';
 
 import Image from '../image';
 interface imagesItem {

package/src/web/components/chart/common/config/bar.js

@@ -11,7 +11,7 @@ const getConfig = () => {
       axisTick: {
         show: true, // 刻度显示
       },
-      inverse:false,
+      inverse: false,
       type: 'category',
       data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
     },

package/src/web/components/chart/common/core/eChartBar.js

@@ -19,7 +19,7 @@ class EchartBar extends EchartBase {
     groupKey,
     groupKeyTimeSpan,
     yField,
-    isPile
+    isPile,
   }) {
     const { name = '', type = '', methodName = '' } = dataSource;
     if (name !== '') {
@@ -36,7 +36,7 @@ class EchartBar extends EchartBase {
         name,
         methodName,
         type,
-        params,
+        params
       );
       // 获取 x 轴数据
       const sortedXAxisData = this.sortXAxisData(arrSourData, xField.format);
@@ -57,12 +57,18 @@ class EchartBar extends EchartBase {
               },
               data: [],
             };
-            sortedXAxisData.forEach((itemSource,index) => {
+            sortedXAxisData.forEach((itemSource, index) => {
               this.config.series[j].name = itemSource.YLabels[j].Cn_Name;
-              if ((itemSource.YLabels[j].Value === undefined || itemSource.YLabels[j].Value === null) && !xIsCountEmpty) {
+              if (
+                (itemSource.YLabels[j].Value === undefined ||
+                  itemSource.YLabels[j].Value === null) &&
+                !xIsCountEmpty
+              ) {
                 arrXisCountEmptyIndex.push(index);
               } else {
-                const value = itemSource.YLabels[j].Value ? itemSource.YLabels[j].Value : 0;
+                const value = itemSource.YLabels[j].Value
+                  ? itemSource.YLabels[j].Value
+                  : 0;
                 this.config.series[j].data.push(value);
               }
             });
@@ -87,7 +93,6 @@ class EchartBar extends EchartBase {
           });
         });
 
-
         // 组装图表需要的数据
         const arrGroupKey = Object.keys(objGroupKey);
         this.config.series = arrGroupKey.map((groupKey) => {
@@ -102,23 +107,13 @@ class EchartBar extends EchartBase {
             label: {
               show: true,
             },
-            data: this.getSeriesDataGroup(
-              arrXaxisData,
-              objGroupKey[groupKey],
-            ),
+            data: this.getSeriesDataGroup(arrXaxisData, objGroupKey[groupKey]),
             stack: isPile ? 'pile' : null,
           };
           return serie;
         });
-        this.config.tooltip.formatter = params => (
-          `${params.data.dimensionality
-          }\r\n${
-            params.data.name
-          }\r\n${
-            params.seriesName
-          }:${
-            params.value}`
-        );
+        this.config.tooltip.formatter = (params) =>
+          `${params.data.dimensionality}\r\n${params.data.name}\r\n${params.seriesName}:${params.value}`;
       }
     }
   }
@@ -138,19 +133,17 @@ class EchartBar extends EchartBase {
     isUnit,
     unit,
     decimalDigits,
-    suffix
+    suffix,
   }) {
     decimalDigits = Math.max(0, decimalDigits);
-    this.config.series.length > 0
-      && this.config.series.forEach((itemSeries) => {
+    this.config.series.length > 0 &&
+      this.config.series.forEach((itemSeries) => {
         itemSeries.showSymbol = isSeriesShowSymbol;
         itemSeries.label.show = isSeriesShowSymbol;
         if (isUnit) {
           itemSeries.label.formatter = (params) => {
             const objNewValue = this.getValueByUnit(params.value, unit);
-            return (
-              `${objNewValue.toFixed(decimalDigits)}${suffix}`
-            );
+            return `${objNewValue.toFixed(decimalDigits)}${suffix}`;
           };
         }
       });
@@ -165,17 +158,18 @@ class EchartBar extends EchartBase {
   }
 
   // 设置柱状图X,Y倒转
-  setDirectionType({directionType}) {
+  setDirectionType({ directionType }) {
     let temAxis = {};
-    if (directionType === 'crosswise') { // 横向
+    if (directionType === 'crosswise') {
+      // 横向
       temAxis = this.config.xAxis;
       // @ts-ignore
       this.config.xAxis = this.config.yAxis;
       // @ts-ignore
       this.config.yAxis = temAxis;
-      this.config.yAxis.inverse =  true;
-
-    } else { // 纵向
+      this.config.yAxis.inverse = true;
+    } else {
+      // 纵向
       if (this.config.yAxis.inverse) {
         temAxis = this.config.yAxis;
         // @ts-ignore
@@ -220,7 +214,7 @@ class EchartBar extends EchartBase {
     isUnit,
     unit,
     decimalDigits,
-    suffix
+    suffix,
   }) {
     legend = document.body.clientWidth < 1024 ? legend : legend2;
     if (dataSource) {
@@ -233,7 +227,7 @@ class EchartBar extends EchartBase {
         groupKey,
         groupKeyTimeSpan,
         yField,
-        isPile
+        isPile,
       });
     }
     this.setColor({ setColor });
@@ -255,9 +249,9 @@ class EchartBar extends EchartBase {
       isUnit,
       unit,
       decimalDigits,
-      suffix
+      suffix,
     });
-    this.setDirectionType({directionType});
+    this.setDirectionType({ directionType });
     return this.config;
   }
 }

package/src/web/components/chart/common/core/eChartLine.js

@@ -35,7 +35,7 @@ class EchartLine extends EchartBase {
         name,
         methodName,
         type,
-        params,
+        params
       );
       // 获取 x 轴数据
 
@@ -57,12 +57,18 @@ class EchartLine extends EchartBase {
               },
               data: [],
             };
-            sortedXAxisData.forEach((itemSource,index) => {
+            sortedXAxisData.forEach((itemSource, index) => {
               this.config.series[j].name = itemSource.YLabels[j].Cn_Name;
-              if ((itemSource.YLabels[j].Value === undefined || itemSource.YLabels[j].Value === null) && !xIsCountEmpty) {
+              if (
+                (itemSource.YLabels[j].Value === undefined ||
+                  itemSource.YLabels[j].Value === null) &&
+                !xIsCountEmpty
+              ) {
                 arrXisCountEmptyIndex.push(index);
               } else {
-                const value = itemSource.YLabels[j].Value ? itemSource.YLabels[j].Value : 0;
+                const value = itemSource.YLabels[j].Value
+                  ? itemSource.YLabels[j].Value
+                  : 0;
                 this.config.series[j].data.push(value);
               }
             });
@@ -90,38 +96,28 @@ class EchartLine extends EchartBase {
         // 组装图表需要的数据
         const groupNames = Object.keys(objGroupKey);
         this.config.series = groupNames.map((groupKey) => {
-            // groupKey分组字段中文名
-            const serie = {
-              name: groupKey,
-              connectNulls: true,
-              data: this.getSeriesDataGroup(
-                arrXaxisData,
-                objGroupKey[groupKey],
-              ),
-              type: 'line',
-              smooth: true,
-              showSymbol: true, // 是否显示线条上数据标签
-              label: {
-                show: true, // 显示线条上的数据
-              },
-            };
-            return serie;
-          });
-        this.config.tooltip.formatter = params => (
-          `${params.data.dimensionality
-          }\r\n${
-            params.data.name
-          }\r\n${
-            params.seriesName
-          }:${
-            params.value}`
-        );
+          // groupKey分组字段中文名
+          const serie = {
+            name: groupKey,
+            connectNulls: true,
+            data: this.getSeriesDataGroup(arrXaxisData, objGroupKey[groupKey]),
+            type: 'line',
+            smooth: true,
+            showSymbol: true, // 是否显示线条上数据标签
+            label: {
+              show: true, // 显示线条上的数据
+            },
+          };
+          return serie;
+        });
+        this.config.tooltip.formatter = (params) =>
+          `${params.data.dimensionality}\r\n${params.data.name}\r\n${params.seriesName}:${params.value}`;
       }
     }
   }
   setChartType({ chartType }) {
-    this.config.series.length > 0
-      && this.config.series.forEach((itemSeries) => {
+    this.config.series.length > 0 &&
+      this.config.series.forEach((itemSeries) => {
         itemSeries.smooth = chartType !== 'line';
       });
   }
@@ -132,19 +128,17 @@ class EchartLine extends EchartBase {
     isUnit,
     unit,
     decimalDigits,
-    suffix
+    suffix,
   }) {
     decimalDigits = decimalDigits < 0 ? 0 : decimalDigits;
-    this.config.series.length > 0
-      && this.config.series.forEach((itemSeries) => {
+    this.config.series.length > 0 &&
+      this.config.series.forEach((itemSeries) => {
         itemSeries.showSymbol = isSeriesShowSymbol;
         itemSeries.label.show = isSeriesShowSymbol;
         if (isUnit) {
           itemSeries.label.formatter = (params) => {
             const objNewValue = this.getValueByUnit(params.value, unit);
-            return (
-              `${objNewValue.toFixed(decimalDigits)}${suffix}`
-            );
+            return `${objNewValue.toFixed(decimalDigits)}${suffix}`;
           };
         }
       });
@@ -189,7 +183,7 @@ class EchartLine extends EchartBase {
     isUnit,
     unit,
     decimalDigits,
-    suffix
+    suffix,
   }) {
     if (dataSource) {
       await this.setSourceData({
@@ -223,7 +217,7 @@ class EchartLine extends EchartBase {
       isUnit,
       unit,
       decimalDigits,
-      suffix
+      suffix,
     });
   }
 }

package/src/web/components/chart/common/core/eChartPie.js

@@ -32,7 +32,7 @@ class EchartPie extends EchartBase {
         name,
         methodName,
         type,
-        params,
+        params
       );
       // 获取 x 轴数据
       if (arrSourData.length >= 0) {
@@ -59,8 +59,8 @@ class EchartPie extends EchartBase {
     }
   }
   setChartType({ chartType }) {
-    this.config.series.length > 0
-      && this.config.series.forEach((itemSeries) => {
+    this.config.series.length > 0 &&
+      this.config.series.forEach((itemSeries) => {
         if (chartType === 'pie') {
           itemSeries.radius = '70%';
         } else {
@@ -77,7 +77,7 @@ class EchartPie extends EchartBase {
     isUnit,
     unit,
     decimalDigits,
-    suffix
+    suffix,
   }) {
     decimalDigits = decimalDigits < 0 ? 0 : decimalDigits;
     let show = false;
@@ -94,10 +94,12 @@ class EchartPie extends EchartBase {
     } else {
       this.config.series[0].label.normal.formatter = (objValue) => {
         let reData = '';
-        if (isSeriesShowSymbol) { // 显示数值
+        if (isSeriesShowSymbol) {
+          // 显示数值
           reData = objValue.value;
         }
-        if (isUnit) { // 显示单位
+        if (isUnit) {
+          // 显示单位
           if (unit) {
             const objNewValue = this.getValueByUnit(objValue.value, unit);
             reData = `${objNewValue.toFixed(decimalDigits)}${suffix}`;
@@ -111,7 +113,8 @@ class EchartPie extends EchartBase {
             };
           });
         }
-        if (isPercent) { // 显示百分比
+        if (isPercent) {
+          // 显示百分比
           reData = `${reData}(${objValue.percent}%)`;
         }
         return reData;
@@ -138,7 +141,7 @@ class EchartPie extends EchartBase {
     isUnit,
     unit,
     decimalDigits,
-    suffix
+    suffix,
   }) {
     legend = document.body.clientWidth < 1024 ? legend : legend2;
     if (dataSource) {
@@ -162,7 +165,7 @@ class EchartPie extends EchartBase {
       isUnit,
       unit,
       decimalDigits,
-      suffix
+      suffix,
     });
   }
 }

package/src/web/components/form/form/index.tsx

@@ -1,9 +1,9 @@
 import * as React from 'react';
 import classNames from '../../../utils/classnames';
 import './index.css';
-import {ConfigProvider, Form as TeaForm} from 'tea-component';
+import { ConfigProvider, Form as TeaForm } from 'tea-component';
 import { usePlatform } from '../../../utils/platform';
-import { CommonFormPropsType } from '../types';
+import type { CommonFormPropsType } from '../types';
 
 export default function Form({
   // 系统属性
@@ -26,14 +26,14 @@ export default function Form({
     'gsd-h5-react-form-pc': platform === 'pc',
     [className]: className,
   });
-  if(platform === 'pc') {
+  if (platform === 'pc') {
     return (
       <ConfigProvider classPrefix="wedatea2td">
         {/** @ts-expect-error tea form id */}
         <TeaForm className={cls} style={style} id={id}>
           {contentSlot}
-      </TeaForm>
-    </ConfigProvider>
+        </TeaForm>
+      </ConfigProvider>
     );
   }
   return (