widget.qw 1.1.0 → 1.1.2

package/build/style.css

@@ -675,25 +675,25 @@
   margin:3px;
 }
 
-.cascader-pop[data-v-27ca3ce1] {
+.cascader-pop[data-v-36e65e12] {
     width: 100%;
     overflow: hidden;
 }
-.cascader-selector[data-v-27ca3ce1] {
+.cascader-selector[data-v-36e65e12] {
     padding: 10px;
 }
-.search-buttons[data-v-27ca3ce1] {
+.search-buttons[data-v-36e65e12] {
     display: flex;
     gap: 10px;
 }
-.clear-btn[data-v-27ca3ce1] {
+.clear-btn[data-v-36e65e12] {
     background-color: #f2f3f5;
     border: none;
     border-radius: 4px;
     padding: 4px 8px;
     font-size: 14px;
 }
-.confirm-btn[data-v-27ca3ce1] {
+.confirm-btn[data-v-36e65e12] {
     background-color: #1989fa;
     color: white;
     border: none;
@@ -701,19 +701,19 @@
     padding: 4px 8px;
     font-size: 14px;
 }
-.no-results[data-v-27ca3ce1] {
+.no-results[data-v-36e65e12] {
     text-align: center;
     padding: 20px;
     color: #969799;
 }
-.cascader-header[data-v-27ca3ce1] {
+.cascader-header[data-v-36e65e12] {
     padding: 10px;
     border-bottom: 1px solid #ebedf0;
     display: flex;
     justify-content: space-between;
     align-items: center;
 }
-.current-path[data-v-27ca3ce1] {
+.current-path[data-v-36e65e12] {
     flex: 1;
     font-size: 14px;
     margin-left: 5px;
@@ -722,25 +722,25 @@
     overflow: hidden;
     text-overflow: ellipsis;
 }
-.header-right[data-v-27ca3ce1] {
+.header-right[data-v-36e65e12] {
     display: flex;
     gap: 8px;
     margin-left: auto;
 }
-.cancel-btn[data-v-27ca3ce1] {
+.cancel-btn[data-v-36e65e12] {
     color: #969799;
     margin-right: 5px;
 }
-.scroll-container[data-v-27ca3ce1] {
+.scroll-container[data-v-36e65e12] {
     height: calc(80vh - 150px);
     overflow-y: auto;
 }
-.cell-content[data-v-27ca3ce1] {
+.cell-content[data-v-36e65e12] {
     display: flex;
     align-items: center;
     gap: 12px;
 }
-.circle-selector[data-v-27ca3ce1] {
+.circle-selector[data-v-36e65e12] {
     width: 20px;
     height: 20px;
     border-radius: 50%;
@@ -750,29 +750,29 @@
     transition: all 0.2s;
     flex-shrink: 0;
 }
-.circle-selector.selected[data-v-27ca3ce1] {
+.circle-selector.selected[data-v-36e65e12] {
     background-color: #1989fa;
     border-color: #1989fa;
 }
-.circle-selector.selected .van-icon[data-v-27ca3ce1] {
+.circle-selector.selected .van-icon[data-v-36e65e12] {
     color: white;
     font-size: 14px;
 }
-.van-cell__right-icon[data-v-27ca3ce1] {
+.van-cell__right-icon[data-v-36e65e12] {
     color: #969799;
     font-size: 16px;
     margin-left: 8px;
 }
-.name[data-v-27ca3ce1] {
+.name[data-v-36e65e12] {
     flex: 1;
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
 }
-.cancel-btn[data-v-27ca3ce1] {
+.cancel-btn[data-v-36e65e12] {
     color: #969799;
 }
-.search-field[data-v-27ca3ce1] {
+.search-field[data-v-36e65e12] {
     background: #fff;
     padding: 10px 16px;
     border-bottom: 1px solid #ebedf0;

package/build/widget.qw.es.js

@@ -38,7 +38,7 @@ var __async = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
-import { computed, resolveComponent, openBlock, createElementBlock, unref, createVNode, createCommentVNode, createElementVNode, toDisplayString, onUnmounted, onDeactivated, isRef, watch, onMounted, nextTick, onActivated, ref, reactive, getCurrentInstance, provide, inject, isVNode, defineComponent, onBeforeUnmount, watchEffect, mergeProps, Transition, Teleport, withDirectives, vShow, Fragment, createApp, resolveDirective, createBlock, withCtx, renderList, createTextVNode, createSlots, withModifiers, onBeforeUpdate, normalizeClass, renderSlot } from "vue";
+import { computed, resolveComponent, openBlock, createElementBlock, unref, createVNode, createCommentVNode, createElementVNode, toDisplayString, onUnmounted, onDeactivated, isRef, watch, onMounted, nextTick, onActivated, ref, reactive, getCurrentInstance, provide, inject, isVNode, defineComponent, onBeforeUnmount, watchEffect, mergeProps, Transition, Teleport, withDirectives, vShow, Fragment, createApp, resolveDirective, createBlock, withCtx, renderList, createTextVNode, createSlots, withModifiers, onBeforeUpdate, normalizeClass, renderSlot, pushScopeId, popScopeId } from "vue";
 var vm = {};
 var HeadBar_vue_vue_type_style_index_0_scoped_true_lang = /* @__PURE__ */ (() => "\n.enterprise-header[data-v-435ecee6] {\r\n    display: flex;\r\n    align-items: center;\r\n    justify-content: center;\r\n    height: 48px;\r\n    background-color: #2d8cf0; /* \u4F01\u4E1A\u5FAE\u4FE1\u98CE\u683C\u84DD\u8272 */\r\n    background-color: #fff;\r\n    color: white;\r\n    color: #000;\r\n    position: relative;\r\n    box-shadow: 0 1px 4px rgba(0, 0, 0, 0.1);\r\n    margin-bottom: 4px;\n}\n.header-title[data-v-435ecee6] {\r\n    font-size: 14px;\r\n    font-weight: 500;\r\n    white-space: nowrap;\r\n    overflow: hidden;\r\n    text-overflow: ellipsis;\r\n    max-width: 70%;\n}\n.header-btn[data-v-435ecee6] {\r\n    position: absolute;\r\n    width: 48px;\r\n    height: 48px;\r\n    display: flex;\r\n    align-items: center;\r\n    justify-content: center;\r\n    background: transparent;\r\n    border: none;\r\n    color: white;\r\n    color: #000;\r\n    font-size: 20px;\r\n    cursor: pointer;\r\n    padding: 0;\n}\n.header-btn[data-v-435ecee6]:disabled {\r\n    opacity: 0.5;\r\n    cursor: not-allowed;\n}\n.back-btn[data-v-435ecee6] {\r\n    left: 0;\n}\n.home-btn[data-v-435ecee6] {\r\n    right: 0;\n}\r\n  \r\n  \r\n  ")();
 var _export_sfc = (sfc, props2) => {
@@ -6255,12 +6255,32 @@ function uniqCode(arr) {
   }
   return Array.from(uniqueMap.values());
 }
+function uniqMerge(arr1, arr2) {
+  let totalArr = [...arr1, ...arr2];
+  return uniq(totalArr);
+}
+function substractAry(arr1, arr2) {
+  if (!Array.isArray(arr2) || !arr2 || arr2.length < 1)
+    return arr1;
+  return arr1.filter((item) => !arr2.includes(item));
+}
+function isContainAry(arr1, arr2) {
+  if (!Array.isArray(arr1) || !Array.isArray(arr2))
+    return false;
+  if (arr2.length === 0)
+    return true;
+  const set2 = new Set(arr1);
+  return arr2.every((item) => set2.has(item));
+}
 var ArrayUtil = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   arySwapPrev,
   arySwapNext,
   uniq,
-  uniqCode
+  uniqCode,
+  uniqMerge,
+  substractAry,
+  isContainAry
 }, Symbol.toStringTag, { value: "Module" }));
 function fittingString(str, maxWidth, fontSize) {
   var fontWidth = fontSize * 1.3;
@@ -19521,8 +19541,8 @@ const _hoisted_10$1 = /* @__PURE__ */ createTextVNode(" \u5168\u9009 ");
 const _hoisted_11$1 = {
   class: "search-container"
 };
-const _hoisted_12 = /* @__PURE__ */ createTextVNode("\u641C\u7D22");
-const _hoisted_13 = {
+const _hoisted_12$1 = /* @__PURE__ */ createTextVNode("\u641C\u7D22");
+const _hoisted_13$1 = {
   class: "scroll-container"
 };
 const _sfc_main$h = {
@@ -19938,9 +19958,9 @@ const _sfc_main$h = {
           onClick: searchUserById,
           class: "search-btn"
         }, {
-          default: withCtx(() => [_hoisted_12]),
+          default: withCtx(() => [_hoisted_12$1]),
           _: 1
-        })]), createElementVNode("div", _hoisted_13, [!searchUserId.value && currentDepartments.value.length > 0 ? (openBlock(), createBlock(_component_van_cell_group, {
+        })]), createElementVNode("div", _hoisted_13$1, [!searchUserId.value && currentDepartments.value.length > 0 ? (openBlock(), createBlock(_component_van_cell_group, {
           key: 0
         }, {
           default: withCtx(() => [(openBlock(true), createElementBlock(Fragment, null, renderList(currentDepartments.value, (dept) => {
@@ -21615,7 +21635,8 @@ const _sfc_main$4 = {
   }
 };
 var TreePicker = /* @__PURE__ */ _export_sfc(_sfc_main$4, [["__scopeId", "data-v-ebc14630"]]);
-var CascaderPop_vue_vue_type_style_index_0_scoped_true_lang = /* @__PURE__ */ (() => "\n.cascader-pop[data-v-27ca3ce1] {\r\n    width: 100%;\r\n    overflow: hidden;\n}\n.cascader-selector[data-v-27ca3ce1] {\r\n    padding: 10px;\n}\n.search-buttons[data-v-27ca3ce1] {\r\n    display: flex;\r\n    gap: 10px;\n}\n.clear-btn[data-v-27ca3ce1] {\r\n    background-color: #f2f3f5;\r\n    border: none;\r\n    border-radius: 4px;\r\n    padding: 4px 8px;\r\n    font-size: 14px;\n}\n.confirm-btn[data-v-27ca3ce1] {\r\n    background-color: #1989fa;\r\n    color: white;\r\n    border: none;\r\n    border-radius: 4px;\r\n    padding: 4px 8px;\r\n    font-size: 14px;\n}\n.no-results[data-v-27ca3ce1] {\r\n    text-align: center;\r\n    padding: 20px;\r\n    color: #969799;\n}\n.cascader-header[data-v-27ca3ce1] {\r\n    padding: 10px;\r\n    border-bottom: 1px solid #ebedf0;\r\n    display: flex;\r\n    justify-content: space-between;\r\n    align-items: center;\n}\n.current-path[data-v-27ca3ce1] {\r\n    flex: 1;\r\n    font-size: 14px;\r\n    margin-left: 5px;\r\n    color: #323233;\r\n    white-space: nowrap;\r\n    overflow: hidden;\r\n    text-overflow: ellipsis;\n}\n.header-right[data-v-27ca3ce1] {\r\n    display: flex;\r\n    gap: 8px;\r\n    margin-left: auto;\n}\n.cancel-btn[data-v-27ca3ce1] {\r\n    color: #969799;\r\n    margin-right: 5px;\n}\n.scroll-container[data-v-27ca3ce1] {\r\n    height: calc(80vh - 150px);\r\n    overflow-y: auto;\n}\n.cell-content[data-v-27ca3ce1] {\r\n    display: flex;\r\n    align-items: center;\r\n    gap: 12px;\n}\n.circle-selector[data-v-27ca3ce1] {\r\n    width: 20px;\r\n    height: 20px;\r\n    border-radius: 50%;\r\n    display: flex;\r\n    align-items: center;\r\n    justify-content: center;\r\n    transition: all 0.2s;\r\n    flex-shrink: 0;\n}\n.circle-selector.selected[data-v-27ca3ce1] {\r\n    background-color: #1989fa;\r\n    border-color: #1989fa;\n}\n.circle-selector.selected .van-icon[data-v-27ca3ce1] {\r\n    color: white;\r\n    font-size: 14px;\n}\n.van-cell__right-icon[data-v-27ca3ce1] {\r\n    color: #969799;\r\n    font-size: 16px;\r\n    margin-left: 8px;\n}\n.name[data-v-27ca3ce1] {\r\n    flex: 1;\r\n    overflow: hidden;\r\n    text-overflow: ellipsis;\r\n    white-space: nowrap;\n}\n.cancel-btn[data-v-27ca3ce1] {\r\n    color: #969799;\n}\n.search-field[data-v-27ca3ce1] {\r\n    background: #fff;\r\n    padding: 10px 16px;\r\n    border-bottom: 1px solid #ebedf0;\r\n    position: sticky;\r\n    top: 0;\r\n    z-index: 999;\r\n    margin-bottom: 10px;\r\n    flex-shrink: 0;\r\n    /* \u9632\u6B62\u538B\u7F29 */\n}\r\n")();
+var CascaderPop_vue_vue_type_style_index_0_scoped_true_lang = /* @__PURE__ */ (() => "\n.cascader-pop[data-v-36e65e12] {\r\n    width: 100%;\r\n    overflow: hidden;\n}\n.cascader-selector[data-v-36e65e12] {\r\n    padding: 10px;\n}\n.search-buttons[data-v-36e65e12] {\r\n    display: flex;\r\n    gap: 10px;\n}\n.clear-btn[data-v-36e65e12] {\r\n    background-color: #f2f3f5;\r\n    border: none;\r\n    border-radius: 4px;\r\n    padding: 4px 8px;\r\n    font-size: 14px;\n}\n.confirm-btn[data-v-36e65e12] {\r\n    background-color: #1989fa;\r\n    color: white;\r\n    border: none;\r\n    border-radius: 4px;\r\n    padding: 4px 8px;\r\n    font-size: 14px;\n}\n.no-results[data-v-36e65e12] {\r\n    text-align: center;\r\n    padding: 20px;\r\n    color: #969799;\n}\n.cascader-header[data-v-36e65e12] {\r\n    padding: 10px;\r\n    border-bottom: 1px solid #ebedf0;\r\n    display: flex;\r\n    justify-content: space-between;\r\n    align-items: center;\n}\n.current-path[data-v-36e65e12] {\r\n    flex: 1;\r\n    font-size: 14px;\r\n    margin-left: 5px;\r\n    color: #323233;\r\n    white-space: nowrap;\r\n    overflow: hidden;\r\n    text-overflow: ellipsis;\n}\n.header-right[data-v-36e65e12] {\r\n    display: flex;\r\n    gap: 8px;\r\n    margin-left: auto;\n}\n.cancel-btn[data-v-36e65e12] {\r\n    color: #969799;\r\n    margin-right: 5px;\n}\n.scroll-container[data-v-36e65e12] {\r\n    height: calc(80vh - 150px);\r\n    overflow-y: auto;\n}\n.cell-content[data-v-36e65e12] {\r\n    display: flex;\r\n    align-items: center;\r\n    gap: 12px;\n}\n.circle-selector[data-v-36e65e12] {\r\n    width: 20px;\r\n    height: 20px;\r\n    border-radius: 50%;\r\n    display: flex;\r\n    align-items: center;\r\n    justify-content: center;\r\n    transition: all 0.2s;\r\n    flex-shrink: 0;\n}\n.circle-selector.selected[data-v-36e65e12] {\r\n    background-color: #1989fa;\r\n    border-color: #1989fa;\n}\n.circle-selector.selected .van-icon[data-v-36e65e12] {\r\n    color: white;\r\n    font-size: 14px;\n}\n.van-cell__right-icon[data-v-36e65e12] {\r\n    color: #969799;\r\n    font-size: 16px;\r\n    margin-left: 8px;\n}\n.name[data-v-36e65e12] {\r\n    flex: 1;\r\n    overflow: hidden;\r\n    text-overflow: ellipsis;\r\n    white-space: nowrap;\n}\n.cancel-btn[data-v-36e65e12] {\r\n    color: #969799;\n}\n.search-field[data-v-36e65e12] {\r\n    background: #fff;\r\n    padding: 10px 16px;\r\n    border-bottom: 1px solid #ebedf0;\r\n    position: sticky;\r\n    top: 0;\r\n    z-index: 999;\r\n    margin-bottom: 10px;\r\n    flex-shrink: 0;\r\n    /* \u9632\u6B62\u538B\u7F29 */\n}\r\n")();
+const _withScopeId = (n) => (pushScopeId("data-v-36e65e12"), n = n(), popScopeId(), n);
 const _hoisted_1$3 = {
   class: "cascader-selector"
 };
@@ -21640,7 +21661,14 @@ const _hoisted_9$1 = {
   class: "cell-content"
 };
 const _hoisted_10 = ["onClick"];
-const _hoisted_11 = {
+const _hoisted_11 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createElementVNode("span", {
+  class: "name"
+}, "\u5168\u9009", -1));
+const _hoisted_12 = {
+  class: "cell-content"
+};
+const _hoisted_13 = ["onClick"];
+const _hoisted_14 = {
   class: "name"
 };
 const _sfc_main$3 = {
@@ -21685,6 +21713,25 @@ const _sfc_main$3 = {
       keyword: "",
       selectedNodeIds: []
     });
+    const isSelectAll = computed({
+      get() {
+        let optionIds = optionNodes.value.filter((item) => item.canCheck).map((item) => item.id);
+        if (optionIds.length < 1)
+          return false;
+        return util.isContainAry(data2.selectedNodeIds, optionIds);
+      },
+      set(val) {
+        let optionIds = optionNodes.value.filter((item) => item.canCheck).map((item) => item.id);
+        if (val) {
+          data2.selectedNodeIds = util.uniqMerge(data2.selectedNodeIds, optionIds);
+        } else {
+          data2.selectedNodeIds = util.substractAry(data2.selectedNodeIds, optionIds);
+        }
+      }
+    });
+    const onToggleAll = () => {
+      isSelectAll.value = !isSelectAll.value;
+    };
     onMounted(() => {
     });
     const optionNodes = computed(() => {
@@ -21770,8 +21817,12 @@ const _sfc_main$3 = {
     const onToggle = (node) => {
       if (data2.selectedNodeIds.includes(node.id))
         data2.selectedNodeIds = data2.selectedNodeIds.filter((item) => item != node.id);
-      else
-        data2.selectedNodeIds.push(node.id);
+      else {
+        if (props2.multiple)
+          data2.selectedNodeIds.push(node.id);
+        else
+          data2.selectedNodeIds = [node.id];
+      }
     };
     const onNextLevel = (node) => {
       props2.idQueryNode({
@@ -21783,15 +21834,6 @@ const _sfc_main$3 = {
       });
     };
     const query = () => __async(this, null, function* () {
-      if (!props2.multiple) {
-        if (modelValue2.value)
-          data2.selectedNodeIds = [modelValue2.value];
-        else
-          data2.selectedNodeIds = [];
-      } else if (modelValue2.value && modelValue2.value.length > 0)
-        data2.selectedNodeIds = modelValue2.value;
-      else
-        data2.selectedNodeIds = [];
       let params = {};
       if (data2.selectedNodeIds.length > 0)
         params.id = data2.selectedNodeIds[0];
@@ -21802,7 +21844,17 @@ const _sfc_main$3 = {
         data2.parentNode = node;
       });
     });
-    watch(() => [modelValue2.value, props2.show], (n, o) => __async(this, null, function* () {
+    watch(() => [props2.show], (n, o) => __async(this, null, function* () {
+      if (!props2.show)
+        return;
+      if (!props2.multiple) {
+        data2.selectedNodeIds = [modelValue2.value];
+      } else {
+        if (modelValue2.value && modelValue2.value.length > 0)
+          data2.selectedNodeIds = modelValue2.value;
+        else
+          data2.selectedNodeIds = [];
+      }
       query();
     }), {
       immediate: true
@@ -21854,11 +21906,29 @@ const _sfc_main$3 = {
           }, "\u641C\u7D22")]),
           _: 1
         }, 8, ["modelValue", "placeholder"]), createElementVNode("div", _hoisted_8$1, [createVNode(_component_van_cell_group, null, {
-          default: withCtx(() => [(openBlock(true), createElementBlock(Fragment, null, renderList(unref(optionNodes), (item, i) => {
+          default: withCtx(() => [props2.multiple ? (openBlock(), createBlock(_component_van_cell, {
+            key: 0
+          }, {
+            title: withCtx(() => [createElementVNode("div", _hoisted_9$1, [createElementVNode("div", {
+              class: "circle-selector",
+              onClick: withModifiers(onToggleAll, ["stop"])
+            }, [unref(isSelectAll) ? (openBlock(), createBlock(_component_van_icon, {
+              key: 0,
+              name: "success",
+              size: "20",
+              color: "#409eff"
+            })) : createCommentVNode("", true), !unref(isSelectAll) ? (openBlock(), createBlock(_component_van_icon, {
+              key: 1,
+              name: "circle",
+              size: "20",
+              color: "#e0e0e0"
+            })) : createCommentVNode("", true)], 8, _hoisted_10), _hoisted_11])]),
+            _: 1
+          })) : createCommentVNode("", true), (openBlock(true), createElementBlock(Fragment, null, renderList(unref(optionNodes), (item, i) => {
             return openBlock(), createBlock(_component_van_cell, {
               key: i
             }, createSlots({
-              title: withCtx(() => [createElementVNode("div", _hoisted_9$1, [item.canCheck ? (openBlock(), createElementBlock("div", {
+              title: withCtx(() => [createElementVNode("div", _hoisted_12, [item.canCheck ? (openBlock(), createElementBlock("div", {
                 key: 0,
                 class: "circle-selector",
                 onClick: withModifiers(($event) => onToggle(item), ["stop"])
@@ -21872,7 +21942,7 @@ const _sfc_main$3 = {
                 name: "circle",
                 size: "20",
                 color: "#e0e0e0"
-              })) : createCommentVNode("", true)], 8, _hoisted_10)) : createCommentVNode("", true), createElementVNode("span", _hoisted_11, toDisplayString(item.label), 1)])]),
+              })) : createCommentVNode("", true)], 8, _hoisted_13)) : createCommentVNode("", true), createElementVNode("span", _hoisted_14, toDisplayString(item.label), 1)])]),
               _: 2
             }, [item.canExpand ? {
               name: "right-icon",
@@ -21889,7 +21959,7 @@ const _sfc_main$3 = {
     };
   }
 };
-var CascaderPop = /* @__PURE__ */ _export_sfc(_sfc_main$3, [["__scopeId", "data-v-27ca3ce1"]]);
+var CascaderPop = /* @__PURE__ */ _export_sfc(_sfc_main$3, [["__scopeId", "data-v-36e65e12"]]);
 const _hoisted_1$2 = {
   style: {
     "display": "flex",
@@ -21986,9 +22056,15 @@ const _sfc_main$2 = {
       }
     };
     const ids2nodes2 = () => __async(this, null, function* () {
-      if (!data2.selectedNodeIds || data2.selectedNodeIds.length < 1)
+      let ids = [];
+      if (!props2.multiple) {
+        if (modelValue2.value)
+          ids = [modelValue2.value];
+      } else if (modelValue2.value && modelValue2.value.length > 0)
+        ids = modelValue2.value;
+      if (ids.length < 1)
         return [];
-      let promises = data2.selectedNodeIds.map((nodeId) => __async(this, null, function* () {
+      let promises = ids.map((nodeId) => __async(this, null, function* () {
         let params = {};
         params.id = nodeId;
         params.isReturnParent = true;
@@ -22005,13 +22081,15 @@ const _sfc_main$2 = {
       return selectNodes;
     });
     watch(() => JSON.stringify(modelValue2.value), (n, o) => __async(this, null, function* () {
-      data2.selectedNodeIds = modelValue2.value;
-      data2.selectedNodes = yield ids2nodes2();
       if (!props2.multiple) {
         data2.selectedNodeIds = modelValue2.value;
       } else {
-        data2.selectedNodeIds = modelValue2.value;
+        if (modelValue2.value && modelValue2.value.length > 0)
+          data2.selectedNodeIds = modelValue2.value;
+        else
+          data2.selectedNodeIds = [];
       }
+      data2.selectedNodes = yield ids2nodes2();
     }), {
       immediate: true
     });

package/build/widget.qw.umd.js

@@ -6258,12 +6258,32 @@ var __async = (__this, __arguments, generator) => {
     }
     return Array.from(uniqueMap.values());
   }
+  function uniqMerge(arr1, arr2) {
+    let totalArr = [...arr1, ...arr2];
+    return uniq(totalArr);
+  }
+  function substractAry(arr1, arr2) {
+    if (!Array.isArray(arr2) || !arr2 || arr2.length < 1)
+      return arr1;
+    return arr1.filter((item) => !arr2.includes(item));
+  }
+  function isContainAry(arr1, arr2) {
+    if (!Array.isArray(arr1) || !Array.isArray(arr2))
+      return false;
+    if (arr2.length === 0)
+      return true;
+    const set2 = new Set(arr1);
+    return arr2.every((item) => set2.has(item));
+  }
   var ArrayUtil = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
     __proto__: null,
     arySwapPrev,
     arySwapNext,
     uniq,
-    uniqCode
+    uniqCode,
+    uniqMerge,
+    substractAry,
+    isContainAry
   }, Symbol.toStringTag, { value: "Module" }));
   function fittingString(str, maxWidth, fontSize) {
     var fontWidth = fontSize * 1.3;
@@ -19524,8 +19544,8 @@ var __async = (__this, __arguments, generator) => {
   const _hoisted_11$1 = {
     class: "search-container"
   };
-  const _hoisted_12 = /* @__PURE__ */ vue.createTextVNode("\u641C\u7D22");
-  const _hoisted_13 = {
+  const _hoisted_12$1 = /* @__PURE__ */ vue.createTextVNode("\u641C\u7D22");
+  const _hoisted_13$1 = {
     class: "scroll-container"
   };
   const _sfc_main$h = {
@@ -19941,9 +19961,9 @@ var __async = (__this, __arguments, generator) => {
             onClick: searchUserById,
             class: "search-btn"
           }, {
-            default: vue.withCtx(() => [_hoisted_12]),
+            default: vue.withCtx(() => [_hoisted_12$1]),
             _: 1
-          })]), vue.createElementVNode("div", _hoisted_13, [!searchUserId.value && currentDepartments.value.length > 0 ? (vue.openBlock(), vue.createBlock(_component_van_cell_group, {
+          })]), vue.createElementVNode("div", _hoisted_13$1, [!searchUserId.value && currentDepartments.value.length > 0 ? (vue.openBlock(), vue.createBlock(_component_van_cell_group, {
             key: 0
           }, {
             default: vue.withCtx(() => [(vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(currentDepartments.value, (dept) => {
@@ -21618,7 +21638,8 @@ var __async = (__this, __arguments, generator) => {
     }
   };
   var TreePicker = /* @__PURE__ */ _export_sfc(_sfc_main$4, [["__scopeId", "data-v-ebc14630"]]);
-  var CascaderPop_vue_vue_type_style_index_0_scoped_true_lang = /* @__PURE__ */ (() => "\n.cascader-pop[data-v-27ca3ce1] {\r\n    width: 100%;\r\n    overflow: hidden;\n}\n.cascader-selector[data-v-27ca3ce1] {\r\n    padding: 10px;\n}\n.search-buttons[data-v-27ca3ce1] {\r\n    display: flex;\r\n    gap: 10px;\n}\n.clear-btn[data-v-27ca3ce1] {\r\n    background-color: #f2f3f5;\r\n    border: none;\r\n    border-radius: 4px;\r\n    padding: 4px 8px;\r\n    font-size: 14px;\n}\n.confirm-btn[data-v-27ca3ce1] {\r\n    background-color: #1989fa;\r\n    color: white;\r\n    border: none;\r\n    border-radius: 4px;\r\n    padding: 4px 8px;\r\n    font-size: 14px;\n}\n.no-results[data-v-27ca3ce1] {\r\n    text-align: center;\r\n    padding: 20px;\r\n    color: #969799;\n}\n.cascader-header[data-v-27ca3ce1] {\r\n    padding: 10px;\r\n    border-bottom: 1px solid #ebedf0;\r\n    display: flex;\r\n    justify-content: space-between;\r\n    align-items: center;\n}\n.current-path[data-v-27ca3ce1] {\r\n    flex: 1;\r\n    font-size: 14px;\r\n    margin-left: 5px;\r\n    color: #323233;\r\n    white-space: nowrap;\r\n    overflow: hidden;\r\n    text-overflow: ellipsis;\n}\n.header-right[data-v-27ca3ce1] {\r\n    display: flex;\r\n    gap: 8px;\r\n    margin-left: auto;\n}\n.cancel-btn[data-v-27ca3ce1] {\r\n    color: #969799;\r\n    margin-right: 5px;\n}\n.scroll-container[data-v-27ca3ce1] {\r\n    height: calc(80vh - 150px);\r\n    overflow-y: auto;\n}\n.cell-content[data-v-27ca3ce1] {\r\n    display: flex;\r\n    align-items: center;\r\n    gap: 12px;\n}\n.circle-selector[data-v-27ca3ce1] {\r\n    width: 20px;\r\n    height: 20px;\r\n    border-radius: 50%;\r\n    display: flex;\r\n    align-items: center;\r\n    justify-content: center;\r\n    transition: all 0.2s;\r\n    flex-shrink: 0;\n}\n.circle-selector.selected[data-v-27ca3ce1] {\r\n    background-color: #1989fa;\r\n    border-color: #1989fa;\n}\n.circle-selector.selected .van-icon[data-v-27ca3ce1] {\r\n    color: white;\r\n    font-size: 14px;\n}\n.van-cell__right-icon[data-v-27ca3ce1] {\r\n    color: #969799;\r\n    font-size: 16px;\r\n    margin-left: 8px;\n}\n.name[data-v-27ca3ce1] {\r\n    flex: 1;\r\n    overflow: hidden;\r\n    text-overflow: ellipsis;\r\n    white-space: nowrap;\n}\n.cancel-btn[data-v-27ca3ce1] {\r\n    color: #969799;\n}\n.search-field[data-v-27ca3ce1] {\r\n    background: #fff;\r\n    padding: 10px 16px;\r\n    border-bottom: 1px solid #ebedf0;\r\n    position: sticky;\r\n    top: 0;\r\n    z-index: 999;\r\n    margin-bottom: 10px;\r\n    flex-shrink: 0;\r\n    /* \u9632\u6B62\u538B\u7F29 */\n}\r\n")();
+  var CascaderPop_vue_vue_type_style_index_0_scoped_true_lang = /* @__PURE__ */ (() => "\n.cascader-pop[data-v-36e65e12] {\r\n    width: 100%;\r\n    overflow: hidden;\n}\n.cascader-selector[data-v-36e65e12] {\r\n    padding: 10px;\n}\n.search-buttons[data-v-36e65e12] {\r\n    display: flex;\r\n    gap: 10px;\n}\n.clear-btn[data-v-36e65e12] {\r\n    background-color: #f2f3f5;\r\n    border: none;\r\n    border-radius: 4px;\r\n    padding: 4px 8px;\r\n    font-size: 14px;\n}\n.confirm-btn[data-v-36e65e12] {\r\n    background-color: #1989fa;\r\n    color: white;\r\n    border: none;\r\n    border-radius: 4px;\r\n    padding: 4px 8px;\r\n    font-size: 14px;\n}\n.no-results[data-v-36e65e12] {\r\n    text-align: center;\r\n    padding: 20px;\r\n    color: #969799;\n}\n.cascader-header[data-v-36e65e12] {\r\n    padding: 10px;\r\n    border-bottom: 1px solid #ebedf0;\r\n    display: flex;\r\n    justify-content: space-between;\r\n    align-items: center;\n}\n.current-path[data-v-36e65e12] {\r\n    flex: 1;\r\n    font-size: 14px;\r\n    margin-left: 5px;\r\n    color: #323233;\r\n    white-space: nowrap;\r\n    overflow: hidden;\r\n    text-overflow: ellipsis;\n}\n.header-right[data-v-36e65e12] {\r\n    display: flex;\r\n    gap: 8px;\r\n    margin-left: auto;\n}\n.cancel-btn[data-v-36e65e12] {\r\n    color: #969799;\r\n    margin-right: 5px;\n}\n.scroll-container[data-v-36e65e12] {\r\n    height: calc(80vh - 150px);\r\n    overflow-y: auto;\n}\n.cell-content[data-v-36e65e12] {\r\n    display: flex;\r\n    align-items: center;\r\n    gap: 12px;\n}\n.circle-selector[data-v-36e65e12] {\r\n    width: 20px;\r\n    height: 20px;\r\n    border-radius: 50%;\r\n    display: flex;\r\n    align-items: center;\r\n    justify-content: center;\r\n    transition: all 0.2s;\r\n    flex-shrink: 0;\n}\n.circle-selector.selected[data-v-36e65e12] {\r\n    background-color: #1989fa;\r\n    border-color: #1989fa;\n}\n.circle-selector.selected .van-icon[data-v-36e65e12] {\r\n    color: white;\r\n    font-size: 14px;\n}\n.van-cell__right-icon[data-v-36e65e12] {\r\n    color: #969799;\r\n    font-size: 16px;\r\n    margin-left: 8px;\n}\n.name[data-v-36e65e12] {\r\n    flex: 1;\r\n    overflow: hidden;\r\n    text-overflow: ellipsis;\r\n    white-space: nowrap;\n}\n.cancel-btn[data-v-36e65e12] {\r\n    color: #969799;\n}\n.search-field[data-v-36e65e12] {\r\n    background: #fff;\r\n    padding: 10px 16px;\r\n    border-bottom: 1px solid #ebedf0;\r\n    position: sticky;\r\n    top: 0;\r\n    z-index: 999;\r\n    margin-bottom: 10px;\r\n    flex-shrink: 0;\r\n    /* \u9632\u6B62\u538B\u7F29 */\n}\r\n")();
+  const _withScopeId = (n) => (vue.pushScopeId("data-v-36e65e12"), n = n(), vue.popScopeId(), n);
   const _hoisted_1$3 = {
     class: "cascader-selector"
   };
@@ -21643,7 +21664,14 @@ var __async = (__this, __arguments, generator) => {
     class: "cell-content"
   };
   const _hoisted_10 = ["onClick"];
-  const _hoisted_11 = {
+  const _hoisted_11 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ vue.createElementVNode("span", {
+    class: "name"
+  }, "\u5168\u9009", -1));
+  const _hoisted_12 = {
+    class: "cell-content"
+  };
+  const _hoisted_13 = ["onClick"];
+  const _hoisted_14 = {
     class: "name"
   };
   const _sfc_main$3 = {
@@ -21688,6 +21716,25 @@ var __async = (__this, __arguments, generator) => {
         keyword: "",
         selectedNodeIds: []
       });
+      const isSelectAll = vue.computed({
+        get() {
+          let optionIds = optionNodes.value.filter((item) => item.canCheck).map((item) => item.id);
+          if (optionIds.length < 1)
+            return false;
+          return util.isContainAry(data2.selectedNodeIds, optionIds);
+        },
+        set(val) {
+          let optionIds = optionNodes.value.filter((item) => item.canCheck).map((item) => item.id);
+          if (val) {
+            data2.selectedNodeIds = util.uniqMerge(data2.selectedNodeIds, optionIds);
+          } else {
+            data2.selectedNodeIds = util.substractAry(data2.selectedNodeIds, optionIds);
+          }
+        }
+      });
+      const onToggleAll = () => {
+        isSelectAll.value = !isSelectAll.value;
+      };
       vue.onMounted(() => {
       });
       const optionNodes = vue.computed(() => {
@@ -21773,8 +21820,12 @@ var __async = (__this, __arguments, generator) => {
       const onToggle = (node) => {
         if (data2.selectedNodeIds.includes(node.id))
           data2.selectedNodeIds = data2.selectedNodeIds.filter((item) => item != node.id);
-        else
-          data2.selectedNodeIds.push(node.id);
+        else {
+          if (props2.multiple)
+            data2.selectedNodeIds.push(node.id);
+          else
+            data2.selectedNodeIds = [node.id];
+        }
       };
       const onNextLevel = (node) => {
         props2.idQueryNode({
@@ -21786,15 +21837,6 @@ var __async = (__this, __arguments, generator) => {
         });
       };
       const query = () => __async(this, null, function* () {
-        if (!props2.multiple) {
-          if (modelValue2.value)
-            data2.selectedNodeIds = [modelValue2.value];
-          else
-            data2.selectedNodeIds = [];
-        } else if (modelValue2.value && modelValue2.value.length > 0)
-          data2.selectedNodeIds = modelValue2.value;
-        else
-          data2.selectedNodeIds = [];
         let params = {};
         if (data2.selectedNodeIds.length > 0)
           params.id = data2.selectedNodeIds[0];
@@ -21805,7 +21847,17 @@ var __async = (__this, __arguments, generator) => {
           data2.parentNode = node;
         });
       });
-      vue.watch(() => [modelValue2.value, props2.show], (n, o) => __async(this, null, function* () {
+      vue.watch(() => [props2.show], (n, o) => __async(this, null, function* () {
+        if (!props2.show)
+          return;
+        if (!props2.multiple) {
+          data2.selectedNodeIds = [modelValue2.value];
+        } else {
+          if (modelValue2.value && modelValue2.value.length > 0)
+            data2.selectedNodeIds = modelValue2.value;
+          else
+            data2.selectedNodeIds = [];
+        }
         query();
       }), {
         immediate: true
@@ -21857,11 +21909,29 @@ var __async = (__this, __arguments, generator) => {
             }, "\u641C\u7D22")]),
             _: 1
           }, 8, ["modelValue", "placeholder"]), vue.createElementVNode("div", _hoisted_8$1, [vue.createVNode(_component_van_cell_group, null, {
-            default: vue.withCtx(() => [(vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(vue.unref(optionNodes), (item, i) => {
+            default: vue.withCtx(() => [props2.multiple ? (vue.openBlock(), vue.createBlock(_component_van_cell, {
+              key: 0
+            }, {
+              title: vue.withCtx(() => [vue.createElementVNode("div", _hoisted_9$1, [vue.createElementVNode("div", {
+                class: "circle-selector",
+                onClick: vue.withModifiers(onToggleAll, ["stop"])
+              }, [vue.unref(isSelectAll) ? (vue.openBlock(), vue.createBlock(_component_van_icon, {
+                key: 0,
+                name: "success",
+                size: "20",
+                color: "#409eff"
+              })) : vue.createCommentVNode("", true), !vue.unref(isSelectAll) ? (vue.openBlock(), vue.createBlock(_component_van_icon, {
+                key: 1,
+                name: "circle",
+                size: "20",
+                color: "#e0e0e0"
+              })) : vue.createCommentVNode("", true)], 8, _hoisted_10), _hoisted_11])]),
+              _: 1
+            })) : vue.createCommentVNode("", true), (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(vue.unref(optionNodes), (item, i) => {
               return vue.openBlock(), vue.createBlock(_component_van_cell, {
                 key: i
               }, vue.createSlots({
-                title: vue.withCtx(() => [vue.createElementVNode("div", _hoisted_9$1, [item.canCheck ? (vue.openBlock(), vue.createElementBlock("div", {
+                title: vue.withCtx(() => [vue.createElementVNode("div", _hoisted_12, [item.canCheck ? (vue.openBlock(), vue.createElementBlock("div", {
                   key: 0,
                   class: "circle-selector",
                   onClick: vue.withModifiers(($event) => onToggle(item), ["stop"])
@@ -21875,7 +21945,7 @@ var __async = (__this, __arguments, generator) => {
                   name: "circle",
                   size: "20",
                   color: "#e0e0e0"
-                })) : vue.createCommentVNode("", true)], 8, _hoisted_10)) : vue.createCommentVNode("", true), vue.createElementVNode("span", _hoisted_11, vue.toDisplayString(item.label), 1)])]),
+                })) : vue.createCommentVNode("", true)], 8, _hoisted_13)) : vue.createCommentVNode("", true), vue.createElementVNode("span", _hoisted_14, vue.toDisplayString(item.label), 1)])]),
                 _: 2
               }, [item.canExpand ? {
                 name: "right-icon",
@@ -21892,7 +21962,7 @@ var __async = (__this, __arguments, generator) => {
       };
     }
   };
-  var CascaderPop = /* @__PURE__ */ _export_sfc(_sfc_main$3, [["__scopeId", "data-v-27ca3ce1"]]);
+  var CascaderPop = /* @__PURE__ */ _export_sfc(_sfc_main$3, [["__scopeId", "data-v-36e65e12"]]);
   const _hoisted_1$2 = {
     style: {
       "display": "flex",
@@ -21989,9 +22059,15 @@ var __async = (__this, __arguments, generator) => {
         }
       };
       const ids2nodes2 = () => __async(this, null, function* () {
-        if (!data2.selectedNodeIds || data2.selectedNodeIds.length < 1)
+        let ids = [];
+        if (!props2.multiple) {
+          if (modelValue2.value)
+            ids = [modelValue2.value];
+        } else if (modelValue2.value && modelValue2.value.length > 0)
+          ids = modelValue2.value;
+        if (ids.length < 1)
           return [];
-        let promises = data2.selectedNodeIds.map((nodeId) => __async(this, null, function* () {
+        let promises = ids.map((nodeId) => __async(this, null, function* () {
           let params = {};
           params.id = nodeId;
           params.isReturnParent = true;
@@ -22008,13 +22084,15 @@ var __async = (__this, __arguments, generator) => {
         return selectNodes;
       });
       vue.watch(() => JSON.stringify(modelValue2.value), (n, o) => __async(this, null, function* () {
-        data2.selectedNodeIds = modelValue2.value;
-        data2.selectedNodes = yield ids2nodes2();
         if (!props2.multiple) {
           data2.selectedNodeIds = modelValue2.value;
         } else {
-          data2.selectedNodeIds = modelValue2.value;
+          if (modelValue2.value && modelValue2.value.length > 0)
+            data2.selectedNodeIds = modelValue2.value;
+          else
+            data2.selectedNodeIds = [];
         }
+        data2.selectedNodes = yield ids2nodes2();
       }), {
         immediate: true
       });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "widget.qw",
   "private": false,
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "marqstree Vue3组件库",
   "main": "build/widget.qw.es.js",
   "keywords": [

package/src/components/CascaderPicker.vue

@@ -16,8 +16,9 @@
         </template>
     </van-field>
 
-    <CascaderPop :multiple="props.multiple" v-model:show="data.isShowPop" v-model="data.selectedNodeIds" :placeholder="props.placeholder"
-        @select="onSelect" :keywordQueryNode="props.keywordQueryNode" :idQueryNode="props.idQueryNode" />
+    <CascaderPop :multiple="props.multiple" v-model:show="data.isShowPop" v-model="data.selectedNodeIds"
+        :placeholder="props.placeholder" @select="onSelect" :keywordQueryNode="props.keywordQueryNode"
+        :idQueryNode="props.idQueryNode" />
 </template>
 
 <script setup>
@@ -102,12 +103,6 @@ const onSelect = (nodes) => {
         data.selectedNodes = nodes
         emit('select', data.selectedNodes)
         modelValue.value = data.selectedNodes.map(item => item.id)
-
-        // let one = data.selectedNodes.find(item => item.id === node.id)
-        // if (!one)
-        //     data.selectedNodes = [...data.selectedNodes, node]
-        // emit('select', data.selectedNodes)
-        // modelValue.value = data.selectedNodes.map(item => item.id)
     }
 }
 
@@ -119,11 +114,19 @@ const onDelete = (idx) => {
     }
 }
 
-const ids2nodes = async() => {
-    if(!data.selectedNodeIds || data.selectedNodeIds.length<1)
+const ids2nodes = async () => {
+    let ids = []
+    if(!props.multiple){
+        if(modelValue.value)
+            ids = [modelValue.value]
+    }
+    else if(modelValue.value && modelValue.value.length>0)
+        ids = modelValue.value
+
+    if (ids.length < 1)
         return []
 
-    let promises = data.selectedNodeIds.map(async(nodeId) => {
+    let promises = ids.map(async (nodeId) => {
         let params = {}
         params.id = nodeId
         params.isReturnParent = true
@@ -137,24 +140,24 @@ const ids2nodes = async() => {
         })
         return selectNode
     })
-    
+
     let selectNodes = await Promise.all(promises)
 
     return selectNodes
 }
 
-watch(() => JSON.stringify(modelValue.value), async(n, o) => {
-    data.selectedNodeIds = modelValue.value
-    data.selectedNodes = await ids2nodes()
-    
-    //单用户选择时，将用户id记录在selectedNodeIds,用户对象存入selectedNodes的第一个元素
+watch(() => JSON.stringify(modelValue.value), async (n, o) => {
     if (!props.multiple) {
         data.selectedNodeIds = modelValue.value
     }
-    //多用户选择时，遍历回调接口获取多用户对象列表，记录在selectedNodes
     else {
-        data.selectedNodeIds = modelValue.value
+        if (modelValue.value && modelValue.value.length > 0)
+            data.selectedNodeIds = modelValue.value
+        else
+            data.selectedNodeIds = []
     }
+
+    data.selectedNodes = await ids2nodes()
 }, {
     immediate: true
 })

package/src/components/CascaderPop.vue

@@ -27,6 +27,17 @@
             <div class="scroll-container">
                 <!-- 遍历子节点列表 -->
                 <van-cell-group>
+                    <van-cell v-if="props.multiple">
+                        <template #title>
+                            <div class="cell-content">
+                                <div class="circle-selector" @click.stop="onToggleAll">
+                                    <van-icon v-if="isSelectAll" name="success" size="20" color="#409eff" />
+                                    <van-icon v-if="!isSelectAll" name="circle" size="20" color="#e0e0e0" />
+                                </div>
+                                <span class="name">全选</span>
+                            </div>
+                        </template>
+                    </van-cell>
                     <van-cell v-for="(item, i) in optionNodes" :key="i">
                         <template #title>
                             <div class="cell-content">
@@ -94,6 +105,28 @@ const data = reactive({
     selectedNodeIds: []
 })
 
+const isSelectAll = computed({
+    get() {
+        let optionIds = optionNodes.value.filter(item => item.canCheck).map(item => item.id)
+        if (optionIds.length < 1)
+            return false
+
+        return util.isContainAry(data.selectedNodeIds, optionIds)
+    },
+    set(val) {
+        let optionIds = optionNodes.value.filter(item => item.canCheck).map(item => item.id)
+        if (val) {
+            data.selectedNodeIds = util.uniqMerge(data.selectedNodeIds, optionIds)
+        } else {
+            data.selectedNodeIds = util.substractAry(data.selectedNodeIds, optionIds)
+        }
+    }
+})
+
+const onToggleAll = () => {
+    isSelectAll.value = !isSelectAll.value
+}
+
 onMounted(() => {
 })
 
@@ -148,11 +181,11 @@ const reset = () => {
     data.selectedNodeIds = []
 }
 
-const ids2nodes = async() => {
-    if(!data.selectedNodeIds || data.selectedNodeIds.length<1)
+const ids2nodes = async () => {
+    if (!data.selectedNodeIds || data.selectedNodeIds.length < 1)
         return []
 
-    let promises = data.selectedNodeIds.map(async(nodeId) => {
+    let promises = data.selectedNodeIds.map(async (nodeId) => {
         let params = {}
         params.id = nodeId
         params.isReturnParent = true
@@ -166,14 +199,14 @@ const ids2nodes = async() => {
         })
         return selectNode
     })
-    
+
     let selectNodes = await Promise.all(promises)
 
     return selectNodes
 }
 
 // 确认按钮
-const onSubmit = async() => {
+const onSubmit = async () => {
     if (!data.selectedNodeIds || data.selectedNodeIds.length < 1) {
         util.warnToast("请选择")
         return
@@ -203,8 +236,12 @@ const onCancel = () => {
 const onToggle = (node) => {
     if (data.selectedNodeIds.includes(node.id))
         data.selectedNodeIds = data.selectedNodeIds.filter(item => item != node.id)
-    else
-        data.selectedNodeIds.push(node.id)
+    else {
+        if (props.multiple)
+            data.selectedNodeIds.push(node.id)
+        else
+            data.selectedNodeIds = [node.id]
+    }
 }
 
 const onNextLevel = (node) => {
@@ -214,17 +251,6 @@ const onNextLevel = (node) => {
 }
 
 const query = async () => {
-    if (!props.multiple)
-        if (modelValue.value)
-            data.selectedNodeIds = [modelValue.value]
-        else
-            data.selectedNodeIds = []
-    else
-        if (modelValue.value && modelValue.value.length > 0)
-            data.selectedNodeIds = modelValue.value
-        else
-            data.selectedNodeIds = []
-
     let params = {}
     if (data.selectedNodeIds.length > 0)
         params.id = data.selectedNodeIds[0]
@@ -235,132 +261,27 @@ const query = async () => {
     await props.idQueryNode(params, (node) => {
         data.parentNode = node
     })
-
-
-    // if (!props.multiple) {
-    //     //空id时，查带子节点的虚拟根节点
-    //     if (!data.selectedNodeIds) {
-    //         let params = {}
-    //         params.isReturnParent = true
-    //         params.hasChildren = true
-    //         params.hasPaths = true
-
-    //         await props.idQueryNode(params, (node) => {
-    //             data.parentNode = node
-
-    //             // if (!data.selectedNodeIds)
-    //             //     return
-
-    //             // let childNode = util.findNode(modelValue.value, data.parentNode.children)
-    //             // emit('select', childNode)
-    //         })
-    //     }
-    //     //选中节点时
-    //     else {
-    //         //未显示底部弹窗时，只查节点本身
-    //         if (!props.show) {
-    //             let params = {}
-    //             params.id = modelValue.value
-    //             params.isReturnParent = true
-    //             params.hasChildren = false
-    //             params.hasPaths = true
-
-    //             await props.idQueryNode(params, (node) => {
-    //                 data.parentNode = node
-    //                 let childNode = util.findNode(modelValue.value, data.parentNode.children)
-    //                 emit('select', childNode)
-    //             })
-    //         }
-    //         //显示底部弹窗时，查询带子节点的父节点
-    //         else {
-    //             let params = {}
-    //             params.id = modelValue.value
-    //             params.isReturnParent = true
-    //             params.hasChildren = true
-    //             params.hasPaths = true
-
-    //             await props.idQueryNode(params, (node) => {
-    //                 data.parentNode = node
-    //                 if (!modelValue.value)
-    //                     return
-    //                 let childNode = util.findNode(modelValue.value, data.parentNode.children)
-    //                 emit('select', childNode)
-    //             })
-    //         }
-    //     }
-    // } else {
-    //     //空数组时，查带子节点的虚拟根节点
-    //     if (!data.selectedNodeIds || data.selectedNodeIds.length < 1) {
-    //         let params = {}
-    //         params.isReturnParent = true
-    //         params.hasChildren = true
-    //         params.hasPaths = true
-
-    //         await props.idQueryNode(params, (node) => {
-    //             data.parentNode = node
-
-    //             if (!modelValue.value)
-    //                 return
-
-    //             let childNode = util.findNode(modelValue.value, data.parentNode.children)
-    //             emit('select', childNode)
-    //         })
-    //     }
-    //     //选中节点时
-    //     else {
-    //         //未显示底部弹窗时，只查节点本身
-    //         if (!props.show) {
-    //             let selectNodes = data.selectedNodeIds.map(async(nodeId) => {
-    //                 let params = {}
-    //                 params.id = nodeId
-    //                 params.isReturnParent = true
-    //                 params.hasChildren = false
-    //                 params.hasPaths = true
-
-    //                 let selectNode = await props.idQueryNode(params, (node) => {
-    //                     data.parentNode = node
-    //                     let childNode = util.findNode(nodeId, data.parentNode.children)
-    //                     return childNode
-    //                 })
-    //                 return selectNode
-    //             })
-    //             // emit('select', selectNodes)
-    //         }
-    //         //显示底部弹窗时，查询第一个选中节点的的父节点
-    //         else {
-    //             let params = {}
-    //             params.id = data.selectedNodeIds[0]
-    //             params.isReturnParent = true
-    //             params.hasChildren = true
-    //             params.hasPaths = true
-
-    //             await props.idQueryNode(params, (node) => {
-    //                 data.parentNode = node
-    //                 if (!data.selectedNodeIds[0])
-    //                     return
-    //                 let childNode = util.findNode(data.selectedNodeIds[0], data.parentNode.children)
-    //                 // emit('select', childNode)
-    //             })
-    //         }
-    //     }
-    // }
 }
 
 //根据id查询详情对象
-watch(() => [modelValue.value, props.show], async (n, o) => {
+watch(() => [props.show], async (n, o) => {
+    if (!props.show)
+        return
+
+    if (!props.multiple) {
+        data.selectedNodeIds = [modelValue.value]
+    }
+    else {
+        if (modelValue.value && modelValue.value.length > 0)
+            data.selectedNodeIds = modelValue.value
+        else
+            data.selectedNodeIds = []
+    }
+
     query()
 }, {
     immediate: true
 })
-
-// watch(() => props.show, () => {
-//     if (!props.show)
-//         return
-
-//     query()
-// }, {
-//     immediate: true
-// })
 </script>
 
 <style scoped>

package/src/util/array_util.js

@@ -12,21 +12,43 @@ export function arySwapNext(arr, index) {
   return arr;
 }
 
-export function uniq(ary){
-    // 去重
-    let newAry = [...new Set(ary)]
-    return newAry
+export function uniq(ary) {
+  // 去重
+  let newAry = [...new Set(ary)]
+  return newAry
 }
 
 export function uniqCode(arr) {
   const uniqueMap = new Map();
   for (const item of arr) {
-      const key = item.code
-      if (!uniqueMap.has(key)) {
-          uniqueMap.set(key, item);
-      }
+    const key = item.code
+    if (!uniqueMap.has(key)) {
+      uniqueMap.set(key, item);
+    }
   }
   return Array.from(uniqueMap.values());
 }
 
+//合并两个数组，合并后的数组去重
+export function uniqMerge(arr1, arr2) {
+  let totalArr = [...arr1, ...arr2]
+  return uniq(totalArr)
+}
+
+//数组1减去数组2
+export function substractAry(arr1, arr2) {
+  if (!Array.isArray(arr2) || !arr2 || arr2.length<1) 
+    return arr1
 
+  return arr1.filter(item => !arr2.includes(item))
+}
+
+//判断数组1是否包含数组2
+export function isContainAry(arr1, arr2){
+  // 非数组直接返回false
+  if (!Array.isArray(arr1) || !Array.isArray(arr2)) return false
+  // 空数组2默认视为被包含
+  if (arr2.length === 0) return true
+  const set = new Set(arr1)
+  return arr2.every(item => set.has(item))
+}

package/src/views/userpicker/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="page">
-    <UserPicker label="项目经理" multiple v-model="data.userids" :auth="data.auth" />
+    <UserPicker label="项目经理" :multiple="data.multiple" v-model="data.userids" :auth="data.auth" />
   </div>
 </template>
 
@@ -9,8 +9,9 @@ import { reactive, onMounted } from "vue";
 import UserPicker from '../cascaderpicker/userpicker.vue'
 
 const data = reactive({
-  auth: 'readonly',
-  userids: ["HouMu"]
+  multiple:true,
+  auth: 'require',
+  userids: []
 })
 
 onMounted(() => {