ct-component-plus 2.2.13 → 2.2.15

package/README.md

@@ -1,3 +1,11 @@
+# v2.2.15版本更新内容：
+
+1. 年份区间组件增加下拉透传rawAttr
+
+# v2.2.14版本更新内容：
+
+1. 修改cascader组件的埋点默认值处理逻辑
+
 # v2.2.13版本更新内容：
 
 1. 分页下拉组件添加补充项配置

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ct-component-plus",
   "private": false,
-  "version": "2.2.13",
+  "version": "2.2.15",
   "type": "module",
   "main": "packages/components/index.js",
   "files": [

package/packages/components/cascader/src/cascader.vue

@@ -1,12 +1,22 @@
 <template>
-  <el-cascader ref="cascaderRef" :class="[
-    ns.b(),
-    ns.is('disabled', disabled),
-    ns.is('filterable', filterable),
-    componentId,
-  ]" v-model="showValue" :props="propsShow" :options="optionsShow" :show-all-levels="showAllLevels"
-    :filterable="filterable" :clearable="clearable" :disabled="disabled" :popper-class="popperClassShow"
-    v-bind="{ ...$attrs, ...rawAttr }" />
+  <el-cascader
+    ref="cascaderRef"
+    :class="[
+      ns.b(),
+      ns.is('disabled', disabled),
+      ns.is('filterable', filterable),
+      componentId,
+    ]"
+    v-model="showValue"
+    :props="propsShow"
+    :options="optionsShow"
+    :show-all-levels="showAllLevels"
+    :filterable="filterable"
+    :clearable="clearable"
+    :disabled="disabled"
+    :popper-class="popperClassShow"
+    v-bind="{ ...$attrs, ...rawAttr }"
+  />
   <!-- <Teleport :to="appendPanelDom">
     <span>大写的六</span>
   </Teleport> -->
@@ -91,7 +101,7 @@ watch(
   () => props.modelValue,
   (newValue) => {
     getCheckedText();
-  }
+  },
 );
 const appendPanelDom = document.createElement("div");
 
@@ -153,34 +163,38 @@ watchEffect(async () => {
           cbs.afterSearch(res, optionsByApi, showValue);
         }
       });
-    } catch (error) { }
+    } catch (error) {}
   }
   if (isFunction(cbs.defineSearch)) {
     try {
       const defineSearchHandle = await cbs.defineSearch(
         optionsByApi,
-        showValue
+        showValue,
       );
       if (defineSearchHandle === false) return;
       if (defineSearchHandle) {
         optionsByApi.value = defineSearchHandle;
       }
-    } catch (error) { }
+    } catch (error) {}
   }
 });
 function findLabelsByValues(tree, values) {
-  // 通过value值的数组获取label并返回一个包含label的数组
   const result = [];
+  const valueKey = props.mapObj?.value || "value";
+  const labelKey = props.mapObj?.label || "label";
+  const childrenKey = props.mapObj?.children || "children";
   function traverse(node) {
-    if (!values && values.includes(node[props.mapObj?.value || "value"])) {
-      result.push(node[props.mapObj?.label || "label"]);
+    if (isArray(values) && values.includes(node?.[valueKey])) {
+      result.push(node?.[labelKey]);
     }
 
-    if (node.children && node.children.length > 0) {
-      node.children.forEach(traverse);
+    const children = node?.[childrenKey];
+    if (isArray(children) && children.length > 0) {
+      children.forEach(traverse);
     }
   }
 
+  if (!isArray(tree)) return result;
   tree.forEach(traverse);
   return result;
 }
@@ -188,7 +202,7 @@ useBuriedParams(props, emit, {
   getContent: () => {
     let data = findLabelsByValues(
       optionsShow.value,
-      props.multiple ? showValue.value : [showValue.value]
+      props.multiple ? showValue.value : [showValue.value],
     );
     if (props.multiple) {
       return data;

package/packages/components/year-select/src/year-select.vue

@@ -13,7 +13,7 @@
         :placeholder="startPlaceholder"
         :disabled="disabled"
         filterable
-        v-bind="eventList0"
+        v-bind="selectEventList0"
       >
         <el-option
           v-for="item in yearList"
@@ -38,7 +38,7 @@
           filterable
           :disabled="disabled"
           :filter-method="filterHandleE"
-          v-bind="eventList1"
+          v-bind="selectEventList1"
         >
           <el-option
             v-for="item in yearList"
@@ -187,6 +187,18 @@ const eventList1 = {
     onFocus(value, 1);
   },
 };
+const selectEventList0 = computed(() => {
+  return {
+    ...(props.rawAttr || {}),
+    ...eventList0,
+  };
+});
+const selectEventList1 = computed(() => {
+  return {
+    ...(props.rawAttr || {}),
+    ...eventList1,
+  };
+});
 const onChange = (value, index) => {
   emit("changeSelect", value, index);
 };