@fangzhongya/fang-ui 0.1.27 → 0.1.29

package/dist/components/common/use.js

@@ -1,4 +1,5 @@
-import { h, resolveComponent, computed, useAttrs } from "vue";
+import { h, resolveComponent, computed, useAttrs, isVNode, Fragment, render } from "vue";
+import { isHTMLTag, isSVGTag } from "@vue/shared";
 import "../../utils/index.js";
 import { isObject } from "@fangzhongya/utils/basic/object/isObject";
 import { getFathers, getChildrenData } from "../../utils/util.js";
@@ -225,9 +226,13 @@ function setComponString(value, obj, componObj, data, optionss, compons) {
   const compon = obj.compon;
   const tcom = lineToLargeHump(compon);
   if (Object.keys(compons).includes(tcom)) {
-    return h(compons[tcom], componObj);
+    return h(compons[tcom], componObj, value);
   } else {
-    return h(resolveComponent(compon), componObj);
+    if (isHTMLTag(compon) || isSVGTag(compon)) {
+      return h(compon, componObj, value);
+    } else {
+      return h(resolveComponent(compon), componObj);
+    }
   }
 }
 function getOnObjs(obj, data, emit, ...arrs) {
@@ -298,7 +303,13 @@ function useSetCompon(obj, data, optionss, compons, emit, index, scope) {
         compons
       );
     } else {
-      return h(obj.compon, componObj);
+      if (typeof obj.compon == "function") {
+        return obj.compon(componObj);
+      } else if (isVNode(obj.compon)) {
+        return obj.compon;
+      } else {
+        return h(obj.compon, componObj);
+      }
     }
   }
 }
@@ -309,11 +320,36 @@ const useGetDomValue = (obj, data, options, index) => {
   }
   return value;
 };
