@ecan-bi/datav 1.0.42 → 1.0.43

package/dist/index.umd.js

@@ -1634,6 +1634,24 @@ var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
     }
     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 {
@@ -1671,23 +1689,25 @@ var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
           }
           _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 {
@@ -1781,25 +1801,6 @@ var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
     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__default["default"].create({
     timeout: 1e3 * 10
   });
@@ -2391,7 +2392,19 @@ var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
       }
     };
   };
-  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 = vue.defineComponent({
     name: "EcanPageConfig",
     props: __spreadValues({}, pageConfigComponentProps),
@@ -2501,7 +2514,7 @@ var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
       ], 4)) : vue.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: "",
@@ -2513,6 +2526,7 @@ var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
     name: "EcanProviderConfig",
     props: __spreadValues({}, providerConfigComponentProps),
     setup(props2, { expose }) {
+      useHrefParamsToGlobalVariables();
       const providerConfig2 = vue.ref();
       const setTheme = () => {
         providerConfig2.value.setAttribute("datav-theme", props2.theme);
@@ -3596,11 +3610,13 @@ var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
     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 = vue.defineComponent({
     name: "EcanButton",
     components: {
@@ -3612,9 +3628,19 @@ var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
       const events = props2.events;
       const emitEvent = useEmitEvent(events);
       const click = emitEvent("click");
+      const myText = vue.computed(() => useVariablesInText(props2.text));
+      const myHref = vue.computed(() => {
+        const href = props2.href;
+        if (href) {
+          return useVariablesInText(href);
+        }
+        return void 0;
+      });
       return {
         style: style2,
-        click
+        click,
+        myText,
+        myHref
       };
     }
   });
@@ -3630,13 +3656,15 @@ var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
         type: _ctx.mode,
         danger: _ctx.danger,
         ghost: _ctx.ghost,
-        shape: _ctx.shape
+        shape: _ctx.shape,
+        href: _ctx.myHref,
+        target: _ctx.target
       }, {
         default: vue.withCtx(() => [
-          vue.createTextVNode(vue.toDisplayString(_ctx.text), 1)
+          vue.createTextVNode(vue.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]]);