@ecan-bi/datav 1.0.81 → 1.0.83

package/dist/index.umd.js

@@ -1,4 +1,4 @@
-/*! @ecan-bi/datav@1.0.81 */
+/*! @ecan-bi/datav@1.0.83 */
 (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) {
@@ -1718,13 +1718,22 @@
             record = getGlobalModel(id) || {};
           }
           const p = vue.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 = vue.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);
@@ -3570,9 +3579,17 @@
       const myValue = vue.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;
@@ -3635,7 +3652,7 @@
       }, 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,
@@ -3819,7 +3836,7 @@
     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 },
@@ -3841,15 +3858,20 @@
       const style2 = usePickComponentStyle(props2);
       const myOption = vue.ref([]);
       const myValue = vue.ref([]);
-      vue.watch(() => props2.data, (data) => {
-        const value = [];
+      vue.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