vft 0.0.374 → 0.0.375

package/es/components/transfer/composables/use-check.js

@@ -1,71 +1,109 @@
-import { computed as l, watch as o } from "vue";
-import { isFunction as m } from "@vft/utils";
-import { CHECKED_CHANGE_EVENT as f } from "../transfer-panel.js";
-import { usePropsAlias as v } from "./use-props-alias.js";
-const K = (r, h, i) => {
-  const n = v(r), a = l(() => r.data.filter((e) => m(r.filterMethod) ? r.filterMethod(h.query, e) : String(
-    e[n.value.label] || e[n.value.key]
-  ).toLowerCase().includes(h.query.toLowerCase()))), d = l(
-    () => a.value.filter((e) => !e[n.value.disabled])
-  ), g = l(() => {
-    const e = h.checked.length, c = r.data.length, { noChecked: t, hasChecked: s } = r.format;
-    return t && s ? e > 0 ? s.replace(/\${checked}/g, e.toString()).replace(/\${total}/g, c.toString()) : t.replace(/\${total}/g, c.toString()) : `${e}/${c}`;
-  }), y = l(() => {
-    const e = h.checked.length;
-    return e > 0 && e < d.value.length;
-  }), k = () => {
-    const e = d.value.map(
-      (c) => c[n.value.key]
+import { computed, watch } from "vue";
+import { isFunction } from "@vft/utils";
+import { CHECKED_CHANGE_EVENT } from "../transfer-panel.js";
+import { usePropsAlias } from "./use-props-alias.js";
+const useCheck = (props, panelState, emit) => {
+  const propsAlias = usePropsAlias(props);
+  const filteredData = computed(() => {
+    return props.data.filter((item) => {
+      if (isFunction(props.filterMethod)) {
+        return props.filterMethod(panelState.query, item);
+      } else {
+        const label = String(
+          item[propsAlias.value.label] || item[propsAlias.value.key]
+        );
+        return label.toLowerCase().includes(panelState.query.toLowerCase());
+      }
+    });
+  });
+  const checkableData = computed(
+    () => filteredData.value.filter((item) => !item[propsAlias.value.disabled])
+  );
+  const checkedSummary = computed(() => {
+    const checkedLength = panelState.checked.length;
+    const dataLength = props.data.length;
+    const { noChecked, hasChecked } = props.format;
+    if (noChecked && hasChecked) {
+      return checkedLength > 0 ? hasChecked.replace(/\${checked}/g, checkedLength.toString()).replace(/\${total}/g, dataLength.toString()) : noChecked.replace(/\${total}/g, dataLength.toString());
+    } else {
+      return `${checkedLength}/${dataLength}`;
+    }
+  });
+  const isIndeterminate = computed(() => {
+    const checkedLength = panelState.checked.length;
+    return checkedLength > 0 && checkedLength < checkableData.value.length;
+  });
+  const updateAllChecked = () => {
+    const checkableDataKeys = checkableData.value.map(
+      (item) => item[propsAlias.value.key]
     );
-    h.allChecked = e.length > 0 && e.every((c) => h.checked.includes(c));
-  }, C = (e) => {
-    h.checked = e ? d.value.map((c) => c[n.value.key]) : [];
+    panelState.allChecked = checkableDataKeys.length > 0 && checkableDataKeys.every((item) => panelState.checked.includes(item));
+  };
+  const handleAllCheckedChange = (value) => {
+    panelState.checked = value ? checkableData.value.map((item) => item[propsAlias.value.key]) : [];
   };
-  return o(
-    () => h.checked,
-    (e, c) => {
-      if (k(), h.checkChangeByUser) {
-        const t = e.concat(c).filter((s) => !e.includes(s) || !c.includes(s));
-        i(f, e, t);
-      } else
-        i(f, e), h.checkChangeByUser = !0;
+  watch(
+    () => panelState.checked,
+    (val, oldVal) => {
+      updateAllChecked();
+      if (panelState.checkChangeByUser) {
+        const movedKeys = val.concat(oldVal).filter((v) => !val.includes(v) || !oldVal.includes(v));
+        emit(CHECKED_CHANGE_EVENT, val, movedKeys);
+      } else {
+        emit(CHECKED_CHANGE_EVENT, val);
+        panelState.checkChangeByUser = true;
+      }
     }
-  ), o(d, () => {
-    k();
-  }), o(
-    () => r.data,
+  );
+  watch(checkableData, () => {
+    updateAllChecked();
+  });
+  watch(
+    () => props.data,
     () => {
-      const e = [], c = a.value.map(
-        (t) => t[n.value.key]
+      const checked = [];
+      const filteredDataKeys = filteredData.value.map(
+        (item) => item[propsAlias.value.key]
       );
-      h.checked.forEach((t) => {
-        c.includes(t) && e.push(t);
-      }), h.checkChangeByUser = !1, h.checked = e;
+      panelState.checked.forEach((item) => {
+        if (filteredDataKeys.includes(item)) {
+          checked.push(item);
+        }
+      });
+      panelState.checkChangeByUser = false;
+      panelState.checked = checked;
     }
-  ), o(
-    () => r.defaultChecked,
-    (e, c) => {
-      if (c && e.length === c.length && e.every((u) => c.includes(u)))
+  );
+  watch(
+    () => props.defaultChecked,
+    (val, oldVal) => {
+      if (oldVal && val.length === oldVal.length && val.every((item) => oldVal.includes(item)))
         return;
-      const t = [], s = d.value.map(
-        (u) => u[n.value.key]
+      const checked = [];
+      const checkableDataKeys = checkableData.value.map(
+        (item) => item[propsAlias.value.key]
       );
-      e.forEach((u) => {
-        s.includes(u) && t.push(u);
-      }), h.checkChangeByUser = !1, h.checked = t;
+      val.forEach((item) => {
+        if (checkableDataKeys.includes(item)) {
+          checked.push(item);
+        }
+      });
+      panelState.checkChangeByUser = false;
+      panelState.checked = checked;
     },
     {
-      immediate: !0
+      immediate: true
     }
-  ), {
-    filteredData: a,
-    checkableData: d,
-    checkedSummary: g,
-    isIndeterminate: y,
-    updateAllChecked: k,
-    handleAllCheckedChange: C
+  );
+  return {
+    filteredData,
+    checkableData,
+    checkedSummary,
+    isIndeterminate,
+    updateAllChecked,
+    handleAllCheckedChange
   };
 };
 export {
-  K as useCheck
+  useCheck
 };

package/es/components/transfer/composables/use-checked-change.js

@@ -1,12 +1,20 @@
-import { RIGHT_CHECK_CHANGE_EVENT as h, LEFT_CHECK_CHANGE_EVENT as c } from "../transfer.js";
-const g = (n, r) => ({
-  onSourceCheckedChange: (e, C) => {
-    n.leftChecked = e, C && r(c, e, C);
-  },
-  onTargetCheckedChange: (e, C) => {
-    n.rightChecked = e, C && r(h, e, C);
-  }
-});
+import { RIGHT_CHECK_CHANGE_EVENT, LEFT_CHECK_CHANGE_EVENT } from "../transfer.js";
+const useCheckedChange = (checkedState, emit) => {
+  const onSourceCheckedChange = (val, movedKeys) => {
+    checkedState.leftChecked = val;
+    if (!movedKeys) return;
+    emit(LEFT_CHECK_CHANGE_EVENT, val, movedKeys);
+  };
+  const onTargetCheckedChange = (val, movedKeys) => {
+    checkedState.rightChecked = val;
+    if (!movedKeys) return;
+    emit(RIGHT_CHECK_CHANGE_EVENT, val, movedKeys);
+  };
+  return {
+    onSourceCheckedChange,
+    onTargetCheckedChange
+  };
+};
 export {
-  g as useCheckedChange
+  useCheckedChange
 };

package/es/components/transfer/composables/use-computed-data.js

@@ -1,29 +1,41 @@
-import { computed as l } from "vue";
-import { usePropsAlias as o } from "./use-props-alias.js";
-const m = (t) => {
-  const u = o(t), d = l(
-    () => t.data.reduce(
-      (e, a) => (e[a[u.value.key]] = a) && e,
+import { computed } from "vue";
+import { usePropsAlias } from "./use-props-alias.js";
+const useComputedData = (props) => {
+  const propsAlias = usePropsAlias(props);
+  const dataObj = computed(
+    () => props.data.reduce(
+      (o, cur) => (o[cur[propsAlias.value.key]] = cur) && o,
       {}
     )
-  ), n = l(
-    () => t.data.filter(
-      (e) => !t.modelValue.includes(e[u.value.key])
+  );
+  const sourceData = computed(
+    () => props.data.filter(
+      (item) => !props.modelValue.includes(item[propsAlias.value.key])
     )
-  ), i = l(() => t.targetOrder === "original" ? t.data.filter(
-    (e) => t.modelValue.includes(e[u.value.key])
-  ) : t.modelValue.reduce(
-    (e, a) => {
-      const r = d.value[a];
-      return r && e.push(r), e;
-    },
-    []
-  ));
+  );
+  const targetData = computed(() => {
+    if (props.targetOrder === "original") {
+      return props.data.filter(
+        (item) => props.modelValue.includes(item[propsAlias.value.key])
+      );
+    } else {
+      return props.modelValue.reduce(
+        (arr, cur) => {
+          const val = dataObj.value[cur];
+          if (val) {
+            arr.push(val);
+          }
+          return arr;
+        },
+        []
+      );
+    }
+  });
   return {
-    sourceData: n,
-    targetData: i
+    sourceData,
+    targetData
   };
 };
 export {
-  m as useComputedData
+  useComputedData
 };

package/es/components/transfer/composables/use-move.js

@@ -1,27 +1,38 @@
-import { UPDATE_MODEL_EVENT as c, CHANGE_EVENT as u } from "../../../constants/event.js";
-import { usePropsAlias as s } from "./use-props-alias.js";
-const E = (i, a, d) => {
-  const o = s(i), n = (e, l, t) => {
-    d(c, e), d(u, e, l, t);
+import { UPDATE_MODEL_EVENT, CHANGE_EVENT } from "../../../constants/event.js";
+import { usePropsAlias } from "./use-props-alias.js";
+const useMove = (props, checkedState, emit) => {
+  const propsAlias = usePropsAlias(props);
+  const _emit = (value, direction, movedKeys) => {
+    emit(UPDATE_MODEL_EVENT, value);
+    emit(CHANGE_EVENT, value, direction, movedKeys);
   };
-  return {
-    addToLeft: () => {
-      const e = i.modelValue.slice();
-      a.rightChecked.forEach((l) => {
-        const t = e.indexOf(l);
-        t > -1 && e.splice(t, 1);
-      }), n(e, "left", a.rightChecked);
-    },
-    addToRight: () => {
-      let e = i.modelValue.slice();
-      const l = i.data.filter((t) => {
-        const r = t[o.value.key];
-        return a.leftChecked.includes(r) && !i.modelValue.includes(r);
-      }).map((t) => t[o.value.key]);
-      e = i.targetOrder === "unshift" ? l.concat(e) : e.concat(l), i.targetOrder === "original" && (e = i.data.filter((t) => e.includes(t[o.value.key])).map((t) => t[o.value.key])), n(e, "right", a.leftChecked);
+  const addToLeft = () => {
+    const currentValue = props.modelValue.slice();
+    checkedState.rightChecked.forEach((item) => {
+      const index = currentValue.indexOf(item);
+      if (index > -1) {
+        currentValue.splice(index, 1);
+      }
+    });
+    _emit(currentValue, "left", checkedState.rightChecked);
+  };
+  const addToRight = () => {
+    let currentValue = props.modelValue.slice();
+    const itemsToBeMoved = props.data.filter((item) => {
+      const itemKey = item[propsAlias.value.key];
+      return checkedState.leftChecked.includes(itemKey) && !props.modelValue.includes(itemKey);
+    }).map((item) => item[propsAlias.value.key]);
+    currentValue = props.targetOrder === "unshift" ? itemsToBeMoved.concat(currentValue) : currentValue.concat(itemsToBeMoved);
+    if (props.targetOrder === "original") {
+      currentValue = props.data.filter((item) => currentValue.includes(item[propsAlias.value.key])).map((item) => item[propsAlias.value.key]);
     }
+    _emit(currentValue, "right", checkedState.leftChecked);
+  };
+  return {
+    addToLeft,
+    addToRight
   };
 };
 export {
-  E as useMove
+  useMove
 };

package/es/components/transfer/composables/use-props-alias.js

@@ -1,15 +1,15 @@
-import { computed as s } from "vue";
-const l = (e) => {
-  const o = {
+import { computed } from "vue";
+const usePropsAlias = (props) => {
+  const initProps = {
     label: "label",
     key: "key",
     disabled: "disabled"
   };
-  return s(() => ({
-    ...o,
-    ...e.props
+  return computed(() => ({
+    ...initProps,
+    ...props.props
   }));
 };
 export {
-  l as usePropsAlias
+  usePropsAlias
 };

package/es/components/transfer/index.js

@@ -2,17 +2,17 @@ import "@vueuse/core";
 import "@vft/utils";
 import "../config-provider/hooks/use-global-config.js";
 import "vue";
-import { withInstall as r } from "../../utils/vue/install.js";
+import { withInstall } from "../../utils/vue/install.js";
 import "lodash-es";
-import t from "./transfer.vue2.js";
-import { LEFT_CHECK_CHANGE_EVENT as C, RIGHT_CHECK_CHANGE_EVENT as _, transferCheckedChangeFn as H, transferEmits as T, transferProps as N } from "./transfer.js";
-const E = r(t);
+import _sfc_main from "./transfer.vue2.js";
+import { LEFT_CHECK_CHANGE_EVENT, RIGHT_CHECK_CHANGE_EVENT, transferCheckedChangeFn, transferEmits, transferProps } from "./transfer.js";
+const VftTransfer = withInstall(_sfc_main);
 export {
-  C as LEFT_CHECK_CHANGE_EVENT,
-  _ as RIGHT_CHECK_CHANGE_EVENT,
-  E as VftTransfer,
-  E as default,
-  H as transferCheckedChangeFn,
-  T as transferEmits,
-  N as transferProps
+  LEFT_CHECK_CHANGE_EVENT,
+  RIGHT_CHECK_CHANGE_EVENT,
+  VftTransfer,
+  VftTransfer as default,
+  transferCheckedChangeFn,
+  transferEmits,
+  transferProps
 };

package/es/components/transfer/transfer-panel.js

@@ -2,27 +2,29 @@ import "@vueuse/core";
 import "@vft/utils";
 import "../config-provider/hooks/use-global-config.js";
 import "vue";
-import { buildProps as t, definePropType as r } from "../../utils/vue/props/runtime.js";
-import { transferProps as e, transferCheckedChangeFn as o } from "./transfer.js";
-const n = "checked-change", s = t({
-  data: e.data,
+import { buildProps, definePropType } from "../../utils/vue/props/runtime.js";
+import { transferProps, transferCheckedChangeFn } from "./transfer.js";
+const CHECKED_CHANGE_EVENT = "checked-change";
+const transferPanelProps = buildProps({
+  data: transferProps.data,
   optionRender: {
-    type: r(
+    type: definePropType(
       Function
     )
   },
   placeholder: String,
   title: String,
   filterable: Boolean,
-  format: e.format,
-  filterMethod: e.filterMethod,
-  defaultChecked: e.leftDefaultChecked,
-  props: e.props
-}), c = {
-  [n]: o
+  format: transferProps.format,
+  filterMethod: transferProps.filterMethod,
+  defaultChecked: transferProps.leftDefaultChecked,
+  props: transferProps.props
+});
+const transferPanelEmits = {
+  [CHECKED_CHANGE_EVENT]: transferCheckedChangeFn
 };
 export {
-  n as CHECKED_CHANGE_EVENT,
-  c as transferPanelEmits,
-  s as transferPanelProps
+  CHECKED_CHANGE_EVENT,
+  transferPanelEmits,
+  transferPanelProps
 };

package/es/components/transfer/transfer-panel.vue.js

@@ -1,4 +1,4 @@
-import f from "./transfer-panel.vue2.js";
+import _sfc_main from "./transfer-panel.vue2.js";
 export {
-  f as default
+  _sfc_main as default
 };