@ecan-bi/datav 1.1.12 → 1.1.14

package/dist/index.umd.js

@@ -1,4 +1,4 @@
-/*! @ecan-bi/datav@1.1.12 */
+/*! @ecan-bi/datav@1.1.14 */
 (function(global, factory) {
   typeof exports === "object" && typeof module !== "undefined" ? factory(exports, require("vue"), require("echarts/core"), require("resize-detector"), require("ant-design-vue"), require("ant-design-vue/es/spin/style"), require("ant-design-vue/es/skeleton/style"), require("lodash-es"), require("axios"), require("mitt"), require("dayjs"), require("ant-design-vue/es/progress/style"), require("ant-design-vue/es/input/style"), require("ant-design-vue/es/date-picker/style"), require("ant-design-vue/es/date-picker/locale/zh_CN"), require("ant-design-vue/es/select/style"), require("ant-design-vue/es/button/style"), require("ant-design-vue/es/checkbox/style"), require("echarts/renderers"), require("echarts/charts"), require("echarts/components"), require("echarts"), require("ant-design-vue/es/modal/style"), require("ant-design-vue/es/table/style")) : typeof define === "function" && define.amd ? define(["exports", "vue", "echarts/core", "resize-detector", "ant-design-vue", "ant-design-vue/es/spin/style", "ant-design-vue/es/skeleton/style", "lodash-es", "axios", "mitt", "dayjs", "ant-design-vue/es/progress/style", "ant-design-vue/es/input/style", "ant-design-vue/es/date-picker/style", "ant-design-vue/es/date-picker/locale/zh_CN", "ant-design-vue/es/select/style", "ant-design-vue/es/button/style", "ant-design-vue/es/checkbox/style", "echarts/renderers", "echarts/charts", "echarts/components", "echarts", "ant-design-vue/es/modal/style", "ant-design-vue/es/table/style"], factory) : (global = typeof globalThis !== "undefined" ? globalThis : global || self, factory(global["@ecan/bi-datav"] = {}, global.vue, global["echarts/core"], global["resize-detector"], global["ant-design-vue"], null, null, global["lodash-es"], global.axios, global.mitt, global.dayjs, null, null, null, global["ant-design-vue/es/date-picker/locale/zh_CN"], null, null, null, global["echarts/renderers"], global["echarts/charts"], global["echarts/components"], global.echarts));
 })(this, function(exports2, vue, core, resizeDetector, antDesignVue, style$1, style$2, lodashEs, axios, mitt, dayjs, style$3, style$4, style$5, locale, style$6, style$7, style$8, renderers, charts, components$1, echarts) {
@@ -1674,7 +1674,7 @@
     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];
@@ -1684,7 +1684,7 @@
         }
       }
       try {
-        if (/[0-9]+(.*)[|+|-|*|/](.*)[0-9]+/g.test(statement)) {
+        if (/[0-9]+(.*)[+|-|*|/](.*)[0-9]+/g.test(statement)) {
           const eval2 = eval;
           statement = eval2(statement);
         }
@@ -1719,9 +1719,10 @@
     const { getGlobalModel } = vue.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 || vue.unref(pageMode) === "design")
         return;
       let _params = {};
@@ -3566,10 +3567,11 @@
     keyName: "\u65E5\u671F\u9009\u62E9\u5668",
     rotate: "",
     type: "ecanDatePicker",
-    value: dayjs__default.default().format("YYYY-MM-DD"),
+    value: "",
     picker: "date",
     format: "YYYY-MM-DD",
-    showTime: false
+    showTime: false,
+    useCurrentTime: true
   };
   const datePickerComponentProps = transformToComponentProps(datePickerProps);
   const datePickerEvents = ["dateChange"];
@@ -3585,8 +3587,14 @@
       const style2 = usePickComponentStyle(props2);
       const getPopupContainer = () => document.getElementById("ProviderConfig") || document.body;
       const myValue = vue.ref(null);
