@fangzhongya/fang-ui 0.1.34 → 0.1.36

package/dist/directives/scroll/index.js

@@ -1,104 +1,139 @@
-import { toValue, watch } from "vue";
-const vScroll = {
-  name: "scroll",
-  mounted(el, binding) {
-    const value = binding.value;
-    let fun = () => {
+import { watch, toValue } from "vue";
+function parseConfig(el, value) {
+  const scrollSelector = el.getAttribute("scroll-selector");
+  const scrollDistance = el.getAttribute("scroll-distance");
+  const baseConfig = {
+    fun: () => {
+    },
+    isEnabled: true,
+    selector: scrollSelector || null,
+    distance: scrollDistance ? Number.parseInt(scrollDistance, 10) : 10,
+    loadText: "加载中...",
+    endText: "无更多数据",
+    cssname: "v-scroll-add",
+    isFunctionBinding: false
+  };
+  if (typeof value === "function") {
+    return {
+      ...baseConfig,
+      fun: value,
+      isFunctionBinding: true
     };
-    let is = true;
-    let selector = el.getAttribute(`scroll-selector`);
-    let distance = el.getAttribute(`scroll-distance`) || 10;
-    let loadText = "加载中...";
-    let endText = "无更多数据";
-    let cssname = "v-scroll-add";
-    let isf = false;
-    if (typeof value === "function") {
-      isf = true;
-      fun = value;
-    } else {
-      fun = value.onChange;
-      is = value.is;
-      if (value.dom) {
-        selector = value.dom;
-      }
-      if (value.distance) {
-        distance = value.distance;
-      }
-      if (value.loadText) {
-        loadText = value.loadText;
-      }
-      if (value.endText) {
-        endText = value.endText;
-      }
-      if (value.cssname) {
-        cssname = value.cssname;
+  }
+  return {
+    ...baseConfig,
+    fun: value.onChange,
+    isEnabled: value.is ?? true,
+    selector: value.dom || baseConfig.selector,
+    distance: value.distance || baseConfig.distance,
+    loadText: value.loadText || baseConfig.loadText,
+    endText: value.endText || baseConfig.endText,
+    cssname: value.cssname || baseConfig.cssname
+  };
+}
+function getScrollContainer(el, selector) {
+  if (!selector) return el;
+  if (typeof selector === "string") {
+    const foundElement = el.querySelector(selector);
+    return foundElement || el;
+  }
+  return selector;
+}
+function createStatusElement(scrollContainer, cssname) {
+  const statusElement = document.createElement("div");
+  statusElement.className = cssname;
+  statusElement.style.display = "none";
+  scrollContainer.appendChild(statusElement);
+  return statusElement;
+}
+function setupStatusWatchers(statusElement, value, config) {
+  if (value.load) {
+    watch(
+      () => toValue(value.load),
+      (isLoading) => {
+        if (isLoading) {
+          statusElement.className = `${config.cssname} ${config.cssname}-load`;
+          statusElement.style.display = "block";
+          statusElement.textContent = config.loadText;
+        } else {
+          statusElement.style.display = "none";
+        }
       }
-    }
-    let t;
-    let tm = () => {
-      clearTimeout(t);
-      t = setTimeout(() => {
-        if (isf) {
-          fun();
+    );
+  }
+  if (value.end) {
+    watch(
+      () => toValue(value.end),
+      (isEnd) => {
+        if (isEnd) {
+          setTimeout(() => {
+            statusElement.className = `${config.cssname} ${config.cssname}-end`;
+            statusElement.style.display = "block";
+            statusElement.textContent = config.endText;
+          }, 100);
         } else {
-          if (!toValue(value.load) && !toValue(value.end)) {
-            fun();
-          }
+          statusElement.style.display = "none";
         }
-      }, 100);
-    };
-    let dom = el;
-    if (selector) {
-      if (typeof selector == "string") {
-        dom = el.querySelector(selector);
+      }
+    );
+  }
+}
+function createScrollHandler(scrollContainer, config, value) {
+  let debounceTimer;
+  const handleScrollEnd = () => {
+    clearTimeout(debounceTimer);
+    debounceTimer = setTimeout(() => {
+      if (config.isFunctionBinding) {
+        config.fun();
       } else {
-        dom = selector;
+        const scrollValue = value;
+        const loadValue = scrollValue.load ? toValue(scrollValue.load) : false;
+        const endValue = scrollValue.end ? toValue(scrollValue.end) : false;
+        if (!loadValue && !endValue) {
+          config.fun();
+        }
       }
+    }, 100);
+  };
+  return () => {
+    const remainingScroll = scrollContainer.scrollHeight - scrollContainer.scrollTop;
+    const visibleHeight = scrollContainer.clientHeight;
+    if (remainingScroll - config.distance <= visibleHeight) {
+      handleScrollEnd();
     }
-    if (dom && is) {
-      if (!isf) {
-        const adddmm = document.createElement("div");
-        adddmm.className = cssname;
-        adddmm.style.display = "none";
-        dom.appendChild(adddmm);
-        watch(value.load, () => {
-          const v = toValue(value.load);
-          if (v) {
-            adddmm.className = cssname + " " + cssname + "-load";
-            adddmm.style.display = "block";
-            adddmm.innerText = loadText;
-          } else {
-            adddmm.style.display = "none";
-          }
-        });
-        watch(value.end, () => {
-          const v = toValue(value.end);
-          if (v) {
-            setTimeout(() => {
-              adddmm.className = cssname + " " + cssname + "-end";
-              adddmm.style.display = "block";
-              adddmm.innerText = endText;
-            }, 100);
-          } else {
-            adddmm.style.display = "none";
-          }
-        });
-      }
-      dom.style.overflowY = "auto";
-      dom.addEventListener(
-        "scroll",
-        function() {
-          let d = this;
-          const s = d.scrollHeight - d.scrollTop;
-          const h = d.clientHeight;
-          if (s - distance < h) {
-            tm();
-          }
-        },
-        {
-          passive: true
-        }
+  };
+}
+const vScroll = {
+  name: "scroll",
+  mounted(el, binding) {
+    const value = binding.value;
+    const config = parseConfig(el, value);
+    const scrollContainer = getScrollContainer(el, config.selector);
+    if (!scrollContainer || !config.isEnabled) return;
+    scrollContainer.style.overflowY = "auto";
+    if (!config.isFunctionBinding) {
+      const statusElement = createStatusElement(
+        scrollContainer,
+        config.cssname
       );
+      setupStatusWatchers(statusElement, value, config);
+    }
+    const scrollHandler = createScrollHandler(
+      scrollContainer,
+      config,
+      value
+    );
+    scrollContainer.addEventListener("scroll", scrollHandler, {
+      passive: true
+    });
+    el._scrollCleanup = () => {
+      scrollContainer.removeEventListener("scroll", scrollHandler);
+    };
+  },
+  unmounted(el) {
+    if (el._scrollCleanup) {
+      el._scrollCleanup();
+      delete el._scrollCleanup;
     }
   }
 };

package/dist/directives/sortable/index.cjs

@@ -13,31 +13,27 @@ const vSortable = {
       } else {
         dom = value.dom;
       }
+    } else if (selector) {
+      dom = el.querySelector(selector);
     } else {
-      if (selector) {
-        dom = el.querySelector(selector);
-      } else {
-        dom = el;
-      }
+      dom = el;
     }
     if (dom && value.is !== false) {
-      const options = Object.assign(
-        {
-          animation: 150,
-          // 动画时长
-          ghostClass: "sortable-ghost",
-          // 拖拽时占位元素的样式
-          chosenClass: "sortable-chosen",
-          // 被选中元素的样式
-          dragClass: "sortable-drag"
-          // 拖拽元素的样式
-        },
-        value.options || {
+      const options = {
+        animation: 150,
+        // 动画时长
+        ghostClass: "sortable-ghost",
+        // 拖拽时占位元素的样式
+        chosenClass: "sortable-chosen",
+        // 被选中元素的样式
+        dragClass: "sortable-drag",
+        // 拖拽元素的样式
+        ...value.options || {
           ...value,
           dom: void 0,
           is: void 0
         }
-      );
+      };
       Sortable.create(dom, options);
     }
   }

package/dist/directives/sortable/index.js

@@ -11,31 +11,27 @@ const vSortable = {
       } else {
         dom = value.dom;
       }
+    } else if (selector) {
+      dom = el.querySelector(selector);
     } else {
-      if (selector) {
-        dom = el.querySelector(selector);
-      } else {
-        dom = el;
-      }
+      dom = el;
     }
     if (dom && value.is !== false) {
-      const options = Object.assign(
-        {
-          animation: 150,
-          // 动画时长
-          ghostClass: "sortable-ghost",
-          // 拖拽时占位元素的样式
-          chosenClass: "sortable-chosen",
-          // 被选中元素的样式
-          dragClass: "sortable-drag"
-          // 拖拽元素的样式
-        },
-        value.options || {
+      const options = {
+        animation: 150,
+        // 动画时长
+        ghostClass: "sortable-ghost",
+        // 拖拽时占位元素的样式
+        chosenClass: "sortable-chosen",
+        // 被选中元素的样式
+        dragClass: "sortable-drag",
+        // 拖拽元素的样式
+        ...value.options || {
           ...value,
           dom: void 0,
           is: void 0
         }
-      );
+      };
       Sortable.create(dom, options);
     }
   }

package/dist/expand/{chunk-3HP2ZDNG.cjs → chunk-PBGPF77Y.cjs}

@@ -104,7 +104,6 @@ var config_default = {
     "select-popover",
     "tree-select-box",
     "user-select",
-    "array",
     "buttons",
     "cascaders",
     "checks",
@@ -112,6 +111,7 @@ var config_default = {
     "dates-divide",
     "dates-picker",
     "dates2",
+    "double",
     "edit",
     "edit-float",
     "history",
@@ -182,10 +182,10 @@ var config_default = {
     "audios",
     "images",
     "videos",
-    "array",
     "buttons",
     "cascaders",
     "checks",
+    "double",
     "history",
     "input-array",
     "input-history",

package/dist/expand/{chunk-7C25SBCF.js → chunk-S57QISTZ.js}

@@ -104,7 +104,6 @@ var config_default = {
     "select-popover",
     "tree-select-box",
     "user-select",
-    "array",
     "buttons",
     "cascaders",
     "checks",
@@ -112,6 +111,7 @@ var config_default = {
     "dates-divide",
     "dates-picker",
     "dates2",
+    "double",
     "edit",
     "edit-float",
     "history",
@@ -182,10 +182,10 @@ var config_default = {
     "audios",
     "images",
     "videos",
-    "array",
     "buttons",
     "cascaders",
     "checks",
+    "double",
     "history",
     "input-array",
     "input-history",

package/dist/expand/components.cjs

@@ -1,6 +1,6 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunk3HP2ZDNGcjs = require('./chunk-3HP2ZDNG.cjs');
+var _chunkPBGPF77Ycjs = require('./chunk-PBGPF77Y.cjs');
 
 // expand/components.ts
 var _humpToLine = require('@fangzhongya/utils/name/humpToLine');
@@ -35,11 +35,11 @@ function getFrom(mc, type, conf) {
   const p = config.prefix ? config.prefix + "-" : "";
   const filename = p ? mc.replace(new RegExp("^" + p), "") : mc;
   if (type == 1) {
-    if (_chunk3HP2ZDNGcjs.config_default.components.includes(filename)) {
+    if (_chunkPBGPF77Ycjs.config_default.components.includes(filename)) {
       const name = _lineToLargeHump.lineToLargeHump.call(void 0, mc);
       const from = `${config.name}/components/${filename}/index`;
       let sideEffects;
-      if (_chunk3HP2ZDNGcjs.config_default.sideEffects.includes(filename)) {
+      if (_chunkPBGPF77Ycjs.config_default.sideEffects.includes(filename)) {
         if (conf.css) {
           sideEffects = `${config.name}/components/${filename}/style/index${conf.css || 2}.scss`;
         } else {
@@ -55,14 +55,14 @@ function getFrom(mc, type, conf) {
       return;
     }
   } else {
-    if (_chunk3HP2ZDNGcjs.config_default.directives.includes(filename)) {
+    if (_chunkPBGPF77Ycjs.config_default.directives.includes(filename)) {
       const name = "default";
       const from = `${config.name}/directives/${filename}/index`;
       return {
         name,
         from
       };
-    } else if (_chunk3HP2ZDNGcjs.config_default.directives.includes("v-" + filename)) {
+    } else if (_chunkPBGPF77Ycjs.config_default.directives.includes("v-" + filename)) {
       const name = "default";
       const from = `${config.name}/directives/${"v-" + filename}/index`;
       return {

package/dist/expand/components.js

@@ -1,6 +1,6 @@
 import {
   config_default
-} from "./chunk-7C25SBCF.js";
+} from "./chunk-S57QISTZ.js";
 
 // expand/components.ts
 import { humpToLine } from "@fangzhongya/utils/name/humpToLine";

package/dist/expand/config.cjs

@@ -1,6 +1,6 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunk3HP2ZDNGcjs = require('./chunk-3HP2ZDNG.cjs');
+var _chunkPBGPF77Ycjs = require('./chunk-PBGPF77Y.cjs');
 
 
-exports.default = _chunk3HP2ZDNGcjs.config_default;
+exports.default = _chunkPBGPF77Ycjs.config_default;

package/dist/expand/config.js

@@ -1,6 +1,6 @@
 import {
   config_default
-} from "./chunk-7C25SBCF.js";
+} from "./chunk-S57QISTZ.js";
 export {
   config_default as default
 };

package/dist/hooks/compons/index.cjs

@@ -2,16 +2,15 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const vue = require("vue");
 const components = require("../../components/common/compons/components.cjs");
-require("../../utils/index.cjs");
 const lineToLargeHump = require("@fangzhongya/utils/name/lineToLargeHump");
 function getCompons(...arrs) {
   const coms = {};
-  arrs.forEach((obj) => {
-    Object.keys(obj).forEach((key) => {
+  for (const obj of arrs) {
+    for (const key of Object.keys(obj)) {
       const tkey = lineToLargeHump.lineToLargeHump(key);
       coms[tkey] = obj[key];
-    });
-  });
+    }
+  }
   return coms;
 }
 const comkey = "com";
@@ -19,15 +18,20 @@ const comKeyValue = "-compons";
 let weakRef;
 function useCompons(key = comkey, props, ...arrs) {
   const is = props.isCompons;
-  if (is) {
-    weakRef = components.components;
-  }
   const compons = props.compons || {};
   const tfcom = getCompons(compons, ...arrs);
   if (Object.keys(tfcom).length > 0) {
     vue.provide(key + comKeyValue, tfcom);
   }
-  return tfcom;
+  if (is) {
+    weakRef = components.components;
+    return {
+      ...weakRef,
+      ...tfcom
+    };
+  } else {
+    return tfcom;
+  }
 }
 function useComponsGet(key = comkey, value = {}) {
   const coms = vue.inject(key + comKeyValue, value);

package/dist/hooks/compons/index.js

@@ -1,15 +1,14 @@
 import { provide, inject } from "vue";
 import { components } from "../../components/common/compons/components.js";
-import "../../utils/index.js";
 import { lineToLargeHump } from "@fangzhongya/utils/name/lineToLargeHump";
 function getCompons(...arrs) {
   const coms = {};
-  arrs.forEach((obj) => {
-    Object.keys(obj).forEach((key) => {
+  for (const obj of arrs) {
+    for (const key of Object.keys(obj)) {
       const tkey = lineToLargeHump(key);
       coms[tkey] = obj[key];
-    });
-  });
+    }
+  }
   return coms;
 }
 const comkey = "com";
@@ -17,15 +16,20 @@ const comKeyValue = "-compons";
 let weakRef;
 function useCompons(key = comkey, props, ...arrs) {
   const is = props.isCompons;
-  if (is) {
-    weakRef = components;
-  }
   const compons = props.compons || {};
   const tfcom = getCompons(compons, ...arrs);
   if (Object.keys(tfcom).length > 0) {
     provide(key + comKeyValue, tfcom);
   }
-  return tfcom;
+  if (is) {
+    weakRef = components;
+    return {
+      ...weakRef,
+      ...tfcom
+    };
+  } else {
+    return tfcom;
+  }
 }
 function useComponsGet(key = comkey, value = {}) {
   const coms = inject(key + comKeyValue, value);

package/dist/hooks/cssname/index.cjs

@@ -21,12 +21,10 @@ function getName() {
     } else {
       return alias + com.common;
     }
+  } else if (namespace) {
+    return namespace + com.common;
   } else {
-    if (namespace) {
-      return namespace + com.common;
-    } else {
-      return "";
-    }
+    return "";
   }
 }
 function connected(block, blockSuffix, element, modifier) {

package/dist/hooks/cssname/index.js

@@ -19,12 +19,10 @@ function getName() {
     } else {
       return alias + com.common;
     }
+  } else if (namespace) {
+    return namespace + com.common;
   } else {
-    if (namespace) {
-      return namespace + com.common;
-    } else {
-      return "";
-    }
+    return "";
   }
 }
 function connected(block, blockSuffix, element, modifier) {

package/dist/hooks/global-config/index.cjs

@@ -25,11 +25,11 @@ function setGlobalConfig(obj, key) {
     setValue(obj, key, globalConfig.value);
   } else {
     const v = obj;
-    Object.keys(v).forEach((key2) => {
+    for (const key2 of Object.keys(v)) {
       const k = key2;
       const z = v[k];
       setValue(z, k, globalConfig.value);
-    });
+    }
   }
 }
 function setGlobalConfigs(obj) {

package/dist/hooks/global-config/index.js

@@ -23,11 +23,11 @@ function setGlobalConfig(obj, key) {
     setValue(obj, key, globalConfig.value);
   } else {
     const v = obj;
-    Object.keys(v).forEach((key2) => {
+    for (const key2 of Object.keys(v)) {
       const k = key2;
       const z = v[k];
       setValue(z, k, globalConfig.value);
-    });
+    }
   }
 }
 function setGlobalConfigs(obj) {

package/dist/hooks/inherit/index.cjs

@@ -1,23 +1,22 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const vue = require("vue");
-require("../../utils/index.cjs");
-const index = require("../attrs-default/index.cjs");
 const humpToLine = require("@fangzhongya/utils/name/humpToLine");
-const roots = ["class", "style"];
+const index = require("../attrs-default/index.cjs");
+const roots = /* @__PURE__ */ new Set(["class", "style"]);
 const useInherit = (attrs = vue.useAttrs(), name) => {
   if (name) {
     attrs = index.useAttrsDefault(name, attrs);
   }
   const root = {};
   const assem = {};
-  Object.keys(attrs).forEach((key) => {
-    if (roots.includes(key)) {
+  for (const key of Object.keys(attrs)) {
+    if (roots.has(key)) {
       root[key] = attrs[key];
     } else {
       assem[key] = attrs[key];
     }
-  });
+  }
   return {
     root: new Proxy(root, {
       get(_target, k) {

package/dist/hooks/inherit/index.js

@@ -1,21 +1,20 @@
 import { useAttrs } from "vue";
-import "../../utils/index.js";
-import { useAttrsDefault } from "../attrs-default/index.js";
 import { humpToLine } from "@fangzhongya/utils/name/humpToLine";
-const roots = ["class", "style"];
+import { useAttrsDefault } from "../attrs-default/index.js";
+const roots = /* @__PURE__ */ new Set(["class", "style"]);
 const useInherit = (attrs = useAttrs(), name) => {
   if (name) {
     attrs = useAttrsDefault(name, attrs);
   }
   const root = {};
   const assem = {};
-  Object.keys(attrs).forEach((key) => {
-    if (roots.includes(key)) {
+  for (const key of Object.keys(attrs)) {
+    if (roots.has(key)) {
       root[key] = attrs[key];
     } else {
       assem[key] = attrs[key];
     }
-  });
+  }
   return {
     root: new Proxy(root, {
       get(_target, k) {