@fangzhongya/fang-ui 0.1.35 → 0.1.36

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) {

package/dist/hooks/locale/index.cjs

@@ -4,15 +4,15 @@ const index = require("../global-config/index.cjs");
 const zhCn = require("../../locale/zh-cn.cjs");
 const en = require("../../locale/en.cjs");
 const vue = require("vue");
-require("../../utils/util.cjs");
 const objValue = require("@fangzhongya/utils/basic/object/objValue");
 function buildTranslator(locale) {
   return (path, ...values) => {
     let v = objValue.getObjValue(path, vue.unref(locale).value) || "";
     if (values.length > 0) {
-      values.forEach((z, i) => {
+      for (let i = 0; i < values.length; i++) {
+        const z = values[i];
         v = v.replaceAll("$" + (i + 1), z);
-      });
+      }
     }
     return v;
   };

package/dist/hooks/locale/index.js

@@ -2,15 +2,15 @@ import { useGlobalConfig } from "../global-config/index.js";
 import ZhCn from "../../locale/zh-cn.js";
 import En from "../../locale/en.js";
 import { unref, computed, isRef, ref } from "vue";
-import "../../utils/util.js";
 import { getObjValue } from "@fangzhongya/utils/basic/object/objValue";
 function buildTranslator(locale) {
   return (path, ...values) => {
     let v = getObjValue(path, unref(locale).value) || "";
     if (values.length > 0) {
-      values.forEach((z, i) => {
+      for (let i = 0; i < values.length; i++) {
+        const z = values[i];
         v = v.replaceAll("$" + (i + 1), z);
-      });
+      }
     }
     return v;
   };

package/dist/hooks/props-default/index.cjs

@@ -7,7 +7,7 @@ function getProps(props) {
     return props;
   }
   const value = {};
-  Object.keys(props).forEach((key) => {
+  for (const key of Object.keys(props)) {
     const v = props[key];
     if (v && typeof v === "object" && "default" in v) {
       const { default: _, ...rest } = v;
@@ -15,72 +15,59 @@ function getProps(props) {
     } else {
       value[key] = v;
     }
-  });
+  }
   return value;
 }
 function usePropsDefault(key, props, dataProps = {}, keyObj) {
   if (!index.useGlobalConfig("isPropsConfig").value) {
-    if (keyObj) {
-      if (Object.keys(keyObj).length > 0) {
-        return new Proxy(props, {
-          get(_target, k) {
-            const v = _target[k];
-            if (v === void 0) {
-              if (typeof k === "string" && hasOwn.hasOwn(keyObj, k)) {
-                if (typeof keyObj[k] === "function") {
-                  return keyObj[k]();
-                } else {
-                  return keyObj[k];
-                }
-              }
-              return v;
-            }
-            return _target[k];
-          }
-        });
-      }
+    if (!keyObj || Object.keys(keyObj).length === 0) {
+      return props;
     }
-    return props;
+    return new Proxy(props, {
+      get(target, k) {
+        const v = target[k];
+        if (v !== void 0) return v;
+        return getKeyObjValue(k, keyObj);
+      }
+    });
   }
   const defaultConfig = index.useGlobalConfig("defaultConfig", {});
   const value = defaultConfig.value[key] || {};
-  const getValue = (k) => {
-    var _a;
-    const v = value[k] ?? index.useGlobalConfig(k).value;
-    if (v === void 0) {
-      if (keyObj && hasOwn.hasOwn(keyObj, k)) {
-        if (typeof keyObj[k] === "function") {
-          return keyObj[k]();
-        } else {
-          return keyObj[k];
-        }
-      }
-      if (hasOwn.hasOwn(dataProps, k)) {
-        const d = dataProps[k]["default"];
-        if (d !== void 0) {
-          if (typeof ((_a = dataProps[k]) == null ? void 0 : _a.type()) === "function") {
-            return d;
-          } else if (typeof d === "function") {
-            return d();
-          }
-          return d;
-        }
-      }
-    }
-    return v;
-  };
   return new Proxy(props, {
     get(target, propKey) {
       const v = target[propKey];
-      if (v === void 0) {
-        if (typeof propKey === "string") {
-          return getValue(propKey);
-        }
+      if (v !== void 0) return v;
+      if (typeof propKey === "string") {
+        return getConfigValue(propKey, value, keyObj, dataProps);
       }
       return v;
     }
   });
 }
+function getKeyObjValue(k, keyObj) {
+  if (typeof k !== "string" || !hasOwn.hasOwn(keyObj, k)) {
+    return void 0;
+  }
+  const keyValue = keyObj[k];
+  return typeof keyValue === "function" ? keyValue() : keyValue;
+}
+function getConfigValue(k, value, keyObj, dataProps = {}) {
+  const configValue = value[k] ?? index.useGlobalConfig(k).value;
+  if (configValue !== void 0) return configValue;
+  const keyObjValue = keyObj ? getKeyObjValue(k, keyObj) : void 0;
+  if (keyObjValue !== void 0) return keyObjValue;
+  return getDataPropsValue(k, dataProps);
+}
+function getDataPropsValue(k, dataProps) {
+  if (!hasOwn.hasOwn(dataProps, k)) return void 0;
+  const propConfig = dataProps[k];
+  const defaultValue = propConfig.default;
+  if (defaultValue === void 0) return void 0;
+  if (typeof (propConfig == null ? void 0 : propConfig.type()) === "function") {
+    return defaultValue;
+  }
+  return typeof defaultValue === "function" ? defaultValue() : defaultValue;
+}
 function viewProps(target, name = "") {
 }
 exports.getProps = getProps;