@ecan-bi/datav 1.0.85 → 1.0.87

package/dist/index.es.js

@@ -1,4 +1,4 @@
-/*! @ecan-bi/datav@1.0.85 */
+/*! @ecan-bi/datav@1.0.87 */
 var _a, _b, _c;
 import { watch, inject, computed, unref, watchEffect, defineComponent, shallowRef, toRefs, onMounted, onUnmounted, h, nextTick, createVNode, resolveComponent, openBlock, createElementBlock, createBlock, renderSlot, withCtx, ref, normalizeStyle, createCommentVNode, provide, toDisplayString, Fragment, renderList, createElementVNode, normalizeClass, pushScopeId, popScopeId, createSlots, resolveDynamicComponent, mergeProps, withModifiers, withDirectives, vShow } from "vue";
 import { throttle, init, use, registerMap } from "echarts/core";
@@ -1720,15 +1720,10 @@ const useRequestData = (props2, callBack = () => {
         } 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);
@@ -2218,23 +2213,29 @@ const useValueFormatter = (formatter, value) => {
   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;
@@ -3477,8 +3478,7 @@ const datePickerProps = {
 };
 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 = defineComponent({
   name: "EcanDatePicker",
   props: {
@@ -3490,7 +3490,12 @@ const _sfc_main$g = defineComponent({
   setup(props2) {
     const style2 = usePickComponentStyle(props2);
     const getPopupContainer = () => document.getElementById("ProviderConfig") || document.body;
-    const myValue = computed(() => props2.value ? dayjs(props2.value) : null);
+    const myValue = ref(null);
+    watch(() => props2.value, () => {
+      myValue.value = props2.value ? dayjs(props2.value) : null;
+    }, {
+      immediate: true
+    });
     const { setGlobalModel } = inject(GLOBAL_MODEL, {
       setGlobalModel: (key, value) => void 0
     });
@@ -3534,7 +3539,7 @@ function _sfc_render$g(_ctx, _cache, $props, $setup, $data, $options) {
     }, 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,
@@ -3853,7 +3858,8 @@ const _sfc_main$c = defineComponent({
     const style2 = usePickComponentStyle(props2);
     const myOption = ref([]);
     const myValue = ref([]);
-    watch(() => [props2.data, props2.value], ([data, value]) => {
+    const handleDataAndOption = (data) => {
+      const value = props2.value;
       let _value = [];
       data.forEach((item) => {
         if (item.checked) {
@@ -3867,6 +3873,9 @@ const _sfc_main$c = defineComponent({
       }
       myOption.value = data;
       myValue.value = _value;
+    };
+    watch(() => [props2.data, props2.value], ([data]) => {
+      handleDataAndOption(data);
     }, {
       immediate: true,
       deep: true
@@ -3881,20 +3890,7 @@ const _sfc_main$c = defineComponent({
         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 } = inject(GLOBAL_MODEL, {