@cloudbase/weda-ui 0.2.17 → 2.0.8

package/src/mp/index.json

@@ -29,6 +29,7 @@
     "RichTextView": "components/richText/index",
     "Tabs": "components/tabs/index",
     "ListView": "components/listView/index",
+    "NavigationBar": "components/navigationBar/index",
     "DataView": "components/dataView/index",
     "Calendar": "components/calendar/index",
     "NavLayout": "components/navLayout/index",
@@ -36,7 +37,12 @@
     "Bar": "components/chart/bar/index",
     "Pie": "components/chart/pie/index",
     "StatisticsCard": "components/chart/statisticsCard/index",
-    "GraphicCard": "components/graphicCard/index"
+    "GraphicCard": "components/graphicCard/index",
+    "UserInfo": "components/wxOpenApi/userInfo/index",
+    "Phone": "components/wxOpenApi/phone/index",
+    "Share": "components/wxOpenApi/share/index",
+    "Lottery": "components/lottery/index",
+    "PhoneCode": "components/wxOpenApi/phoneCode/index"
   },
   "actions": {
     "showToast": "actions/showToast/index",

package/src/mp/style/weda-ui.wxss

@@ -6,6 +6,8 @@ page .weda-ui {
   --weui-BRAND: #006eff;
   --weui-TAG-TEXT-BLUE: #0067eb;
   --weui-BTN-DEFAULT-COLOR: #576b95;
+  --weui-WECHAT: #07c160;
+  --weui-TAG-TEXT-GREEN: #06ae56;
   --weui-BG-2: rgba(255, 255, 255, 0);
 }
 
@@ -38,3 +40,17 @@ page .weda-ui {
 .weda-ui.weda-picker .weui-btn_primary:not(.weui-btn_disabled):active {
   background-color: var(--weui-TAG-TEXT-BLUE);
 }
+
+.weda-ui .weui-cell {
+  font-size: 16px; /* 修改默认weui的17为16 */
+}
+
+.weui-cells__group_form .weui-cell::before, .weui-cells__group_form .weui-cells::before {
+  left: 16px;
+  right: 16px;
+}
+
+.weui-cells__group_form .weui-cells::after {
+    left: 16px;
+    right: 16px;
+}

package/src/mp/utils/constant.js

@@ -3,3 +3,18 @@ export const TitleType = {
   TOP: 'top',
   NONE: 'none',
 };
+
+export const REL_DICT = {
+  equal: 'eq', // 等于
+  unequal: 'neq', // 不等于
+  include: 'search', // 包含
+  exclude: '_exclude', // 不包含
+  begin_with: '_begin_with', // 开头是
+  greater: 'gt', // 大于
+  greater_or_equal: 'gte', // 大于等于
+  bigger_or_equal: 'gte', //大于等于
+  less: 'lt', // 小于
+  less_or_equal: 'lte', // 小于等于
+  in: 'in', // 多选值
+  not_in: 'nin', // 不在多选值
+};

package/src/mp/utils/destr.js

@@ -0,0 +1,48 @@
+// 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 JsonSigRx = /^["{[]|^-?[0-9][0-9.]{0,14}$/;
+function jsonParseTransform(key, 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;
+    }
+}

package/src/mp/utils/lodash.js

@@ -0,0 +1,2 @@
+// https://github.com/lodash/lodash/blob/4.17.15/lodash.js#L11973
+export const isNil = (val) => val == null;

package/src/mp/utils/platform.js

@@ -18,6 +18,16 @@ export const transSize = (size) => {
   const g = getBig(m);
   return `${g}G`;
 };
+
+/**
+ * 判断是否是url
+ */
+const reg =
+  // eslint-disable-next-line no-useless-escape
+  /(((^https?:(?:\/\/)?)(?:[-;:&=\+\$,\w]+@)?[A-Za-z0-9.-]+(?::\d+)?|(?:www.|[-;:&=\+\$,\w]+@)[A-Za-z0-9.-]+)((?:\/[\+~%\/.\w-_]*)?\??(?:[-\+=&;%@.\w_]*)#?(?:[\w]*))?)$/;
+
+export const isUrl = (path) => reg.test(path);
+
 /**
  * 生成随机数
  */

package/src/mp/utils/tcb.js

@@ -13,6 +13,32 @@ export async function getTempFileURL(data) {
   }
 }
 
+/**
+ * 云API：获取用户自定义导航内容
+ *  param
+ *  WeAppId: string,
+ *  EnvId: string,
+ *  PublishType?: string,
+ */
+export async function getAppCustomNav() {
+  try {
+    const PublishType = getApp().app.cloud?.IS_WEDA_IDE ? 'preview' : '';
+    const WeAppId = getApp().app?.id;
+    const res = await callWedaApi({
+      action: 'DescribeAppCustomNav',
+      serviceType: 'lowcode',
+      data: {
+        WeAppId,
+        PublishType,
+      },
+    });
+    return res;
+  } catch (error) {
+    console.error('错误', error);
+    return {};
+  }
+}
+
 /**
  * 调用微搭后端API服务
  */
@@ -30,3 +56,21 @@ export async function callDataSource(param) {
     return await getApp().app.cloud.callDataSource(param);
   }
 }
+
+/**
+ * 云函数获取数据
+ */
+export async function callDataSourceApi(param) {
+  const { params, dataSourceName, methodName } = param;
+  try {
+    const res = await getApp()?.app?.cloud?.callDataSource?.({
+      params,
+      dataSourceName,
+      methodName,
+    });
+    return res;
+  } catch (error) {
+    console.error('错误', error);
+    return {};
+  }
+}

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

@@ -6,6 +6,14 @@
   background-color: var(--weui-BRAND);
 }
 
