@ecan-bi/datav 1.0.85 → 1.0.87

package/dist/index.umd.js

@@ -1,4 +1,4 @@
-/*! @ecan-bi/datav@1.0.85 */
+/*! @ecan-bi/datav@1.0.87 */
 (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) {
@@ -1725,15 +1725,10 @@
           } else {
             if (Object.prototype.toString.call(p) === "[object Object]") {
               v = p[propKey || "value"];
-            } else if (Array.isArray(p)) {
-              v = p.join(",");
             } else {
               v = p;
             }
-            console.log(p);
-            console.log("v", v);
           }
-          console.log("v", v);
           _params[key] = v;
         } else if (typeof value === "string") {
           _params[key] = useVariablesInText(value);
@@ -2223,23 +2218,29 @@
     if (formatter == null)
       return value;
     const variables = formatter.match(/\{.*\}/g);
-    if (variables == null || variables.length === 0)
+    if (variables == null || variables.length === 0) {
       return value;
+    }
     for (let i = 0; i < variables.length; i++) {
       const variable = variables[i];
       if (variable == null || variable === "")
         break;
       let statement = variable.slice(1, -1);
       statement = statement == null ? void 0 : statement.replace(/value/g, value);
-      try {
-        let result = statement;
-        if (/[+\-*/%]+/g.test(statement)) {
-          const eval2 = eval;
-          result = eval2(statement);
+      if (/[+\-*/%]+/g.test(value)) {
+        formatter = formatter.replace(variable, statement);
+      } else {
+        try {
+          let result = statement;
+          if (/[+\-*/%]+/g.test(statement)) {
+            const eval2 = eval;
+            result = eval2(statement);
+          }
+          formatter = formatter.replace(variable, result);
+        } catch (e) {
+          console.error(e);
+          return value;
         }
-        formatter = formatter.replace(variable, result);
-      } catch (e) {
-        console.error(e);
       }
     }
     return formatter;
@@ -3482,8 +3483,7 @@
   };
   const datePickerComponentProps = transformToComponentProps(datePickerProps);
   const datePickerEvents = ["dateChange"];
-  const DatePicker_vue_vue_type_style_index_0_scoped_true_lang = "";
-  const DatePicker_vue_vue_type_style_index_1_lang = "";
+  const DatePicker_vue_vue_type_style_index_0_lang = "";
   const _sfc_main$g = vue.defineComponent({
     name: "EcanDatePicker",
     props: {
@@ -3495,7 +3495,12 @@
     setup(props2) {
       const style2 = usePickComponentStyle(props2);
       const getPopupContainer = () => document.getElementById("ProviderConfig") || document.body;
-      const myValue = vue.computed(() => props2.value ? dayjs__default.default(props2.value) : null);
+      const myValue = vue.ref(null);
+      vue.watch(() => props2.value, () => {
+        myValue.value = props2.value ? dayjs__default.default(props2.value) : null;
+      }, {
+        immediate: true
+      });
       const { setGlobalModel } = vue.inject(GLOBAL_MODEL, {
         setGlobalModel: (key, value) => void 0
       });
@@ -3539,7 +3544,7 @@
       }, null, 8, ["value", "format", "picker", "showTime", "locale", "onChange", "getPopupContainer"])
     ], 4);
   }
-  const DatePicker = /* @__PURE__ */ _export_sfc(_sfc_main$g, [["render", _sfc_render$g], ["__scopeId", "data-v-6e240054"]]);
+  const DatePicker = /* @__PURE__ */ _export_sfc(_sfc_main$g, [["render", _sfc_render$g]]);
   const EcanDatePicker = withInstall(DatePicker);
   const selectProps = {
     ...props,
@@ -3858,7 +3863,8 @@
       const style2 = usePickComponentStyle(props2);
       const myOption = vue.ref([]);
       const myValue = vue.ref([]);
-      vue.watch(() => [props2.data, props2.value], ([data, value]) => {
+      const handleDataAndOption = (data) => {
+        const value = props2.value;
         let _value = [];
         data.forEach((item) => {
           if (item.checked) {
@@ -3872,6 +3878,9 @@
         }
         myOption.value = data;
         myValue.value = _value;
+      };
+      vue.watch(() => [props2.data, props2.value], ([data]) => {
+        handleDataAndOption(data);
       }, {
         immediate: true,
         deep: true
@@ -3886,20 +3895,7 @@
           return;
         const res = await requestData();
         const data = ((_b2 = (_a2 = res == null ? void 0 : res.data) == null ? void 0 : _a2.data) == null ? void 0 : _b2.rows) || [];
-        const value = props2.value;
-        let _value = [];
-        data.forEach((item) => {
-          if (item.checked) {
-            _value.push(item.value);
-          }
-        });
-        if (typeof value === "string" && value !== "") {
-          _value = _value.concat(value.split(","));
-        } else if (Array.isArray(value)) {
-          _value = _value.concat(value);
-        }
-        myOption.value = data;
-        myValue.value = _value;
+        handleDataAndOption(data);
       };
       const id = props2.id;
       const { getGlobalModel, setGlobalModel } = vue.inject(GLOBAL_MODEL, {