@ecan-bi/datav 1.0.81 → 1.0.83

package/dist/index.es.js

@@ -1,4 +1,4 @@
-/*! @ecan-bi/datav@1.0.81 */
+/*! @ecan-bi/datav@1.0.83 */
 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";
@@ -1713,13 +1713,22 @@ const useRequestData = (props2, callBack = () => {
           record = getGlobalModel(id) || {};
         }
         const p = unref(record[prop]);
-        const isNeedFormat = ["date", "range"].some((item) => lowerCaseIncludes(record == null ? void 0 : record.type, item));
         let v = "";
+        const isNeedFormat = ["date", "range"].some((item) => lowerCaseIncludes(record == null ? void 0 : record.type, item));
         if (isNeedFormat) {
           v = ((_a2 = unref(p)) == null ? void 0 : _a2.format((propKey == null ? void 0 : propKey.trim()) || record.format)) || "";
         } else {
-          v = p != null && typeof p === "object" ? p[propKey || "value"] : p;
+          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);
@@ -3565,9 +3574,17 @@ const _sfc_main$f = defineComponent({
     const myValue = ref(props2.value || props2.data[0]);
     const dataFieldNames = props2.dataFieldNames;
     const filterOption = (input, option) => {
-      var _a2;
       const labelKey = dataFieldNames.label;
-      return ((_a2 = option[labelKey]) == null ? void 0 : _a2.toLowerCase().indexOf(input == null ? void 0 : input.toLowerCase())) >= 0;
+      const valueKey = dataFieldNames.value;
+      let value;
+      const labelValue = option[labelKey];
+      const valueValue = option[valueKey];
+      if (labelValue != null) {
+        value = labelValue;
+      } else if (valueValue != null) {
+        value = valueValue;
+      }
+      return !!((value == null ? void 0 : value.toLowerCase().indexOf(input == null ? void 0 : input.toLowerCase())) >= 0);
     };
     const handleRequestData = async () => {
       var _a2, _b2;
@@ -3630,7 +3647,7 @@ function _sfc_render$f(_ctx, _cache, $props, $setup, $data, $options) {
     }, null, 8, ["value", "options", "getPopupContainer", "field-names", "filter-option", "onChange"])
   ], 4);
 }
-const Select = /* @__PURE__ */ _export_sfc(_sfc_main$f, [["render", _sfc_render$f], ["__scopeId", "data-v-0a8df5d2"]]);
+const Select = /* @__PURE__ */ _export_sfc(_sfc_main$f, [["render", _sfc_render$f], ["__scopeId", "data-v-5e92066a"]]);
 const EcanSelect = withInstall(Select);
 const rangePickerProps = {
   ...props,
@@ -3814,7 +3831,7 @@ const checkboxProps = {
   keyName: "\u590D\u9009\u6846",
   rotate: "",
   type: "ecanCheckbox",
-  value: "",
+  value: [],
   data: [
     { label: "\u9009\u9879\u4E00", value: "1", checked: true },
     { label: "\u9009\u9879\u4E8C", value: "2", checked: true },
@@ -3836,15 +3853,20 @@ const _sfc_main$c = defineComponent({
     const style2 = usePickComponentStyle(props2);
     const myOption = ref([]);
     const myValue = ref([]);
-    watch(() => props2.data, (data) => {
-      const value = [];
+    watch(() => [props2.data, props2.value], ([data, value]) => {
+      let _value = [];
       data.forEach((item) => {
         if (item.checked) {
-          value.push(item.value);
+          _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;
+      myValue.value = _value;
     }, {
       immediate: true,
       deep: true