+.weda-button.weui-btn.weui-btn_primary.weui-btn_wechat:not(.weui-btn_disabled):active {
+  background-color: var(--weui-TAG-TEXT-GREEN);
+}
+
+.weda-button.weui-btn_primary.weui-btn_wechat {
+  background-color: var(--weui-WECHAT);
+}
+
 .weda-button.weda-button-mini {
   font-size: smaller;
 }
@@ -17,4 +25,3 @@
   text-align: center;
   width: 100%;
 }
-

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

@@ -8,13 +8,13 @@ import './index.css';
 
 // 不用 react-weui 而直接用底层实现的原因是 react-weui 不能支持表单类型
 const Button = ({
-  text = '按钮',
-  size = 'default',
-  type = 'primary',
+  text,
+  size,
+  type,
   contentSlot,
   formType,
-  loading = false,
-  disabled = false,
+  loading,
+  disabled,
   events = ({} as Record<string, unknownFunction>),
   className,
   style,
@@ -29,9 +29,10 @@ const Button = ({
     'weda-button-mini': size === 'mini',
     'weui-btn': isH5,
     'weui-btn_mini': isH5 && size === 'mini',
-    'weui-btn_primary': isH5 && type === 'primary',
+    'weui-btn_primary': isH5 && (type === 'primary' || type === 'wechat'),
     'weui-btn_default': isH5 && type === 'default',
     'weui-btn_warn': isH5 && type === 'warn',
+    'weui-btn_wechat': isH5 && type === 'wechat',
     'weui-btn_disabled': isH5 && disabled,
     [className]: className,
   });
@@ -60,7 +61,7 @@ const Button = ({
 return (
   <ConfigProvider classPrefix="wedatea2td">
     <TeaButton
-      loading={loading} 
+      loading={loading}
       onClick={onClick}
       disabled={disabled}
       htmlType={formType}
@@ -90,7 +91,7 @@ export interface PropsType extends CommonPropsType {
   /**
    * 样式类型
    */
-  type?: "primary" | "warn" | "default";
+  type?: 'primary' | 'warn' | 'wechat' | 'default';
   /**
    * 大小
    */
@@ -111,4 +112,4 @@ export interface PropsType extends CommonPropsType {
   contentSlot?: string;
 }
 
-export default Button;
+export default Button;

package/src/web/components/calendar/index.jsx

@@ -19,7 +19,7 @@ const isShowWeekend = true; // 是否显示周末
 export default function Calendar({
   className,
   style,
-  initVisible = true,
+  initVisible,
   initValue,
   configData = [],
 }) {

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

@@ -50,15 +50,15 @@ export interface PropsType extends CommonPropsType {
 export default function Carousel({
   className,
   style = {},
-  autoplay = true,
-  circular = true,
-  vertical = false,
+  autoplay,
+  circular,
+  vertical,
   indicatorDots,
-  indicatorColor = 'rgba(200, 200, 200, 0.9)',
-  indicatorActiveColor = 'rgba(0, 0, 0, 0.9)',
-  duration = 500,
-  interval = 5000,
-  current = 0,
+  indicatorColor,
+  indicatorActiveColor,
+  duration,
+  interval,
+  current,
   events = {},
   id,
   images,

package/src/web/components/chart/bar/index.tsx

@@ -40,45 +40,46 @@ interface PropsType extends CommonPropsType {
   decimalDigits?: number;
   suffix?: string;
 }
-export default function Bar({
-  directionType,
-  isPile,
-  id,
-  style,
-  className,
-  isTitle,
-  title,
-  titleLocation,
-  dataSource,
-  setColor,
-  filterData,
-  xField,
-  xStatistics,
-  groupKey,
-  groupKeyTimeSpan,
-  xIsCountEmpty,
-  yField,
-  isLegend,
-  legend,
-  legend2,
-  isXaxisName,
-  xAxisName,
-  isXaxisAxisLabelShow,
-  isXaxisAxisTickShow,
-  isXaxisAxisLabelRotate,
-  isYAxisSplitlineLinestyleWidth,
-  yAxisSplitlineLinestyleType,
-  yAxisMax,
-  yAxisMin,
-  isYAxisName,
-  yAxisName,
-  isSeriesShowSymbol,
-  isYAxisShow,
-  isUnit,
-  unit,
-  decimalDigits,
-  suffix,
-}: PropsType) {
+export default function Bar(opts: PropsType) {
+  const {
+    directionType,
+    isPile,
+    id,
+    style,
+    className,
+    isTitle,
+    title,
+    titleLocation,
+    dataSource,
+    setColor,
+    filterData,
+    xField,
+    xStatistics,
+    groupKey,
+    groupKeyTimeSpan,
+    xIsCountEmpty,
+    yField,
+    isLegend,
+    legend,
+    legend2,
+    isXaxisName,
+    xAxisName,
+    isXaxisAxisLabelShow,
+    isXaxisAxisTickShow,
+    isXaxisAxisLabelRotate,
+    isYAxisSplitlineLinestyleWidth,
+    yAxisSplitlineLinestyleType,
+    yAxisMax,
+    yAxisMin,
+    isYAxisName,
+    yAxisName,
+    isSeriesShowSymbol,
+    isYAxisShow,
+    isUnit,
+    unit,
+    decimalDigits,
+    suffix,
+  } = opts;
   const domRef = useRef<HTMLDivElement>();
   useWedaChart(domRef, EchartBar, {
     directionType,

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

@@ -47,4 +47,4 @@ const getConfig = () => {
   return lineH5;
 };
 
-module.exports = getConfig;
+export default getConfig;

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

@@ -39,10 +39,11 @@ class EchartBar extends EchartBase {
         params,
       );
       // 获取 x 轴数据
-      const arrXaxisData = this.setXaxis(arrSourData, xField.format);
+      const sortedXAxisData = this.sortXAxisData(arrSourData, xField.format);
+      const arrXaxisData = this.setXaxis(sortedXAxisData, xField.format);
       const arrXisCountEmptyIndex = []; // 记录空值的key
-      if (!groupKey) {
-        const numLine = arrSourData[0].YLabels.length;
+      if (Object.keys(groupKey ?? {}).length === 0) {
+        const numLine = sortedXAxisData[0].YLabels.length;
         if (numLine > 0) {
           for (let j = 0; j < numLine; j++) {
             this.config.series[j] = {
@@ -56,9 +57,9 @@ class EchartBar extends EchartBase {
               },
               data: [],
             };
-            arrSourData.forEach((itemSource,index) => {
+            sortedXAxisData.forEach((itemSource,index) => {
               this.config.series[j].name = itemSource.YLabels[j].Cn_Name;
-              if ((!itemSource.YLabels[j].Value || itemSource.YLabels[j].Value === 0 || 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;
@@ -73,7 +74,7 @@ class EchartBar extends EchartBase {
         // 如果是分组，则这里需要特殊处理
         // 按groupKey分组存放数据值
         const objGroupKey = {}; // {'分组字段':[{value:'统计的值', dimensionality:'维度名', name:'统计的数值字段名'}]}
-        arrSourData.forEach((itemSourData) => {
+        sortedXAxisData.forEach((itemSourData) => {
           itemSourData.YLabels.forEach((yLabel) => {
             if (!objGroupKey[yLabel.Group_Name]) {
               objGroupKey[yLabel.Group_Name] = [];

package/src/web/components/chart/common/core/eChartBase.ts

@@ -188,8 +188,25 @@ class EchartBase extends AbstractEchartBaseModal {
    * @param { Array<object> } arrData 后台返回的数据
    * @param { string } formatType 类型 datetime：日期时间;date:日期，time：时间，其它
    */
-  protected setXaxis(arrData, formatType = '') {
+  protected setXaxis(sortedXAxisData, formatType) {
     const xAxisData = [];
+    if (sortedXAxisData.length > 0) {
+      sortedXAxisData.forEach((itemSource) => {
+        let value = itemSource.XLabel.Value;
+        if (formatType === 'datetime') {
+          value =  this.formatTime(itemSource.XLabel.Value, 'dt');
+        } else if (formatType === 'date') {
+          value =  this.formatTime(itemSource.XLabel.Value, 'd');
+        } else if (formatType === 'time') {
+          value =  this.formatTime(itemSource.XLabel.Value, 't');
+        }
+        xAxisData.push(value);
+      });
+      this.config.xAxis.data = xAxisData;
+    }
+    return xAxisData;
+  }
+  protected sortXAxisData(arrData, formatType = ''): Array<any> {
     let xFields = [...arrData];
     if(['datetime', 'date', 'time'].includes(formatType)) {
       xFields.sort((a, b) => {
@@ -205,21 +222,8 @@ class EchartBase extends AbstractEchartBaseModal {
         }
       });
     }
-    if (arrData.length > 0) {
-      xFields.forEach((itemSource) => {
-        let value = itemSource.XLabel.Value;
-        if (formatType === 'datetime') {
-          value =  this.formatTime(itemSource.XLabel.Value, 'dt');
-        } else if (formatType === 'date') {
-          value =  this.formatTime(itemSource.XLabel.Value, 'd');
-        } else if (formatType === 'time') {
-          value =  this.formatTime(itemSource.XLabel.Value, 't');
-        }
-        xAxisData.push(value);
-      });
-      this.config.xAxis.data = xAxisData;
-    }
-    return xAxisData;
+
+    return xFields;
   }
 
   /**

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

@@ -38,10 +38,12 @@ class EchartLine extends EchartBase {
         params,
       );
       // 获取 x 轴数据
-      const arrXaxisData = this.setXaxis(arrSourData, xField.format);
+
+      const sortedXAxisData = this.sortXAxisData(arrSourData, xField.format);
+      const arrXaxisData = this.setXaxis(sortedXAxisData, xField.format);
       const arrXisCountEmptyIndex = []; // 记录空值的key
-      if (!groupKey) {
-        const numLine = arrSourData[0].YLabels.length;
+      if (Object.keys(groupKey ?? {}).length === 0) {
+        const numLine = sortedXAxisData[0].YLabels.length;
         if (numLine > 0) {
           for (let j = 0; j < numLine; j++) {
             this.config.series[j] = {
@@ -55,9 +57,9 @@ class EchartLine extends EchartBase {
               },
               data: [],
             };
-            arrSourData.forEach((itemSource,index) => {
+            sortedXAxisData.forEach((itemSource,index) => {
               this.config.series[j].name = itemSource.YLabels[j].Cn_Name;
-              if ((!itemSource.YLabels[j].Value || itemSource.YLabels[j].Value === 0 || 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;
@@ -72,7 +74,7 @@ class EchartLine extends EchartBase {
         // 如果是分组，则这里需要特殊处理
         // 按groupKey分组存放数据值
         const objGroupKey = {}; // {'分组字段':[{value:'统计的值', dimensionality:'维度名', name:'统计的数值字段名'}]}
-        arrSourData.forEach((itemSourData) => {
+        sortedXAxisData.forEach((itemSourData) => {
           itemSourData.YLabels.forEach((yLabel) => {
             if (!objGroupKey[yLabel.Group_Name]) {
               objGroupKey[yLabel.Group_Name] = [];

package/src/web/components/chart/line/index.tsx

@@ -38,45 +38,46 @@ interface PropsType extends CommonPropsType {
   decimalDigits?: number;
   suffix?: string;
 }
-export default function Line({
-  id,
-  style,
-  events,
-  className,
-  children,
-  chartType,
-  isTitle,
-  title,
-  titleLocation,
-  dataSource,
-  filterData,
-  xField,
-  xStatistics,
-  xIsCountEmpty,
-  yField,
-  groupKey,
-  groupKeyTimeSpan,
-  isLegend,
-  legend,
-  legend2,
-  isXaxisName,
-  xAxisName,
-  isXaxisAxisLabelShow,
-  isXaxisAxisTickShow,
-  isXaxisAxisLabelRotate,
-  isYAxisSplitlineLinestyleWidth,
-  yAxisSplitlineLinestyleType,
-  yAxisMax,
-  yAxisMin,
-  isYAxisName,
-  yAxisName,
-  isSeriesShowSymbol,
-  isYAxisShow,
-  isUnit,
-  unit,
-  decimalDigits,
-  suffix,
-}: PropsType) {
+export default function Line(opts: PropsType) {
+  const {
+    id,
+    style,
+    events,
+    className,
+    children,
+    chartType,
+    isTitle,
+    title,
+    titleLocation,
+    dataSource,
+    filterData,
+    xField,
+    xStatistics,
+    xIsCountEmpty,
+    yField,
+    groupKey,
+    groupKeyTimeSpan,
+    isLegend,
+    legend,
+    legend2,
+    isXaxisName,
+    xAxisName,
+    isXaxisAxisLabelShow,
+    isXaxisAxisTickShow,
+    isXaxisAxisLabelRotate,
+    isYAxisSplitlineLinestyleWidth,
+    yAxisSplitlineLinestyleType,
+    yAxisMax,
+    yAxisMin,
+    isYAxisName,
+    yAxisName,
+    isSeriesShowSymbol,
+    isYAxisShow,
+    isUnit,
+    unit,
+    decimalDigits,
+    suffix,
+  } = opts;
   const domRef = useRef<HTMLDivElement>();
   useWedaChart(domRef, EChartLine, {
     chartType,

package/src/web/components/chart/statisticsCard/index.tsx

@@ -127,20 +127,41 @@ export function customToFixed(num, digit = 0) {
   return integer;
 }
 
+/**
+ * 添加千位分隔符
+ * @param fixedString
+ * @param digit
+ */
+export function addDelimiter(fixedString, digit) {
+  let len = fixedString.length;
+  let result = '';
+  const decimalPoint = digit > 0 ? digit + 1 : 0;
+  for (let i = len - 1; i >= 0; i--) {
+    let stepFromTail = len - 1 - i;
+    let char = fixedString.charAt(i);
+
+    if (stepFromTail <= decimalPoint) {
+      // 小数部分不处理
+      result = char + result;
+    } else {
+      if ((stepFromTail - decimalPoint) % 3 === 0) {
+        if (char !== '-') {
+          result = ',' + result;
+        }
+      }
+      result = char + result;
+    }
+  }
+  return result;
+}
+
 /**
  * 格式化：添加千分符，四舍五入
  * @param val
  * @param digits
  */
 const formatNumber = (val, digits = 0) => {
-  return isNaN(val)
-    ? val
-    : Intl
-    ? Intl.NumberFormat('en-US', {
-        maximumFractionDigits: 10,
-        minimumFractionDigits: digits,
-      }).format(+customToFixed(val, digits))
-    : val;
+  return isNaN(val) ? val : addDelimiter(customToFixed(val, digits), digits);
 };
 
 export default function StatisticsCard({