vxe-pc-ui 4.20.25 → 4.20.26

package/es/checkbox/src/button.js

@@ -2,9 +2,10 @@ import { h, computed, reactive, inject, onMounted } from "vue";
 import { defineVxeComponent } from "../../ui/src/comp";
 import XEUtils from "xe-utils";
 import { getFuncText } from "../../ui/src/utils";
-import { getConfig, createEvent, useSize, renderEmptyElement } from "../../ui";
+import { VxeUI } from "@vxe-ui/core";
 import { createComponentLog } from "../../ui/src/log";
 const { warnLog } = createComponentLog("checkbox-button");
+const { getConfig, createEvent, useFns, renderEmptyElement } = VxeUI;
 var button_default = defineVxeComponent({
   name: "VxeCheckboxButton",
   props: {
@@ -37,10 +38,7 @@ var button_default = defineVxeComponent({
       default: () => getConfig().checkboxButton.size || getConfig().size
     }
   },
-  emits: [
-    "update:modelValue",
-    "change"
-  ],
+  emits: ["update:modelValue", "change"],
   setup(props, context) {
     const { slots, emit } = context;
     const $xeForm = inject("$xeForm", null);
@@ -48,7 +46,7 @@ var button_default = defineVxeComponent({
     const $xeCheckboxGroup = inject("$xeCheckboxGroup", null);
     const xID = XEUtils.uniqueId();
     const reactData = reactive({});
-    const { computeSize } = useSize(props);
+    const { computeSize } = useFns.useSize(props);
     const $xeCheckboxButton = {
       xID,
       props,
@@ -120,59 +118,96 @@ var button_default = defineVxeComponent({
         const isGroupReadonly = computeIsGroupReadonly.value;
         if (isGroupReadonly) {
           if (isChecked) {
-            return h("label", {
-              class: ["vxe-checkbox vxe-checkbox--button-view", {
-                [`size--${vSize}`]: vSize,
-                "is--readonly": isGroupReadonly
-              }]
-            }, [
-              h("span", {
-                class: "vxe-checkbox--label"
-              }, defaultSlot ? defaultSlot({}) : [
-                icon ? h("span", {
-                  class: "vxe-checkbox--button-icon"
-                }, [
-                  h("i", { class: icon })
-                ]) : renderEmptyElement($xeCheckboxButton),
-                content ? h("span", {
-                  class: "vxe-checkbox--button-content"
-                }, getFuncText(content)) : renderEmptyElement($xeCheckboxButton)
-              ])
-            ]);
+            return h(
+              "label",
+              {
+                class: [
+                  "vxe-checkbox vxe-checkbox--button-view",
+                  {
+                    [`size--${vSize}`]: vSize,
+                    "is--readonly": isGroupReadonly
+                  }
+                ]
+              },
+              [
+                h(
+                  "span",
+                  {
+                    class: "vxe-checkbox--label"
+                  },
+                  defaultSlot ? defaultSlot({}) : [
+                    icon ? h(
+                      "span",
+                      {
+                        class: "vxe-checkbox--button-icon"
+                      },
+                      [h("i", { class: icon })]
+                    ) : renderEmptyElement($xeCheckboxButton),
+                    content ? h(
+                      "span",
+                      {
+                        class: "vxe-checkbox--button-content"
+                      },
+                      getFuncText(content)
+                    ) : renderEmptyElement($xeCheckboxButton)
+                  ]
+                )
+              ]
+            );
           }
           return renderEmptyElement($xeCheckboxButton);
         }
       }
-      return h("label", {
-        key: `${checkValue}`,
-        class: ["vxe-checkbox vxe-checkbox--button", {
-          [`size--${vSize}`]: vSize,
-          "is--disabled": isDisabled
-        }],
-        title: props.title
-      }, [
-        h("input", {
-          class: "vxe-checkbox--input",
-          type: "checkbox",
-          disabled: isDisabled,
-          checked: isChecked,
-          onChange: changeEvent
-        }),
-        h("span", {
-          class: ["vxe-checkbox--label", {
-            "is--disabled": isDisabled
-          }]
-        }, defaultSlot ? defaultSlot({}) : [
-          icon ? h("span", {
-            class: "vxe-checkbox--button-icon"
-          }, [
-            h("i", { class: icon })
-          ]) : renderEmptyElement($xeCheckboxButton),
-          content ? h("span", {
-            class: "vxe-checkbox--button-content"
-          }, getFuncText(content)) : renderEmptyElement($xeCheckboxButton)
-        ])
-      ]);
+      return h(
+        "label",
+        {
+          key: `${checkValue}`,
+          class: [
+            "vxe-checkbox vxe-checkbox--button",
+            {
+              [`size--${vSize}`]: vSize,
+              "is--disabled": isDisabled
+            }
+          ],
+          title: props.title
+        },
+        [
+          h("input", {
+            class: "vxe-checkbox--input",
+            type: "checkbox",
+            disabled: isDisabled,
+            checked: isChecked,
+            onChange: changeEvent
+          }),
+          h(
+            "span",
+            {
+              class: [
+                "vxe-checkbox--label",
+                {
+                  "is--disabled": isDisabled
+                }
+              ]
+            },
+            defaultSlot ? defaultSlot({}) : [
+              icon ? h(
+                "span",
+                {
+                  class: "vxe-checkbox--button-icon"
+                },
+                [h("i", { class: icon })]
+              ) : renderEmptyElement($xeCheckboxButton),
+              content ? h(
+                "span",
+                {
+                  class: "vxe-checkbox--button-content"
+                },
+                getFuncText(content)
+              ) : renderEmptyElement($xeCheckboxButton)
+            ]
+          )
+        ]
+      );
     };
     onMounted(() => {
       if (props.label !== null) {

package/es/checkbox/src/checkbox.js

@@ -2,8 +2,9 @@ import { h, computed, inject, reactive, onMounted } from "vue";
 import { defineVxeComponent } from "../../ui/src/comp";
 import XEUtils from "xe-utils";
 import { getFuncText } from "../../ui/src/utils";
-import { getConfig, createEvent, useSize, getIcon, renderEmptyElement } from "../../ui";
+import { VxeUI } from "@vxe-ui/core";
 import { createComponentLog } from "../../ui/src/log";
+const { getConfig, createEvent, useFns, getIcon, renderEmptyElement } = VxeUI;
 const { warnLog } = createComponentLog("checkbox");
 var checkbox_default = defineVxeComponent({
   name: "VxeCheckbox",
@@ -37,10 +38,7 @@ var checkbox_default = defineVxeComponent({
       default: () => getConfig().checkbox.size || getConfig().size
     }
   },
-  emits: [
-    "update:modelValue",
-    "change"
-  ],
+  emits: ["update:modelValue", "change"],
   setup(props, context) {
     const { slots, emit } = context;
     const $xeForm = inject("$xeForm", null);
@@ -55,7 +53,7 @@ var checkbox_default = defineVxeComponent({
       reactData
     };
     let checkboxMethods = {};
-    const { computeSize } = useSize(props);
+    const { computeSize } = useFns.useSize(props);
     const computeCheckValue = computed(() => {
       const { checkedValue, label } = props;
       return XEUtils.isUndefined(checkedValue) ? label : checkedValue;
@@ -122,44 +120,66 @@ var checkbox_default = defineVxeComponent({
         const isGroupReadonly = computeIsGroupReadonly.value;
         if (isGroupReadonly) {
           if (isChecked) {
-            return h("label", {
-              class: ["vxe-checkbox vxe-checkbox--view", {
-                [`size--${vSize}`]: vSize,
-                "is--readonly": isGroupReadonly
-              }]
-            }, [
-              h("span", {
-                class: "vxe-checkbox--label"
-              }, defaultSlot ? defaultSlot({}) : getFuncText(content))
-            ]);
+            return h(
+              "label",
+              {
+                class: [
+                  "vxe-checkbox vxe-checkbox--view",
+                  {
+                    [`size--${vSize}`]: vSize,
+                    "is--readonly": isGroupReadonly
+                  }
+                ]
+              },
+              [
+                h(
+                  "span",
+                  {
+                    class: "vxe-checkbox--label"
+                  },
+                  defaultSlot ? defaultSlot({}) : getFuncText(content)
+                )
+              ]
+            );
           }
           return renderEmptyElement($xeCheckbox);
         }
       }
-      return h("label", {
-        key: `${checkValue}`,
-        class: ["vxe-checkbox vxe-checkbox--default", {
-          [`size--${vSize}`]: vSize,
-          "is--indeterminate": indeterminate,
-          "is--disabled": isDisabled,
-          "is--checked": isChecked
-        }],
-        title: props.title
-      }, [
-        h("input", {
-          class: "vxe-checkbox--input",
-          type: "checkbox",
-          disabled: isDisabled,
-          checked: isChecked,
-          onChange: changeEvent
-        }),
-        h("span", {
-          class: ["vxe-checkbox--icon", indeterminate ? getIcon().CHECKBOX_INDETERMINATE : isChecked ? getIcon().CHECKBOX_CHECKED : isDisabled ? getIcon().CHECKBOX_DISABLED_UNCHECKED : getIcon().CHECKBOX_UNCHECKED]
-        }),
-        h("span", {
-          class: "vxe-checkbox--label"
-        }, defaultSlot ? defaultSlot({}) : getFuncText(content))
-      ]);
+      return h(
+        "label",
+        {
+          key: `${checkValue}`,
+          class: [
+            "vxe-checkbox vxe-checkbox--default",
+            {
+              [`size--${vSize}`]: vSize,
+              "is--indeterminate": indeterminate,
+              "is--disabled": isDisabled,
+              "is--checked": isChecked
+            }
+          ],
+          title: props.title
+        },
+        [
+          h("input", {
+            class: "vxe-checkbox--input",
+            type: "checkbox",
+            disabled: isDisabled,
+            checked: isChecked,
+            onChange: changeEvent
+          }),
+          h("span", {
+            class: ["vxe-checkbox--icon", indeterminate ? getIcon().CHECKBOX_INDETERMINATE : isChecked ? getIcon().CHECKBOX_CHECKED : isDisabled ? getIcon().CHECKBOX_DISABLED_UNCHECKED : getIcon().CHECKBOX_UNCHECKED]
+          }),
+          h(
+            "span",
+            {
+              class: "vxe-checkbox--label"
+            },
+            defaultSlot ? defaultSlot({}) : getFuncText(content)
+          )
+        ]
+      );
     };
     onMounted(() => {
       if (props.label !== null) {

package/es/checkbox/src/group.js

@@ -1,9 +1,10 @@
 import { h, provide, computed, inject, reactive, onUnmounted, watch, onMounted, nextTick } from "vue";
 import { defineVxeComponent } from "../../ui/src/comp";
-import { getConfig, createEvent, useSize } from "../../ui";
+import { VxeUI } from "@vxe-ui/core";
 import XEUtils from "xe-utils";
 import VxeCheckboxComponent from "../../checkbox";
 import VxeCheckboxButtonComponent from "../../checkbox-button";
+const { getConfig, createEvent, useFns } = VxeUI;
 function createReactData() {
   return {};
 }
@@ -41,11 +42,7 @@ var group_default = defineVxeComponent({
     },
     defaultConfig: Object
   },
-  emits: [
-    "update:modelValue",
-    "change",
-    "default-change"
-  ],
+  emits: ["update:modelValue", "change", "default-change"],
   setup(props, context) {
     const { slots, emit } = context;
     const $xeForm = inject("$xeForm", null);
@@ -118,7 +115,7 @@ var group_default = defineVxeComponent({
       reactData,
       getComputeMaps: () => computeMaps
     };
-    useSize(props);
+    useFns.useSize(props);
     const dispatchEvent = (type, params, evnt) => {
       emit(type, createEvent(evnt, { $checkboxGroup: $xeCheckboxGroup }, params));
     };
@@ -189,26 +186,37 @@ var group_default = defineVxeComponent({
       const isReadonly = computeIsReadonly.value;
       const isDisabled = computeIsDisabled.value;
       const btnComp = type === "button" ? VxeCheckboxButtonComponent : VxeCheckboxComponent;
-      return h("div", {
-        class: ["vxe-checkbox-group", `type--${type === "button" ? type : ""}`, {
-          [`theme--${status}`]: status,
-          "is--readonly": isReadonly,
-          "is--disabled": isDisabled
-        }]
-      }, defaultSlot ? defaultSlot({}) : options ? options.map((item) => {
-        return h(btnComp, {
-          key: item[valueField],
-          checkedValue: item[valueField],
-          content: item[labelField],
-          icon: item[iconField],
-          title: item[titleField],
-          disabled: item[disabledField]
-        });
-      }) : []);
+      return h(
+        "div",
+        {
+          class: [
+            "vxe-checkbox-group",
+            `type--${type === "button" ? type : ""}`,
+            {
+              [`theme--${status}`]: status,
+              "is--readonly": isReadonly,
+              "is--disabled": isDisabled
+            }
+          ]
+        },
+        defaultSlot ? defaultSlot({}) : options ? options.map((item) => {
+          return h(btnComp, {
+            key: item[valueField],
+            checkedValue: item[valueField],
+            content: item[labelField],
+            icon: item[iconField],
+            title: item[titleField],
+            disabled: item[disabledField]
+          });
+        }) : []
+      );
     };
-    watch(() => props.options, (val) => {
-      loadData(val || []);
-    });
+    watch(
+      () => props.options,
+      (val) => {
+        loadData(val || []);
+      }
+    );
     onMounted(() => {
       nextTick(() => {
         const { options } = props;

package/es/collapse/src/collapse-pane.js

@@ -1,8 +1,9 @@
 import { ref, h, inject, watch, reactive, onMounted, onUnmounted } from "vue";
 import { defineVxeComponent } from "../../ui/src/comp";
 import XEUtils from "xe-utils";
-import { createEvent } from "../../ui";
+import { VxeUI } from "@vxe-ui/core";
 import { assembleCollapseItem, destroyCollapseItem } from "./util";
+const { createEvent } = VxeUI;
 var collapse_pane_default = defineVxeComponent({
   name: "VxeCollapsePane",
   props: {
@@ -49,22 +50,38 @@ var collapse_pane_default = defineVxeComponent({
     const collapsePanePrivateMethods = {};
     Object.assign($xeCollapsePane, collapsePaneMethods, collapsePanePrivateMethods);
     const renderVN = () => {
-      return h("div", {
-        ref: refElem
-      }, []);
+      return h(
+        "div",
+        {
+          ref: refElem
+        },
+        []
+      );
     };
-    watch(() => props.title, (val) => {
-      collapseConfig.title = val;
-    });
-    watch(() => props.name, (val) => {
-      collapseConfig.name = val;
-    });
-    watch(() => props.icon, (val) => {
-      collapseConfig.icon = val;
-    });
-    watch(() => props.permissionCode, (val) => {
-      collapseConfig.permissionCode = val;
-    });
+    watch(
+      () => props.title,
+      (val) => {
+        collapseConfig.title = val;
+      }
+    );
+    watch(
+      () => props.name,
+      (val) => {
+        collapseConfig.name = val;
+      }
+    );
+    watch(
+      () => props.icon,
+      (val) => {
+        collapseConfig.icon = val;
+      }
+    );
+    watch(
+      () => props.permissionCode,
+      (val) => {
+        collapseConfig.permissionCode = val;
+      }
+    );
     onMounted(() => {
       const elem = refElem.value;
       if ($xeCollapse && elem) {