-const useGetDomLabel = (label, obj, data, slots, optionss, compons, emit, index) => {
+const useGetDomLabel = (label, obj, data, slots, optionss, compons, emit, index, isComponSelected = (obj2) => true) => {
   if (label) {
-    if (isObject(label)) {
+    if (typeof label == "function") {
+      return label();
+    } else if (isVNode(label)) {
+      return label;
+    } else if (isObject(label)) {
       if (isArray(label)) {
-        return label;
+        return h(
+          "div",
+          {
+            class: "com-lable-array"
+          },
+          label.map((v) => {
+            if (typeof v === "string") {
+              v = {
+                value: v,
+                compon: "div"
+              };
+            }
+            return useSetCompon(
+              v,
+              data,
+              optionss,
+              compons,
+              emit,
+              index
+            );
+          })
+        );
       } else {
         label = Object.assign({}, obj, label);
         const slot = useSetSlot(label, data, slots, index);
@@ -321,16 +357,18 @@ const useGetDomLabel = (label, obj, data, slots, optionss, compons, emit, index)
           return slot;
         }
         if (label.compon) {
-          const column = useSetCompon(
-            label,
-            data,
-            optionss,
-            compons,
-            emit,
-            index
-          );
-          if (column) {
-            return column;
+          if (isComponSelected(obj)) {
+            const column = useSetCompon(
+              label,
+              data,
+              optionss,
+              compons,
+              emit,
+              index
+            );
+            if (column) {
+              return column;
+            }
           }
         }
         return useGetDomValue(label, data, optionss, index);
@@ -363,10 +401,43 @@ function usePropsDefault(props, keyObj) {
     }
   });
 }
+function useAdditional(value, add) {
+  if (typeof value === "string" && typeof add === "string") {
+    return value + add;
+  } else {
+    return h(Fragment, {}, [value, add]);
+  }
+}
+function getVNodeContent(vnode) {
+  const container = document.createElement("div");
+  render(vnode, container);
+  const textContent = container.textContent || "";
+  render(null, container);
+  return textContent;
+}
+function getLabelText(label) {
+  if (typeof label == "undefined") {
+    return "";
+  } else if (typeof label == "string") {
+    return label;
+  } else if (typeof label == "function") {
+    label = label();
+  }
+  if (isVNode(label)) {
+    return getVNodeContent(label);
+  } else if (label instanceof Array) {
+    return label.join("");
+  } else {
+    return (label == null ? void 0 : label.toString()) || "";
+  }
+}
 export {
   getFormRule,
+  getLabelText,
   getOnObjs,
+  getVNodeContent,
   setFormDefaultValue,
+  useAdditional,
   useGetDomLabel,
   useGetDomValue,
   useHide,

package/dist/components/dates/index.css

@@ -17,6 +17,10 @@
   padding: 20px 20px;
 }
 
+.com-lable-array {
+  line-height: 18px;
+}
+
 .dates .dates-date {
   height: 100%;
   width: 100%;

package/dist/components/dates-divide/index.css

@@ -17,6 +17,10 @@
   padding: 20px 20px;
 }
 
+.com-lable-array {
+  line-height: 18px;
+}
+
 .dates-divide {
   display: inline-flex;
   align-items: center;

package/dist/components/dates-picker/index.css

@@ -17,6 +17,10 @@
   padding: 20px 20px;
 }
 
+.com-lable-array {
+  line-height: 18px;
+}
+
 .dates2 .dates2-date {
   height: 100%;
   width: 100%;

package/dist/components/dates2/index.css

@@ -17,6 +17,10 @@
   padding: 20px 20px;
 }
 
+.com-lable-array {
+  line-height: 18px;
+}
+
 .dates-divide {
   display: inline-flex;
   align-items: center;

package/dist/components/dialogs/index.css

@@ -17,6 +17,10 @@
   padding: 20px 20px;
 }
 
+.com-lable-array {
+  line-height: 18px;
+}
+
 .dialogs.el-dialog {
   padding: 0;
 }

package/dist/components/edit/index.css

@@ -17,6 +17,10 @@
   padding: 20px 20px;
 }
 
+.com-lable-array {
+  line-height: 18px;
+}
+
 .edit {
   display: inline-flex;
   align-items: center;

package/dist/components/edit-float/index.css

@@ -17,6 +17,10 @@
   padding: 20px 20px;
 }
 
+.com-lable-array {
+  line-height: 18px;
+}
+
 .edit-float-body {
   display: inline-flex;
   align-items: center;

package/dist/components/forms/common/config.cjs

@@ -1,7 +1,17 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const provides = {
-  compons: "form-compons",
+  compons: "form",
   form: "form-form"
 };
+const changes = [
+  "Select",
+  "Date",
+  "Array",
+  "Check",
+  "Labels",
+  "Switch",
+  "Cascader"
+];
+exports.changes = changes;
 exports.provides = provides;

package/dist/components/forms/common/config.d.ts

@@ -2,3 +2,4 @@ export declare const provides: {
     compons: string;
     form: string;
 };
+export declare const changes: string[];

package/dist/components/forms/common/config.js

@@ -1,7 +1,17 @@
 const provides = {
-  compons: "form-compons",
+  compons: "form",
   form: "form-form"
 };
+const changes = [
+  "Select",
+  "Date",
+  "Array",
+  "Check",
+  "Labels",
+  "Switch",
+  "Cascader"
+];
 export {
+  changes,
   provides
 };

package/dist/components/forms/index.css

@@ -18,6 +18,10 @@
   padding: 20px 20px;
 }
 
+.com-lable-array {
+  line-height: 18px;
+}
+
 .forms-div {
   width: 100%;
   height: 100%;
@@ -106,12 +110,6 @@
   font-size: 0;
 }
 
-.dates .dates-date {
-  height: 100%;
-  width: 100%;
-  box-sizing: border-box;
-}
-
 .selects-select {
   height: 100%;
   min-width: 60px;
@@ -121,6 +119,12 @@
   height: 100%;
 }
 
+.dates .dates-date {
+  height: 100%;
+  width: 100%;
+  box-sizing: border-box;
+}
+
 .inputs-input {
   height: 100%;
 }

package/dist/components/forms/index.scss

@@ -1,8 +1,9 @@
 @use '../scss/common.scss' as *;
 @use '../forms-div/index.scss' as *;
 @use '../forms-item/index.scss' as *;
+@use '../forms-items/index.scss' as *;
 
-@use '../common/compons.scss' as *;
+@use '../common/compons/index.scss' as *;
 
 $forms: 'forms';
 @include b($forms) {

package/dist/components/forms/src/data.cjs

@@ -39,6 +39,13 @@ const dataProps = {
       return {};
     }
   },
+  /**
+   * @props { Boolean } isCompons=true 是否使用默认的配置
+   */
+  isCompons: {
+    type: Boolean,
+    default: true
+  },
   /**
    * @props { Object } compons
    * 外部组件集合

package/dist/components/forms/src/data.d.ts

@@ -54,6 +54,13 @@ export declare const dataProps: {
         type: ObjectConstructor;
         default(): {};
     };
+    /**
+     * @props { Boolean } isCompons=true 是否使用默认的配置
+     */
+    isCompons: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     /**
      * @props { Object } compons
      * 外部组件集合

package/dist/components/forms/src/data.js

@@ -37,6 +37,13 @@ const dataProps = {
       return {};
     }
   },
+  /**
+   * @props { Boolean } isCompons=true 是否使用默认的配置
+   */
+  isCompons: {
+    type: Boolean,
+    default: true
+  },
   /**
    * @props { Object } compons
    * 外部组件集合

package/dist/components/forms/src/setup.cjs

@@ -7,22 +7,13 @@ require("../../../utils/css.cjs");
 const use = require("../../common/use.cjs");
 require("../../../utils/index.cjs");
 const vue = require("vue");
-const compons = require("../../common/compons.cjs");
+const index$1 = require("../../../hooks/compons/index.cjs");
 const index = require("../../forms-items/index.cjs");
 const setObjStyle = require("@fangzhongya/utils/css/setObjStyle");
 const lineToLargeHump = require("@fangzhongya/utils/name/lineToLargeHump");
 const Components = {
   Items: index.FormsItems
 };
-const Changes = [
-  "Select",
-  "Date",
-  "Array",
-  "Check",
-  "Labels",
-  "Switch",
-  "Cascader"
-];
 function setUp(props, emit, cs, refForm, getLocale) {
   const buts = vue.computed(() => {
     if (typeof props.buts == "undefined") {
@@ -41,7 +32,7 @@ function setUp(props, emit, cs, refForm, getLocale) {
       return props.buts || [];
     }
   });
-  compons.useCompons(config.provides.compons, Components, props.compons);
+  index$1.useCompons(config.provides.compons, props, Components);
   vue.provide(config.provides.form, props);
   const defaultValue = {};
   const getDataForm = () => {
@@ -124,13 +115,14 @@ function setUp(props, emit, cs, refForm, getLocale) {
         use.setFormDefaultValue(obj, dataForm.value);
         let trigger = 1;
         if (typeof obj.compon == "string") {
-          if (Changes.includes(lineToLargeHump.lineToLargeHump(obj.compon))) {
+          if (config.changes.includes(lineToLargeHump.lineToLargeHump(obj.compon))) {
             trigger = 2;
           }
         }
         obj.config = obj.config ?? {};
+        const labeltext = obj.labelText ?? use.getLabelText(obj.label);
         if (((_a = obj.config) == null ? void 0 : _a.placeholder) === void 0) {
-          obj.config.placeholder = (trigger == 1 ? getLocale("form.import") : getLocale("form.select")) + obj.label;
+          obj.config.placeholder = (trigger == 1 ? getLocale("form.import") : getLocale("form.select")) + labeltext;
         }
         if (((_b = obj.config) == null ? void 0 : _b.clearable) === void 0) {
           obj.config.clearable = true;
@@ -142,6 +134,7 @@ function setUp(props, emit, cs, refForm, getLocale) {
             rules[p] = obj.rules;
           } else if (obj.rule) {
             rules[p] = util.getRule(
+              labeltext,
               trigger,
               obj,
               dataForm,

package/dist/components/forms/src/setup.d.ts

@@ -1,6 +1,6 @@
 import { DataProps } from './data';
 import { UseCssNameReturn } from '../../../hooks/cssname';
-import { Ref, CSSProperties, WritableComputedRef, ComputedRef } from 'vue';
+import { CSSProperties, Ref, WritableComputedRef, ComputedRef } from 'vue';
 type Emit = (...args: any[]) => void;
 export declare function setUp(props: DataProps, emit: Emit, cs: UseCssNameReturn, refForm: any, getLocale: Function): {
     dataRules: Ref<ObjAny, ObjAny>;

package/dist/components/forms/src/setup.js

@@ -1,26 +1,17 @@
 import { dataHandle } from "./data.js";
-import { provides } from "../common/config.js";
+import { provides, changes } from "../common/config.js";
 import { getRule } from "./util.js";
 import "../../../utils/css.js";
-import { setFormDefaultValue, getFormRule } from "../../common/use.js";
+import { setFormDefaultValue, getLabelText, getFormRule } from "../../common/use.js";
 import "../../../utils/index.js";
 import { computed, provide, isProxy, ref, watch } from "vue";
-import { useCompons } from "../../common/compons.js";
+import { useCompons } from "../../../hooks/compons/index.js";
 import { FormsItems } from "../../forms-items/index.js";
 import { setObjStyle } from "@fangzhongya/utils/css/setObjStyle";
 import { lineToLargeHump } from "@fangzhongya/utils/name/lineToLargeHump";
 const Components = {
   Items: FormsItems
 };
-const Changes = [
-  "Select",
-  "Date",
-  "Array",
-  "Check",
-  "Labels",
-  "Switch",
-  "Cascader"
-];
 function setUp(props, emit, cs, refForm, getLocale) {
   const buts = computed(() => {
     if (typeof props.buts == "undefined") {
@@ -39,7 +30,7 @@ function setUp(props, emit, cs, refForm, getLocale) {
       return props.buts || [];
     }
   });
-  useCompons(provides.compons, Components, props.compons);
+  useCompons(provides.compons, props, Components);
   provide(provides.form, props);
   const defaultValue = {};
   const getDataForm = () => {
@@ -122,13 +113,14 @@ function setUp(props, emit, cs, refForm, getLocale) {
         setFormDefaultValue(obj, dataForm.value);
         let trigger = 1;
         if (typeof obj.compon == "string") {
-          if (Changes.includes(lineToLargeHump(obj.compon))) {
+          if (changes.includes(lineToLargeHump(obj.compon))) {
             trigger = 2;
           }
         }
         obj.config = obj.config ?? {};
+        const labeltext = obj.labelText ?? getLabelText(obj.label);
         if (((_a = obj.config) == null ? void 0 : _a.placeholder) === void 0) {
-          obj.config.placeholder = (trigger == 1 ? getLocale("form.import") : getLocale("form.select")) + obj.label;
+          obj.config.placeholder = (trigger == 1 ? getLocale("form.import") : getLocale("form.select")) + labeltext;
         }
         if (((_b = obj.config) == null ? void 0 : _b.clearable) === void 0) {
           obj.config.clearable = true;
@@ -140,6 +132,7 @@ function setUp(props, emit, cs, refForm, getLocale) {
             rules[p] = obj.rules;
           } else if (obj.rule) {
             rules[p] = getRule(
+              labeltext,
               trigger,
               obj,
               dataForm,

package/dist/components/forms/src/util.cjs

@@ -19,9 +19,8 @@ function _interopNamespaceDefault(e) {
   return Object.freeze(n);
 }
 const judge__namespace = /* @__PURE__ */ _interopNamespaceDefault(judge);
-function getRule(trigger, obj, data, refForm, getLocale) {
+function getRule(name, trigger, obj, data, refForm, getLocale) {
   var _a;
-  const name = obj.label;
   let multiple = obj.multiple ?? ((_a = obj.config) == null ? void 0 : _a.multiple);
   const rule = obj.rule;
   if (typeof multiple != "boolean") {

package/dist/components/forms/src/util.d.ts

@@ -18,5 +18,5 @@ export type Rules = {
  * @param {any} refForm 表单引用
  * @returns {{ required: boolean, validator: Function, trigger: string }}
  */
-export declare function getRule(trigger: number, obj: ListObj, data: any, refForm: any, getLocale: Function): Rule;
+export declare function getRule(name: string, trigger: number, obj: ListObj, data: any, refForm: any, getLocale: Function): Rule;
 export {};

package/dist/components/forms/src/util.js

@@ -1,8 +1,7 @@
 import { useHide } from "../../common/use.js";
 import * as judge from "@fangzhongya/utils/judge/judge";
-function getRule(trigger, obj, data, refForm, getLocale) {
+function getRule(name, trigger, obj, data, refForm, getLocale) {
   var _a;
-  const name = obj.label;
   let multiple = obj.multiple ?? ((_a = obj.config) == null ? void 0 : _a.multiple);
   const rule = obj.rule;
   if (typeof multiple != "boolean") {

package/dist/components/forms/style/index2.scss

@@ -4,6 +4,8 @@
 
 @use '../../forms-div/style/index2.scss' as *;
 @use '../../forms-item/style/index2.scss' as *;
-@use '../../common/compons2.scss' as *;
+@use '../../forms-items/style/index2.scss' as *;
+
+@use '../../common/compons/index2.scss' as *;
 
 @use '../index.scss' as *;

package/dist/components/forms-div/index.css

@@ -17,6 +17,10 @@
   padding: 20px 20px;
 }
 
+.com-lable-array {
+  line-height: 18px;
+}
+
 .forms-div {
   width: 100%;
   height: 100%;

package/dist/components/forms-div/src/index2.cjs

@@ -7,7 +7,7 @@ const index = require("../../../hooks/cssname/index.cjs");
 const use = require("../../common/use.cjs");
 const isEqual = require("@fangzhongya/utils/basic/object/isEqual");
 const index$1 = require("../../../hooks/props-default/index.cjs");
-const compons = require("../../common/compons.cjs");
+const index$2 = require("../../../hooks/compons/index.cjs");
 const config = require("../../forms/common/config.cjs");
 const objValue = require("@fangzhongya/utils/basic/object/objValue");
 const lineToLargeHump = require("@fangzhongya/utils/name/lineToLargeHump");
@@ -22,7 +22,7 @@ const _sfc_main = vue.defineComponent({
     const prs = index$1.usePropsDefault(data.name, p, data.dataProps);
     index$1.viewProps(prs, data.name);
     const props = prs.listobj;
-    const compons$1 = compons.useGetCompons(config.provides.compons);
+    const compons = index$2.useComponsGet(config.provides.compons);
     const formvalue = vue.computed(() => {
       const o = {};
       if (typeof props.formvalue === "object") {
@@ -174,13 +174,19 @@ const _sfc_main = vue.defineComponent({
       };
       if (typeof compon == "string") {
         const tcom = lineToLargeHump.lineToLargeHump(compon);
-        if (Object.keys(compons$1).includes(tcom)) {
-          return vue.h(compons$1[tcom], componObj, slots);
+        if (Object.keys(compons).includes(tcom)) {
+          return vue.h(compons[tcom], componObj, slots);
         } else {
           return vue.h(vue.resolveComponent(compon), componObj, slots);
         }
       } else {
-        return vue.h(compon, componObj, slots);
+        if (typeof compon == "function") {
+          return compon(componObj, slots);
+        } else if (vue.isVNode(compon)) {
+          return compon;
+        } else {
+          return vue.h(compon, componObj, slots);
+        }
       }
     };
     const setSslot = () => {

package/dist/components/forms-div/src/index2.js

@@ -1,11 +1,11 @@
-import { defineComponent, computed, ref, h, resolveComponent } from "vue";
+import { defineComponent, computed, ref, h, resolveComponent, isVNode } from "vue";
 import { name, dataProps, dataEmits, dataExpose } from "./data.js";
 import "../../../utils/index.js";
 import { useCssName } from "../../../hooks/cssname/index.js";
 import { getOnObjs } from "../../common/use.js";
 import { isEqual } from "@fangzhongya/utils/basic/object/isEqual";
 import { usePropsDefault, viewProps, getProps } from "../../../hooks/props-default/index.js";
-import { useGetCompons } from "../../common/compons.js";
+import { useComponsGet } from "../../../hooks/compons/index.js";
 import { provides } from "../../forms/common/config.js";
 import { setObjValue, getObjValue } from "@fangzhongya/utils/basic/object/objValue";
 import { lineToLargeHump } from "@fangzhongya/utils/name/lineToLargeHump";
@@ -20,7 +20,7 @@ const _sfc_main = defineComponent({
     const prs = usePropsDefault(name, p, dataProps);
     viewProps(prs, name);
     const props = prs.listobj;
-    const compons = useGetCompons(provides.compons);
+    const compons = useComponsGet(provides.compons);
     const formvalue = computed(() => {
       const o = {};
       if (typeof props.formvalue === "object") {
@@ -178,7 +178,13 @@ const _sfc_main = defineComponent({
           return h(resolveComponent(compon), componObj, slots);
         }
       } else {
-        return h(compon, componObj, slots);
+        if (typeof compon == "function") {
+          return compon(componObj, slots);
+        } else if (isVNode(compon)) {
+          return compon;
+        } else {
+          return h(compon, componObj, slots);
+        }
       }
     };
     const setSslot = () => {

package/dist/components/forms-item/index.css

@@ -17,6 +17,10 @@
   padding: 20px 20px;
 }
 
+.com-lable-array {
+  line-height: 18px;
+}
+
 .forms-div {
   width: 100%;
   height: 100%;

package/dist/components/forms-item/src/indexts.d.ts

@@ -52,7 +52,7 @@ declare const _default: DefineComponent<ExtractPropTypes<{
 }>, {
     modelValue: Record<string, any>;
     listobj: ListObj;
-    optionss: ObjAny;
     hideLabel: boolean;
+    optionss: ObjAny;
 }, {}, {}, {}, never, ComponentProvideOptions, true, {}, any>;
 export default _default;