-      vue.watch(() => props2.value, () => {
-        myValue.value = props2.value ? dayjs__default.default(props2.value) : null;
+      vue.watch(() => [props2.value, props2.useCurrentTime], ([value, useCurrentTime]) => {
+        let _value = null;
+        if (value) {
+          _value = dayjs__default.default(value);
+        } else if (useCurrentTime) {
+          _value = dayjs__default.default();
+        }
+        myValue.value = _value;
       }, {
         immediate: true
       });
@@ -3777,7 +3785,10 @@
     picker: "date",
     format: "YYYY-MM-DD",
     startTime: "",
-    endTime: ""
+    endTime: "",
+    useCurrentTime: true,
+    interval: 1,
+    intervalUnit: "year"
   };
   const rangePickerComponentProps = transformToComponentProps(rangePickerProps);
   const rangePickerEvents = ["dateChange"];
@@ -3793,9 +3804,19 @@
       const style2 = usePickComponentStyle(props2);
       const getPopupContainer = () => document.getElementById("ProviderConfig") || document.body;
       const myValue = vue.ref([null, null]);
-      vue.watch(() => [props2.startTime, props2.endTime], ([startTime, endTime]) => {
-        const _startTime = startTime ? dayjs__default.default(startTime) : null;
-        const _endTime = endTime ? dayjs__default.default(endTime) : null;
+      vue.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__default.default();
+          _endTime = dayjs__default.default().subtract(interval, intervalUnit);
+        }
+        if (startTime) {
+          _startTime = dayjs__default.default(startTime);
+        }
+        if (endTime) {
+          _endTime = dayjs__default.default(endTime);
+        }
         myValue.value = [_startTime, _endTime];
       }, {
         immediate: true
@@ -3826,7 +3847,7 @@
       };
     }
   });
-  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 = vue.resolveComponent("a-range-picker");
@@ -3847,7 +3868,7 @@
       }, 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,
@@ -3879,7 +3900,7 @@
       const emitEvent = useEmitEvent(props2);
       const click = emitEvent("click", () => {
         const url = vue.unref(myHref);
-        if (props2.target === "event") {
+        if (url && props2.target === "event") {
           window.parent.postMessage({
             type: "openPage",
             url
@@ -4114,7 +4135,7 @@
     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, {}, {
@@ -4367,7 +4388,13 @@
       const refreshData = () => {
         chooseRequestOrDiagram();
       };
+      const resetRecord = () => {
+        const id = props2.id;
+        const modal = getGlobalModel(id);
+        setGlobalModel(id, { ...modal, RECORD: "" });
+      };
       useOnEvent(props2, {
+        resetRecord,
         refreshData,
         click
       });
@@ -4494,7 +4521,7 @@
     areaStyleOpacity: 0
   };
   const lineComponentProps = transformToComponentProps(lineProps);
-  const lineEvents = ["click", "refreshData"];
+  const lineEvents = ["click", "refreshData", "resetRecord"];
   core.use([
     renderers.CanvasRenderer,
     charts.LineChart,
@@ -4781,8 +4808,14 @@
       const refreshData = () => {
         chooseRequestOrDiagram();
       };
+      const resetRecord = () => {
+        const id = props2.id;
+        const modal = getGlobalModel(id);
+        setGlobalModel(id, { ...modal, RECORD: "" });
+      };
       useOnEvent(props2, {
         refreshData,
+        resetRecord,
         click
       });
       const { setRequest } = vue.inject(REQUEST_MODEL, {
@@ -4936,7 +4969,7 @@
     labelColor: ""
   };
   const barComponentProps = transformToComponentProps(barProps);
-  const barEvents = ["refreshData", "click"];
+  const barEvents = ["refreshData", "click", "resetRecord"];
   core.use([
     renderers.CanvasRenderer,
     charts.BarChart,
@@ -5246,9 +5279,15 @@
         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,
@@ -5785,7 +5824,7 @@
     barWidth: "40%"
   };
   const comboGraphComponentProps = transformToComponentProps(comboGraphProps);
-  const comboGraphEvents = ["refreshData", "click"];
+  const comboGraphEvents = ["refreshData", "click", "resetRecord"];
   core.use([
     renderers.CanvasRenderer,
     charts.BarChart,
@@ -6105,7 +6144,13 @@
         requestFn: chooseRequestOrDiagram,
         sortNum: props2.requestSort
       });
+      const resetRecord = () => {
+        const id = props2.id;
+        const modal = getGlobalModel(id);
+        setGlobalModel(id, { ...modal, RECORD: "" });
+      };
       useOnEvent(props2, {
+        resetRecord,
         refreshData,
         click
       });
@@ -6795,7 +6840,7 @@
     }
   };
   const tableComponentProps = transformToComponentProps(tableProps);
-  const tableEvents = ["click", "refreshData"];
+  const tableEvents = ["click", "refreshData", "resetRecord"];
   const _sfc_main$1 = vue.defineComponent({
     name: "EcanTable",
     components: {
@@ -7164,7 +7209,13 @@
             break;
         }
       };
+      const resetRecord = () => {
+        const id = props2.id;
+        const modal = getGlobalModel(id);
+        setGlobalModel(id, { ...modal, RECORD: "" });
+      };
       useOnEvent(props2, {
+        resetRecord,
         refreshData
       });
       const summaryList = vue.computed(() => {
@@ -7299,7 +7350,7 @@
       };
     }
   });
-  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__ */ vue.createTextVNode(" \u641C\u7D22 ");
   const _hoisted_2 = /* @__PURE__ */ vue.createTextVNode(" \u91CD\u7F6E ");
@@ -7455,7 +7506,7 @@
       }, 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,