ct-component-plus 2.2.12 → 2.2.14

package/README.md

@@ -1,3 +1,7 @@
+# v2.2.13版本更新内容：
+
+1. 分页下拉组件添加补充项配置
+
 # v2.2.12版本更新内容：
 
 1. 优化分页下拉组件搜索相关逻辑

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ct-component-plus",
   "private": false,
-  "version": "2.2.12",
+  "version": "2.2.14",
   "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,8 +202,9 @@ useBuriedParams(props, emit, {
   getContent: () => {
     let data = findLabelsByValues(
       optionsShow.value,
-      props.multiple ? showValue.value : [showValue.value]
+      props.multiple ? showValue.value : [showValue.value],
     );
+    console.log(data, "data", showValue.value);
     if (props.multiple) {
       return data;
     } else {

package/packages/components/paging-select/src/index.js

@@ -7,6 +7,12 @@ export const selectProps = {
   ...searchComponentProps,
   modelValue: [String, Number, Array, Boolean],
   multiple: Boolean,
+  options: {
+    type: Array,
+    default() {
+      return [];
+    },
+  },
   filterable: Boolean,
   api: String,
   serviceMethod: String,

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

@@ -107,8 +107,23 @@ const attrs = useAttrs();
 
 const ns = useNamespace("paging-select");
 const optionsByApi = ref([]);
+const extraOptions = computed(() => {
+  return props.options && Array.isArray(props.options) ? props.options : [];
+});
+
 const showOptions = computed(() => {
-  return optionsByApi.value;
+  const map = new Map();
+  (extraOptions.value || []).forEach((item) => {
+    if (!item || item.value === undefined || item.value === null) return;
+    map.set(item.value, item);
+  });
+  (optionsByApi.value || []).forEach((item) => {
+    if (!item || item.value === undefined || item.value === null) return;
+    if (!map.has(item.value)) {
+      map.set(item.value, item);
+    }
+  });
+  return Array.from(map.values());
 });
 const valueModel = computed({
   get() {
@@ -197,8 +212,8 @@ watch(
     selectRef.value.selectedLabel = newVal;
   },
 );
-watch(optionsByApi, () => {
-  const arr = optionsByApi.value || [];
+watch(showOptions, () => {
+  const arr = showOptions.value || [];
   if (arr.length) {
     filterOptions.value = arr;
     noFilterOptions.value = false;