@fangzhongya/fang-ui 0.1.36 → 0.1.37

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

@@ -1,24 +1,28 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const list = require("../../common/list.cjs");
 const name = "buttons";
 const dataProps = {
-  options: {
-    type: [Array]
-  },
+  ...list.props,
   isFather: {
     type: Boolean
   },
+  isValue: {
+    type: Boolean
+  },
   disabled: {
     type: Boolean
   }
 };
-const dataEmits = ["clicks"];
+const dataHandle = list.comHandle;
+const dataEmits = [...list.emits, "clicks"];
 const dataSlot = {
   default: "default"
 };
 const dataExpose = {};
 exports.dataEmits = dataEmits;
 exports.dataExpose = dataExpose;
+exports.dataHandle = dataHandle;
 exports.dataProps = dataProps;
 exports.dataSlot = dataSlot;
 exports.name = name;

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

@@ -1,9 +1,19 @@
 import { ExtractPropTypes } from 'vue';
+import { comHandle } from '../../common/list';
 /**
  * @title {h3} buttons
  */
 export declare const name = "buttons";
 export declare const dataProps: {
+    isFather: {
+        type: BooleanConstructor;
+    };
+    isValue: {
+        type: BooleanConstructor;
+    };
+    disabled: {
+        type: BooleanConstructor;
+    };
     options: {
         type: {
             (arrayLength: number): ObjAny[];
@@ -20,13 +30,31 @@ export declare const dataProps: {
             fromAsync<T>(iterableOrArrayLike: AsyncIterable<T> | Iterable<T | PromiseLike<T>> | ArrayLike<T | PromiseLike<T>>): Promise<T[]>;
             fromAsync<T, U>(iterableOrArrayLike: AsyncIterable<T> | Iterable<T> | ArrayLike<T>, mapFn: (value: Awaited<T>, index: number) => U, thisArg?: any): Promise<Awaited<U>[]>;
             readonly [Symbol.species]: ArrayConstructor;
-        }[];
+        };
+        default(): never[];
     };
-    isFather: {
+    clearAbsent: {
         type: BooleanConstructor;
     };
-    disabled: {
-        type: BooleanConstructor;
+    label: {
+        type: (StringConstructor | FunctionConstructor)[];
+        default: string;
+    };
+    prop: {
+        type: (StringConstructor | FunctionConstructor)[];
+        default: string;
+    };
+    modelValue: {
+        type: null;
+    };
+    multiple: {
+        type: (BooleanConstructor | StringConstructor)[];
+    };
+    load: {
+        type: BooleanConstructor[];
+    };
+    optobj: {
+        type: BooleanConstructor[];
     };
 };
 export type DataProps = ExtractPropTypes<typeof dataProps>;
@@ -34,6 +62,7 @@ export type DataProps = ExtractPropTypes<typeof dataProps>;
  * @emits change (val:[String, Array])
  * 选择的时间
  */
+export declare const dataHandle: typeof comHandle;
 export declare const dataEmits: string[];
 export type DataEmits = typeof dataEmits;
 /**

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

@@ -1,16 +1,19 @@
+import { props, comHandle, emits } from "../../common/list.js";
 const name = "buttons";
 const dataProps = {
-  options: {
-    type: [Array]
-  },
+  ...props,
   isFather: {
     type: Boolean
   },
+  isValue: {
+    type: Boolean
+  },
   disabled: {
     type: Boolean
   }
 };
-const dataEmits = ["clicks"];
+const dataHandle = comHandle;
+const dataEmits = [...emits, "clicks"];
 const dataSlot = {
   default: "default"
 };
@@ -18,6 +21,7 @@ const dataExpose = {};
 export {
   dataEmits,
   dataExpose,
+  dataHandle,
   dataProps,
   dataSlot,
   name

package/dist/components/buttons/src/index2.cjs

@@ -14,6 +14,16 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const prs = __props;
     const props = index$1.usePropsDefault(data.name, prs, data.dataProps);
     const emit = __emit;
+    const listFuObj = data.dataHandle(props, emit);
+    const value = listFuObj.value;
+    const multiple = listFuObj.multiple;
+    const valueOptions = vue.computed(() => {
+      if (props.isValue) {
+        return listFuObj.getValueObjs(value.value);
+      } else {
+        return props.options;
+      }
+    });
     function onClick(obj, index2, $event) {
       if (obj.click) {
         obj.click(obj, index2, $event);
@@ -25,7 +35,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       ...data.dataExpose
     });
     return (_ctx, _cache) => {
-      return vue.unref(props).isFather ? (vue.openBlock(true), vue.createElementBlock(vue.Fragment, { key: 0 }, vue.renderList(vue.unref(props).options, (item, index2) => {
+      return vue.unref(props).isFather ? (vue.openBlock(true), vue.createElementBlock(vue.Fragment, { key: 0 }, vue.renderList(valueOptions.value, (item, index2) => {
         return vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: index2 }, [
           !item.hide ? (vue.openBlock(), vue.createBlock(vue.unref(index$2.Button), vue.mergeProps({
             key: 0,
@@ -44,7 +54,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         key: 1,
         class: vue.normalizeClass(vue.unref(cs).z())
       }, [
-        (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(vue.unref(props).options, (item, index2) => {
+        (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(valueOptions.value, (item, index2) => {
           return vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: index2 }, [
             !item.hide ? (vue.openBlock(), vue.createBlock(vue.unref(index$2.Button), vue.mergeProps({
               key: 0,

package/dist/components/buttons/src/index2.js

@@ -1,6 +1,6 @@
-import { defineComponent, createElementBlock, unref, openBlock, Fragment, renderList, createBlock, createCommentVNode, mergeProps, withModifiers, withCtx, createTextVNode, toDisplayString, normalizeClass } from "vue";
+import { defineComponent, computed, createElementBlock, unref, openBlock, Fragment, renderList, createBlock, createCommentVNode, mergeProps, withModifiers, withCtx, createTextVNode, toDisplayString, normalizeClass } from "vue";
 import { Button } from "../../button/index.js";
-import { name, dataProps, dataExpose, dataEmits } from "./data.js";
+import { name, dataProps, dataHandle, dataExpose, dataEmits } from "./data.js";
 import { usePropsDefault, getProps } from "../../../hooks/props-default/index.js";
 import { useCssName } from "../../../hooks/cssname/index.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
@@ -12,6 +12,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const prs = __props;
     const props = usePropsDefault(name, prs, dataProps);
     const emit = __emit;
+    const listFuObj = dataHandle(props, emit);
+    const value = listFuObj.value;
+    const multiple = listFuObj.multiple;
+    const valueOptions = computed(() => {
+      if (props.isValue) {
+        return listFuObj.getValueObjs(value.value);
+      } else {
+        return props.options;
+      }
+    });
     function onClick(obj, index, $event) {
       if (obj.click) {
         obj.click(obj, index, $event);
@@ -23,7 +33,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       ...dataExpose
     });
     return (_ctx, _cache) => {
-      return unref(props).isFather ? (openBlock(true), createElementBlock(Fragment, { key: 0 }, renderList(unref(props).options, (item, index) => {
+      return unref(props).isFather ? (openBlock(true), createElementBlock(Fragment, { key: 0 }, renderList(valueOptions.value, (item, index) => {
         return openBlock(), createElementBlock(Fragment, { key: index }, [
           !item.hide ? (openBlock(), createBlock(unref(Button), mergeProps({
             key: 0,
@@ -42,7 +52,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         key: 1,
         class: normalizeClass(unref(cs).z())
       }, [
-        (openBlock(true), createElementBlock(Fragment, null, renderList(unref(props).options, (item, index) => {
+        (openBlock(true), createElementBlock(Fragment, null, renderList(valueOptions.value, (item, index) => {
           return openBlock(), createElementBlock(Fragment, { key: index }, [
             !item.hide ? (openBlock(), createBlock(unref(Button), mergeProps({
               key: 0,

package/dist/components/common/use.cjs

@@ -226,7 +226,7 @@ function processOptions(obj, componObj, optionss, value, data) {
 }
 function renderComponent(tcom, compon, componObj, value, compons) {
   if (Object.keys(compons).includes(tcom)) {
-    return vue.h(compons[tcom], componObj, value);
+    return vue.h(compons[tcom], componObj);
   }
   if (shared.isHTMLTag(compon) || shared.isSVGTag(compon)) {
     return vue.h(compon, componObj, value);

package/dist/components/common/use.js

@@ -224,7 +224,7 @@ function processOptions(obj, componObj, optionss, value, data) {
 }
 function renderComponent(tcom, compon, componObj, value, compons) {
   if (Object.keys(compons).includes(tcom)) {
-    return h(compons[tcom], componObj, value);
+    return h(compons[tcom], componObj);
   }
   if (isHTMLTag(compon) || isSVGTag(compon)) {
     return h(compon, componObj, value);

package/dist/components/double/index.css

@@ -26,7 +26,8 @@
   width: 100%;
   display: inline-flex;
   align-items: center;
-  padding: 1px;
+  box-sizing: content-box;
+  padding: 1.2px 1px;
   position: relative;
   box-shadow: 0 0 0 1px var(--el-input-border-color, var(--el-border-color)) inset;
   border-radius: var(--el-input-border-radius, var(--el-border-radius-base));

package/dist/components/double/index.scss

@@ -5,7 +5,8 @@ $double: 'double';
 	width: 100%;
 	display: inline-flex;
 	align-items: center;
-	padding: 1px;
+	box-sizing: content-box;
+	padding: 1.2px 1px;
 	position: relative;
 	box-shadow: 0 0 0 1px
 		var(--#{e()}input-border-color, var(--#{e()}border-color)) inset;

package/dist/components/forms/index.css

@@ -53,7 +53,8 @@
   width: 100%;
   display: inline-flex;
   align-items: center;
-  padding: 1px;
+  box-sizing: content-box;
+  padding: 1.2px 1px;
   position: relative;
   box-shadow: 0 0 0 1px var(--el-input-border-color, var(--el-border-color)) inset;
   border-radius: var(--el-input-border-radius, var(--el-border-radius-base));

package/dist/components/page/index.css

@@ -53,7 +53,8 @@
   width: 100%;
   display: inline-flex;
   align-items: center;
-  padding: 1px;
+  box-sizing: content-box;
+  padding: 1.2px 1px;
   position: relative;
   box-shadow: 0 0 0 1px var(--el-input-border-color, var(--el-border-color)) inset;
   border-radius: var(--el-input-border-radius, var(--el-border-radius-base));

package/dist/components/selector/index.css

@@ -78,7 +78,8 @@
   width: 100%;
   display: inline-flex;
   align-items: center;
-  padding: 1px;
+  box-sizing: content-box;
+  padding: 1.2px 1px;
   position: relative;
   box-shadow: 0 0 0 1px var(--el-input-border-color, var(--el-border-color)) inset;
   border-radius: var(--el-input-border-radius, var(--el-border-radius-base));

package/dist/components/tablesv/src/column.cjs

@@ -40,7 +40,7 @@ function handlePropertyMapping(value, ckey, obj, robj, vxeconfig, table) {
   const propertyHandlers = {
     showOverflow: () => robj["show-overflow"] = value ? "tooltip" : void 0,
     showOverflowTooltip: () => robj["show-overflow"] = value ? "tooltip" : void 0,
-    label: () => robj["title"] = value,
+    // label: () => (robj['title'] = value),
     sortable: () => robj[ckey] = value ? true : void 0,
     prop: () => robj["field"] = value,
     fixed: () => robj["fixed"] = value === true ? "left" : value,
@@ -111,7 +111,7 @@ function defaultDom(obj, scope, props, index2) {
   } else if (obj.type == "selection") {
     return;
   }
-  domValue = use.useGetDomValue(obj, scope.row, props.options, scope.$index);
+  domValue = use.useGetDomValue(obj, scope.row, props.options, scope.$rowIndex);
   return vue.h(
     "span",
     {

package/dist/components/tablesv/src/column.js

@@ -38,7 +38,7 @@ function handlePropertyMapping(value, ckey, obj, robj, vxeconfig, table) {
   const propertyHandlers = {
     showOverflow: () => robj["show-overflow"] = value ? "tooltip" : void 0,
     showOverflowTooltip: () => robj["show-overflow"] = value ? "tooltip" : void 0,
-    label: () => robj["title"] = value,
+    // label: () => (robj['title'] = value),
     sortable: () => robj[ckey] = value ? true : void 0,
     prop: () => robj["field"] = value,
     fixed: () => robj["fixed"] = value === true ? "left" : value,
@@ -109,7 +109,7 @@ function defaultDom(obj, scope, props, index) {
   } else if (obj.type == "selection") {
     return;
   }
-  domValue = useGetDomValue(obj, scope.row, props.options, scope.$index);
+  domValue = useGetDomValue(obj, scope.row, props.options, scope.$rowIndex);
   return h(
     "span",
     {

package/dist/components/tablesv/src/index2.cjs

@@ -27,7 +27,6 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     index$3.useCompons(config.provides.compons, props);
     const tableRef = vue.ref();
     const emit = __emit;
-    console.log("props.maxHeight", props.maxHeight);
     const rowObj = vue.ref();
     const isfocus = vue.ref(false);
     function onClick() {
@@ -105,6 +104,15 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         trigger: attrs.assem.isRowSelect ? "row" : "cell"
       }
     });
+    const spanMethod = function(obj) {
+      const method = attrs.assem.spanMethod;
+      if (method) {
+        const v = method(obj);
+        if (v) {
+          return { rowspan: v[0], colspan: v[1] };
+        }
+      }
+    };
     const rowStyle = vue.computed(() => {
       const height = props.lineHeight;
       const rowStyle2 = attrs.assem.rowStyle;
@@ -233,6 +241,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
           "sort-config": config$1.value.sort,
           "checkbox-config": config$1.value.checkbox,
           "radio-config": config$1.value.radio,
+          "span-method": spanMethod,
           data: vue.unref(props).value,
           onCellClick,
           onSortChange: sortChange,

package/dist/components/tablesv/src/index2.js

@@ -25,7 +25,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     useCompons(provides.compons, props);
     const tableRef = ref();
     const emit = __emit;
-    console.log("props.maxHeight", props.maxHeight);
     const rowObj = ref();
     const isfocus = ref(false);
     function onClick() {
@@ -103,6 +102,15 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         trigger: attrs.assem.isRowSelect ? "row" : "cell"
       }
     });
+    const spanMethod = function(obj) {
+      const method = attrs.assem.spanMethod;
+      if (method) {
+        const v = method(obj);
+        if (v) {
+          return { rowspan: v[0], colspan: v[1] };
+        }
+      }
+    };
     const rowStyle = computed(() => {
       const height = props.lineHeight;
       const rowStyle2 = attrs.assem.rowStyle;
@@ -231,6 +239,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           "sort-config": config.value.sort,
           "checkbox-config": config.value.checkbox,
           "radio-config": config.value.radio,
+          "span-method": spanMethod,
           data: unref(props).value,
           onCellClick,
           onSortChange: sortChange,

package/dist/css/double.css

@@ -26,7 +26,8 @@
   width: 100%;
   display: inline-flex;
   align-items: center;
-  padding: 1px;
+  box-sizing: content-box;
+  padding: 1.2px 1px;
   position: relative;
   box-shadow: 0 0 0 1px var(--el-input-border-color, var(--el-border-color)) inset;
   border-radius: var(--el-input-border-radius, var(--el-border-radius-base));

package/dist/css/forms.css

@@ -53,7 +53,8 @@
   width: 100%;
   display: inline-flex;
   align-items: center;
-  padding: 1px;
+  box-sizing: content-box;
+  padding: 1.2px 1px;
   position: relative;
   box-shadow: 0 0 0 1px var(--el-input-border-color, var(--el-border-color)) inset;
   border-radius: var(--el-input-border-radius, var(--el-border-radius-base));

package/dist/css/index.css

@@ -53,7 +53,8 @@
   width: 100%;
   display: inline-flex;
   align-items: center;
-  padding: 1px;
+  box-sizing: content-box;
+  padding: 1.2px 1px;
   position: relative;
   box-shadow: 0 0 0 1px var(--el-input-border-color, var(--el-border-color)) inset;
   border-radius: var(--el-input-border-radius, var(--el-border-radius-base));

package/dist/css/page.css

@@ -53,7 +53,8 @@
   width: 100%;
   display: inline-flex;
   align-items: center;
-  padding: 1px;
+  box-sizing: content-box;
+  padding: 1.2px 1px;
   position: relative;
   box-shadow: 0 0 0 1px var(--el-input-border-color, var(--el-border-color)) inset;
   border-radius: var(--el-input-border-radius, var(--el-border-radius-base));

package/dist/css/selector.css

@@ -78,7 +78,8 @@
   width: 100%;
   display: inline-flex;
   align-items: center;
-  padding: 1px;
+  box-sizing: content-box;
+  padding: 1.2px 1px;
   position: relative;
   box-shadow: 0 0 0 1px var(--el-input-border-color, var(--el-border-color)) inset;
   border-radius: var(--el-input-border-radius, var(--el-border-radius-base));

package/dist/icons/index.json

@@ -1,7 +1,7 @@
 {
     "prefix": "fang-ui",
     "info": {},
-    "lastModified": 1764065519442,
+    "lastModified": 1764079293714,
     "icons": {
         "bar": {
             "body": " <path fill=\"currentColor\" d=\"M128 544h768a32 32 0 1 0 0-64H128a32 32 0 0 0 0 64z\" ></path> "

package/dist/index.css

@@ -53,7 +53,8 @@
   width: 100%;
   display: inline-flex;
   align-items: center;
-  padding: 1px;
+  box-sizing: content-box;
+  padding: 1.2px 1px;
   position: relative;
   box-shadow: 0 0 0 1px var(--el-input-border-color, var(--el-border-color)) inset;
   border-radius: var(--el-input-border-radius, var(--el-border-radius-base));

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@fangzhongya/fang-ui",
   "private": false,
-  "version": "0.1.36",
+  "version": "0.1.37",
   "type": "module",
   "description ": "fang-ui",
   "keywords": [
@@ -51,9 +51,9 @@
     "vue-tsc": "^3.1.5",
     "vxe-table": "4.6.20",
     "@fang-ui/components": "0.0.1-0",
-    "@fang-ui/hooks": "0.0.1-0",
     "@fang-ui/directives": "0.0.1-0",
     "@fang-ui/icons": "0.0.1-0",
+    "@fang-ui/hooks": "0.0.1-0",
     "@fang-ui/locale": "0.0.1-0",
     "@fang-ui/theme": "0.0.1-0",
     "@fang-ui/types": "0.0.1-0",