Merge branch 'master' of http://scjoyedu.eicp.net:9121/front-team/webPublic

one_stop_public/tableCompon/Split_Index/EchartsDiy/index.js

+import React, { useMemo } from 'react';
+import ReactEcharts from 'echarts-for-react';
+
+export default function EchartsDiy(props){
+  const { json, uuid, option, value } = props;
+  const opt = useMemo(() => {
+    return (value && typeof value === 'object' && Object.keys(value).length) ? value : option;
+  }, [value, option]);
+  // console.log(opt);
+  if(!opt){
+    return null;
+  }
+  return (
+    <ReactEcharts
+      style={{ height: json.height || 500 }}
+      key={uuid}
+      option={opt}
+      notMerge={true}
+      lazyUpdate={true}
+      theme={'theme_name'}
+      onEvents={{}}
+    />
+  )
+}

zyd_public/utils/hrefWithToken.js

@@ -4,13 +4,19 @@ import { getInfo, transformApi } from '@/highOrderComponent/Service';
 import urlTransform from '@/webPublic/zyd_public/request/urlTransform';
 
 
-export function hrefWithToken(url, arg = {}) {
+export function hrefWithToken(url, arg = {
+  justOpenUrl: false,
+  params: {},
+  fileName: '导出',
+  method: 'GET',
+  ext: 'xlsx',
+}) {
   const {
-    justOpenUrl = false,
-    params = {},
-    fileName = '',
-    method = 'GET',
-    ext = 'xlsx',
+    justOpenUrl,
+    params,
+    fileName,
+    method,
+    ext,
   } = arg;
   if (!getIsBei_Dian()) {
     if (url.indexOf('?') > -1) {