@ecan-bi/datav 1.1.12 → 1.1.14

package/dist/index.es.js

@@ -1,4 +1,4 @@
-/*! @ecan-bi/datav@1.1.12 */
+/*! @ecan-bi/datav@1.1.14 */
 var _a, _b, _c, _d;
 import { watch, inject, computed, unref, watchEffect, defineComponent, shallowRef, toRefs, onMounted, onUnmounted, h, nextTick, createVNode, resolveComponent, openBlock, createElementBlock, createBlock, renderSlot, withCtx, ref, normalizeStyle, createCommentVNode, provide, onBeforeUnmount, toDisplayString, Fragment, renderList, createElementVNode, normalizeClass, pushScopeId, popScopeId, createSlots, resolveDynamicComponent, mergeProps, withModifiers, reactive, createTextVNode, withDirectives, vShow } from "vue";
 import { throttle, init, use, registerMap } from "echarts/core";
@@ -1669,7 +1669,7 @@ const useVariablesInText = (formatter = "", data = {}, { useNewline = false, use
   for (let i = 0; i < variables.length; i++) {
     const variable = variables[i];
     let statement = variable.slice(1, -1);
-    const reg = /[\u4e00-\u9fa5_a-zA-Z_]+[0-9]*/g;
+    const reg = /[\u4e00-\u9fa5a-z-_A-Z]+[0-9]*/g;
     const textVariables = statement.match(reg);
     for (let j = 0; j < textVariables.length; j++) {
       const textVariable = textVariables[j];
@@ -1679,7 +1679,7 @@ const useVariablesInText = (formatter = "", data = {}, { useNewline = false, use
       }
     }
     try {
-      if (/[0-9]+(.*)[|+|-|*|/](.*)[0-9]+/g.test(statement)) {
+      if (/[0-9]+(.*)[+|-|*|/](.*)[0-9]+/g.test(statement)) {
         const eval2 = eval;
         statement = eval2(statement);
       }
@@ -1714,9 +1714,10 @@ const useRequestData = (props2, callBack = () => {
   const { getGlobalModel } = inject(GLOBAL_MODEL, {
     getGlobalModel: (key) => void 0
   });
+  console.log("requestUrl", requestUrl);
+  const url = useVariablesInText(requestUrl);
+  console.log("url", url);
   const requestData = async (params = {}) => {
-    const url = useVariablesInText(requestUrl);
-    console.log("url", url);
     if (!url || !method || !headers || unref(pageMode) === "design")
       return;
     let _params = {};
@@ -3561,10 +3562,11 @@ const datePickerProps = {
   keyName: "\u65E5\u671F\u9009\u62E9\u5668",
   rotate: "",
   type: "ecanDatePicker",
-  value: dayjs().format("YYYY-MM-DD"),
+  value: "",
   picker: "date",
   format: "YYYY-MM-DD",
-  showTime: false
+  showTime: false,
+  useCurrentTime: true
 };
 const datePickerComponentProps = transformToComponentProps(datePickerProps);
 const datePickerEvents = ["dateChange"];
@@ -3580,8 +3582,14 @@ const _sfc_main$h = defineComponent({
     const style2 = usePickComponentStyle(props2);
     const getPopupContainer = () => document.getElementById("ProviderConfig") || document.body;
     const myValue = ref(null);
-    watch(() => props2.value, () => {
-      myValue.value = props2.value ? dayjs(props2.value) : null;
+    watch(() => [props2.value, props2.useCurrentTime], ([value, useCurrentTime]) => {
+      let _value = null;
+      if (value) {
+        _value = dayjs(value);
+      } else if (useCurrentTime) {
+        _value = dayjs();
+      }
+      myValue.value = _value;
     }, {
       immediate: true
     });
@@ -3772,7 +3780,10 @@ const rangePickerProps = {
   picker: "date",
   format: "YYYY-MM-DD",
   startTime: "",
-  endTime: ""
+  endTime: "",
+  useCurrentTime: true,
+  interval: 1,
+  intervalUnit: "year"
 };
 const rangePickerComponentProps = transformToComponentProps(rangePickerProps);
 const rangePickerEvents = ["dateChange"];
@@ -3788,9 +3799,19 @@ const _sfc_main$f = defineComponent({
     const style2 = usePickComponentStyle(props2);
     const getPopupContainer = () => document.getElementById("ProviderConfig") || document.body;
     const myValue = ref([null, null]);
-    watch(() => [props2.startTime, props2.endTime], ([startTime, endTime]) => {
-      const _startTime = startTime ? dayjs(startTime) : null;
-      const _endTime = endTime ? dayjs(endTime) : null;
+    watch(() => [props2.startTime, props2.endTime, props2.useCurrentTime, props2.interval, props2.intervalUnit], ([startTime, endTime, useCurrentTime, interval, intervalUnit]) => {
+      let _startTime = null;
+      let _endTime = null;
+      if (useCurrentTime) {
+        _startTime = dayjs();
+        _endTime = dayjs().subtract(interval, intervalUnit);
+      }
+      if (startTime) {
+        _startTime = dayjs(startTime);
+      }
+      if (endTime) {
+        _endTime = dayjs(endTime);
+      }
       myValue.value = [_startTime, _endTime];
     }, {
       immediate: true
@@ -3821,7 +3842,7 @@ const _sfc_main$f = defineComponent({
     };
   }
 });
-const RangePicker_vue_vue_type_style_index_0_scoped_5d299520_lang = "";
+const RangePicker_vue_vue_type_style_index_0_scoped_2fc9988b_lang = "";
 const RangePicker_vue_vue_type_style_index_1_lang = "";
 function _sfc_render$f(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_a_range_picker = resolveComponent("a-range-picker");
@@ -3842,7 +3863,7 @@ function _sfc_render$f(_ctx, _cache, $props, $setup, $data, $options) {
     }, null, 8, ["value", "format", "picker", "locale", "getPopupContainer", "onChange"])
   ], 4);
 }
-const RangePicker = /* @__PURE__ */ _export_sfc(_sfc_main$f, [["render", _sfc_render$f], ["__scopeId", "data-v-5d299520"]]);
+const RangePicker = /* @__PURE__ */ _export_sfc(_sfc_main$f, [["render", _sfc_render$f], ["__scopeId", "data-v-2fc9988b"]]);
 const EcanRangePicker = withInstall(RangePicker);
 const buttonProps = {
   ...props,
@@ -3874,7 +3895,7 @@ const _sfc_main$e = defineComponent({
     const emitEvent = useEmitEvent(props2);
     const click = emitEvent("click", () => {
       const url = unref(myHref);
-      if (props2.target === "event") {
+      if (url && props2.target === "event") {
         window.parent.postMessage({
           type: "openPage",
           url
@@ -4109,7 +4130,7 @@ const pieProps = {
   toolboxInfoText: "\u5F53\u524D\u65E0\u8BF4\u660E\u4FE1\u606F"
 };
 const pieComponentProps = transformToComponentProps(pieProps);
-const pieEvents = ["click", "refreshData"];
+const pieEvents = ["click", "refreshData", "resetRecord"];
 const useDownloadFile = async (downloadFileUrl) => {
   var _a2;
   const res = await request.post(downloadFileUrl, {}, {
@@ -4362,7 +4383,13 @@ const _sfc_main$c = defineComponent({
     const refreshData = () => {
       chooseRequestOrDiagram();
     };
+    const resetRecord = () => {
+      const id = props2.id;
+      const modal = getGlobalModel(id);
+      setGlobalModel(id, { ...modal, RECORD: "" });
+    };
     useOnEvent(props2, {
+      resetRecord,
       refreshData,
       click
     });
@@ -4489,7 +4516,7 @@ const lineProps = {
   areaStyleOpacity: 0
 };
 const lineComponentProps = transformToComponentProps(lineProps);
-const lineEvents = ["click", "refreshData"];
+const lineEvents = ["click", "refreshData", "resetRecord"];
 use([
   CanvasRenderer,
   LineChart,
@@ -4776,8 +4803,14 @@ const _sfc_main$b = defineComponent({
     const refreshData = () => {
       chooseRequestOrDiagram();
     };
+    const resetRecord = () => {
+      const id = props2.id;
+      const modal = getGlobalModel(id);
+      setGlobalModel(id, { ...modal, RECORD: "" });
+    };
     useOnEvent(props2, {
       refreshData,
+      resetRecord,
       click
     });
     const { setRequest } = inject(REQUEST_MODEL, {
@@ -4931,7 +4964,7 @@ const barProps = {
   labelColor: ""
 };
 const barComponentProps = transformToComponentProps(barProps);
-const barEvents = ["refreshData", "click"];
+const barEvents = ["refreshData", "click", "resetRecord"];
 use([
   CanvasRenderer,
   BarChart,
@@ -5241,9 +5274,15 @@ const _sfc_main$a = defineComponent({
       requestFn: refreshData,
       sortNum: props2.requestSort
     });
+    const resetRecord = () => {
+      const id = props2.id;
+      const modal = getGlobalModel(id);
+      setGlobalModel(id, { ...modal, RECORD: "" });
+    };
     useOnEvent(props2, {
       refreshData,
-      click
+      click,
+      resetRecord
     });
     return {
       option,
@@ -5780,7 +5819,7 @@ const comboGraphProps = {
   barWidth: "40%"
 };
 const comboGraphComponentProps = transformToComponentProps(comboGraphProps);
-const comboGraphEvents = ["refreshData", "click"];
+const comboGraphEvents = ["refreshData", "click", "resetRecord"];
 use([
   CanvasRenderer,
   BarChart,
@@ -6100,7 +6139,13 @@ const _sfc_main$7 = defineComponent({
       requestFn: chooseRequestOrDiagram,
       sortNum: props2.requestSort
     });
+    const resetRecord = () => {
+      const id = props2.id;
+      const modal = getGlobalModel(id);
+      setGlobalModel(id, { ...modal, RECORD: "" });
+    };
     useOnEvent(props2, {
+      resetRecord,
       refreshData,
       click
     });
@@ -6790,7 +6835,7 @@ const tableProps = {
   }
 };
 const tableComponentProps = transformToComponentProps(tableProps);
-const tableEvents = ["click", "refreshData"];
+const tableEvents = ["click", "refreshData", "resetRecord"];
 const _sfc_main$1 = defineComponent({
   name: "EcanTable",
   components: {
@@ -7159,7 +7204,13 @@ const _sfc_main$1 = defineComponent({
           break;
       }
     };
+    const resetRecord = () => {
+      const id = props2.id;
+      const modal = getGlobalModel(id);
+      setGlobalModel(id, { ...modal, RECORD: "" });
+    };
     useOnEvent(props2, {
+      resetRecord,
       refreshData
     });
     const summaryList = computed(() => {
@@ -7294,7 +7345,7 @@ const _sfc_main$1 = defineComponent({
     };
   }
 });
-const Table_vue_vue_type_style_index_0_scoped_2403ec91_lang = "";
+const Table_vue_vue_type_style_index_0_scoped_3f25d4f8_lang = "";
 const Table_vue_vue_type_style_index_1_lang = "";
 const _hoisted_1$1 = /* @__PURE__ */ createTextVNode(" \u641C\u7D22 ");
 const _hoisted_2 = /* @__PURE__ */ createTextVNode(" \u91CD\u7F6E ");
@@ -7450,7 +7501,7 @@ function _sfc_render$1(_ctx, _cache, $props, $setup, $data, $options) {
     }, 8, ["loading"])
   ], 4);
 }
-const Table = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["render", _sfc_render$1], ["__scopeId", "data-v-2403ec91"]]);
+const Table = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["render", _sfc_render$1], ["__scopeId", "data-v-3f25d4f8"]]);
 const EcanTable = withInstall(Table);
 const mapProps = {
   ...props,