@ecan-bi/datav 1.0.42 → 1.0.43

package/dist/index.es.js

@@ -1624,6 +1624,24 @@ const lowerCaseIncludes = (v1, v2) => {
   }
   return false;
 };
+const useVariablesInText = (text, data) => {
+  const config2 = window.config || {};
+  data = __spreadValues(__spreadValues({}, config2), data);
+  const variables = text.match(/\{.*?\}/g);
+  if (variables == null || variables.length === 0)
+    return text;
+  for (let i = 0; i < variables.length; i++) {
+    const variable = variables[i];
+    const v = variable.slice(1, variable.length - 1);
+    const usedVariable = data[v];
+    if (usedVariable != null) {
+      text = text.replace(variable, usedVariable);
+    } else {
+      text = text.replace(variable, "");
+    }
+  }
+  return text;
+};
 const useRequestData = (props2, callBack = () => {
 }) => {
   const {
@@ -1661,23 +1679,25 @@ const useRequestData = (props2, callBack = () => {
         }
         _params[key] = v;
       } else if (typeof value === "string") {
-        _params[key] = value;
+        _params[key] = useVariablesInText(value);
       }
     });
     _params = __spreadValues(__spreadValues({}, _params), params);
     let urlParams = "";
     const keys = Object.keys(_params);
     const last = keys.length - 1;
+    const keysLen = keys.length;
     keys.forEach((key, index2) => {
-      switch (index2) {
-        case 0:
+      if (index2 === 0) {
+        if (keysLen !== 1) {
           urlParams += `?${key}=${_params[key]}&`;
-          break;
-        case last:
-          urlParams += `${key}=${_params[key]}`;
-          break;
-        default:
-          urlParams += `${key}=${_params[key]}&`;
+        } else {
+          urlParams += `?${key}=${_params[key]}`;
+        }
+      } else if (index2 === last) {
+        urlParams += `${key}=${_params[key]}`;
+      } else {
+        urlParams += `${key}=${_params[key]}&`;
       }
     });
     try {
@@ -1771,25 +1791,6 @@ const usePageUrl = (pageMode, pageId) => {
   console.log(pageMode);
   return pageMode === "preview" ? envPageUrl : proPageUrl;
 };
-const useVariablesInText = (text, data = {}) => {
-  var _a2;
-  const config2 = (_a2 = window.config) != null ? _a2 : {};
-  data = __spreadValues(__spreadValues({}, config2), data);
-  const variables = text.match(/\{.*?\}/g);
-  if (variables == null || variables.length === 0)
-    return text;
-  for (let i = 0; i < variables.length; i++) {
-    const variable = variables[i];
-    const v = variable.slice(1, variable.length - 1);
-    const usedVariables = data[v];
-    if (usedVariables != null) {
-      text = text.replace(variable, usedVariables);
-    } else {
-      text = text.replace(variable, "");
-    }
-  }
-  return text;
-};
 const request = axios.create({
   timeout: 1e3 * 10
 });
@@ -2381,7 +2382,19 @@ const useIndicatorData = (props2 = {}) => {
     }
   };
 };
-var PageConfig_vue_vue_type_style_index_0_scoped_true_lang = /* @__PURE__ */ (() => "#container[data-v-836b53bc] {\n  position: fixed;\n  top: 0;\n  left: 0;\n  overflow: hidden;\n  transform-origin: left top;\n  z-index: 999;\n}\n.page-config[data-v-836b53bc] {\n  position: relative;\n  overflow: hidden;\n  background-size: cover;\n}\n")();
+const useHrefParamsToGlobalVariables = () => {
+  const search = window.location.search;
+  const params = search.slice(1).split("&");
+  const len = params.length;
+  for (let i = 0; i < len; i++) {
+    const param = params[i];
+    const keyAndValue = param.split("=");
+    const key = keyAndValue[0];
+    const value = keyAndValue[1];
+    window.config[key] = value;
+  }
+};
+var PageConfig_vue_vue_type_style_index_0_scoped_true_lang = /* @__PURE__ */ (() => "#container[data-v-5d709a9a] {\n  position: fixed;\n  top: 0;\n  left: 0;\n  overflow: hidden;\n  transform-origin: left top;\n  z-index: 999;\n}\n.page-config[data-v-5d709a9a] {\n  position: relative;\n  overflow: hidden;\n  background-size: cover;\n}\n")();
 const _sfc_main$n = defineComponent({
   name: "EcanPageConfig",
   props: __spreadValues({}, pageConfigComponentProps),
@@ -2491,7 +2504,7 @@ function _sfc_render$n(_ctx, _cache, $props, $setup, $data, $options) {
     ], 4)) : createCommentVNode("", true)
   ], 512);
 }
-var PageConfig = /* @__PURE__ */ _export_sfc(_sfc_main$n, [["render", _sfc_render$n], ["__scopeId", "data-v-836b53bc"]]);
+var PageConfig = /* @__PURE__ */ _export_sfc(_sfc_main$n, [["render", _sfc_render$n], ["__scopeId", "data-v-5d709a9a"]]);
 const EcanPageConfig = withInstall(PageConfig);
 const providerConfig = {
   contextRequestUrl: "",
@@ -2503,6 +2516,7 @@ const _sfc_main$m = defineComponent({
   name: "EcanProviderConfig",
   props: __spreadValues({}, providerConfigComponentProps),
   setup(props2, { expose }) {
+    useHrefParamsToGlobalVariables();
     const providerConfig2 = ref();
     const setTheme = () => {
       providerConfig2.value.setAttribute("datav-theme", props2.theme);
@@ -3586,11 +3600,13 @@ const buttonProps = __spreadProps(__spreadValues({}, props), {
   text: "\u6309\u94AE",
   mode: "default",
   danger: false,
-  shape: "default"
+  shape: "default",
+  href: "",
+  target: "_self"
 });
 const buttonComponentProps = transformToComponentProps(buttonProps);
 const buttonEvents = ["click"];
-var Button_vue_vue_type_style_index_0_lang = /* @__PURE__ */ (() => ".ecan-button .ant-btn {\n  width: 100%;\n  height: 100%;\n}\n")();
+var Button_vue_vue_type_style_index_0_lang = /* @__PURE__ */ (() => ".ecan-button .ant-btn {\n  width: 100%;\n  height: 100%;\n  display: flex;\n  justify-content: center;\n  align-items: center;\n}\n")();
 const _sfc_main$c = defineComponent({
   name: "EcanButton",
   components: {
@@ -3602,9 +3618,19 @@ const _sfc_main$c = defineComponent({
     const events = props2.events;
     const emitEvent = useEmitEvent(events);
     const click = emitEvent("click");
+    const myText = computed(() => useVariablesInText(props2.text));
+    const myHref = computed(() => {
+      const href = props2.href;
+      if (href) {
+        return useVariablesInText(href);
+      }
+      return void 0;
+    });
     return {
       style: style2,
-      click
+      click,
+      myText,
+      myHref
     };
   }
 });
@@ -3620,13 +3646,15 @@ function _sfc_render$c(_ctx, _cache, $props, $setup, $data, $options) {
       type: _ctx.mode,
       danger: _ctx.danger,
       ghost: _ctx.ghost,
-      shape: _ctx.shape
+      shape: _ctx.shape,
+      href: _ctx.myHref,
+      target: _ctx.target
     }, {
       default: withCtx(() => [
-        createTextVNode(toDisplayString(_ctx.text), 1)
+        createTextVNode(toDisplayString(_ctx.myText), 1)
       ]),
       _: 1
-    }, 8, ["onClick", "type", "danger", "ghost", "shape"])
+    }, 8, ["onClick", "type", "danger", "ghost", "shape", "href", "target"])
   ], 4);
 }
 var Button = /* @__PURE__ */ _export_sfc(_sfc_main$c, [["render", _sfc_render$c]]);