vxe-pc-ui 4.20.24 → 4.20.26

package/es/switch/src/switch.js

@@ -1,8 +1,21 @@
-import { h, ref, computed, reactive, nextTick, inject } from "vue";
+import { h, ref, computed, reactive, nextTick, inject, onUnmounted, onBeforeUnmount } from "vue";
 import { defineVxeComponent } from "../../ui/src/comp";
 import XEUtils from "xe-utils";
-import { getConfig, getI18n, createEvent, useSize, renderEmptyElement } from "../../ui";
+import { VxeUI } from "@vxe-ui/core";
 import { getFuncText } from "../../ui/src/utils";
+const { getConfig, getI18n, createEvent, useFns, renderEmptyElement } = VxeUI;
+function createReactData() {
+  return {
+    isActivated: false,
+    hasAnimat: false,
+    offsetLeft: 0
+  };
+}
+function createInternalData() {
+  return {
+    // atTimeout: undefined
+  };
+}
 var switch_default = defineVxeComponent({
   name: "VxeSwitch",
   props: {
@@ -34,24 +47,15 @@ var switch_default = defineVxeComponent({
     openActiveIcon: String,
     closeActiveIcon: String
   },
-  emits: [
-    "update:modelValue",
-    "change",
-    "focus",
-    "blur"
-  ],
+  emits: ["update:modelValue", "change", "focus", "blur"],
   setup(props, context) {
     const { emit } = context;
     const $xeForm = inject("$xeForm", null);
     const formItemInfo = inject("xeFormItemInfo", null);
     const xID = XEUtils.uniqueId();
-    const { computeSize } = useSize(props);
-    const reactData = reactive({
-      isActivated: false,
-      hasAnimat: false,
-      offsetLeft: 0
-    });
-    const internalData = {};
+    const { computeSize } = useFns.useSize(props);
+    const reactData = reactive(createReactData());
+    const internalData = createInternalData();
     const $xeSwitch = {
       xID,
       props,
@@ -98,7 +102,10 @@ var switch_default = defineVxeComponent({
       const isReadonly = computeIsReadonly.value;
       if (!(isDisabled || isReadonly)) {
         const isChecked = computeIsChecked.value;
-        clearTimeout(internalData.atTimeout);
+        const { atTimeout } = internalData;
+        if (atTimeout) {
+          clearTimeout(atTimeout);
+        }
         const value = isChecked ? props.closeValue : props.openValue;
         reactData.hasAnimat = true;
         emitModel(value);
@@ -145,6 +152,7 @@ var switch_default = defineVxeComponent({
     Object.assign($xeSwitch, switchMethods);
     const renderVN = () => {
       const { openIcon, closeIcon, openActiveIcon, closeActiveIcon } = props;
+      const { hasAnimat, isActivated } = reactData;
       const vSize = computeSize.value;
       const isChecked = computeIsChecked.value;
       const onShowLabel = computeOnShowLabel.value;
@@ -152,56 +160,99 @@ var switch_default = defineVxeComponent({
       const isDisabled = computeIsDisabled.value;
       const isReadonly = computeIsReadonly.value;
       if (isReadonly) {
-        return h("div", {
-          class: ["vxe-switch", isChecked ? "is--on" : "is--off", {
-            [`size--${vSize}`]: vSize,
-            "is--readonly": isReadonly
-          }]
-        }, isChecked ? onShowLabel || getI18n("vxe.switch.onText") : offShowLabel || getI18n("vxe.switch.offText"));
+        return h(
+          "div",
+          {
+            class: [
+              "vxe-switch",
+              isChecked ? "is--on" : "is--off",
+              {
+                [`size--${vSize}`]: vSize,
+                "is--readonly": isReadonly
+              }
+            ]
+          },
+          isChecked ? onShowLabel || getI18n("vxe.switch.onText") : offShowLabel || getI18n("vxe.switch.offText")
+        );
       }
-      return h("div", {
-        class: ["vxe-switch", isChecked ? "is--on" : "is--off", {
-          [`size--${vSize}`]: vSize,
-          "is--disabled": isDisabled,
-          "is--readonly": isReadonly,
-          "is--animat": reactData.hasAnimat
-        }]
-      }, [
-        h("button", {
-          ref: refButton,
-          class: "vxe-switch--button",
-          type: "button",
-          disabled: isDisabled || isReadonly,
-          onClick: clickEvent,
-          onFocus: focusEvent,
-          onBlur: blurEvent
-        }, [
-          h("span", {
-            class: "vxe-switch--label vxe-switch--label-on"
-          }, [
-            openIcon ? h("i", {
-              class: ["vxe-switch--label-icon", openIcon]
-            }) : renderEmptyElement($xeSwitch),
-            onShowLabel
-          ]),
-          h("span", {
-            class: "vxe-switch--label vxe-switch--label-off"
-          }, [
-            closeIcon ? h("i", {
-              class: ["vxe-switch--label-icon", closeIcon]
-            }) : renderEmptyElement($xeSwitch),
-            offShowLabel
-          ]),
-          h("span", {
-            class: ["vxe-switch--icon"]
-          }, openActiveIcon || closeActiveIcon ? [
-            h("i", {
-              class: isChecked ? openActiveIcon : closeActiveIcon
-            })
-          ] : [])
-        ])
-      ]);
+      return h(
+        "div",
+        {
+          class: [
+            "vxe-switch",
+            isChecked ? "is--on" : "is--off",
+            {
+              [`size--${vSize}`]: vSize,
+              "is--active": isActivated,
+              "is--disabled": isDisabled,
+              "is--readonly": isReadonly,
+              "is--animat": hasAnimat
+            }
+          ]
+        },
+        [
+          h(
+            "button",
+            {
+              ref: refButton,
+              class: "vxe-switch--button",
+              type: "button",
+              disabled: isDisabled || isReadonly,
+              onClick: clickEvent,
+              onFocus: focusEvent,
+              onBlur: blurEvent
+            },
+            [
+              h(
+                "span",
+                {
+                  class: "vxe-switch--label vxe-switch--label-on"
+                },
+                [
+                  openIcon ? h("i", {
+                    class: ["vxe-switch--label-icon", openIcon]
+                  }) : renderEmptyElement($xeSwitch),
+                  onShowLabel
+                ]
+              ),
+              h(
+                "span",
+                {
+                  class: "vxe-switch--label vxe-switch--label-off"
+                },
+                [
+                  closeIcon ? h("i", {
+                    class: ["vxe-switch--label-icon", closeIcon]
+                  }) : renderEmptyElement($xeSwitch),
+                  offShowLabel
+                ]
+              ),
+              h(
+                "span",
+                {
+                  class: ["vxe-switch--icon"]
+                },
+                openActiveIcon || closeActiveIcon ? [
+                  h("i", {
+                    class: isChecked ? openActiveIcon : closeActiveIcon
+                  })
+                ] : []
+              )
+            ]
+          )
+        ]
+      );
     };
+    onBeforeUnmount(() => {
+      const { atTimeout } = internalData;
+      if (atTimeout) {
+        clearTimeout(atTimeout);
+      }
+    });
+    onUnmounted(() => {
+      XEUtils.assign(reactData, createReactData());
+      XEUtils.assign(internalData, createInternalData());
+    });
     $xeSwitch.renderVN = renderVN;
     return $xeSwitch;
   },

package/es/table-select/src/table-select.js

@@ -1,7 +1,7 @@
 import { ref, h, computed, inject, watch, provide, nextTick, Teleport, onMounted, onUnmounted, reactive } from "vue";
 import { defineVxeComponent } from "../../ui/src/comp";
 import XEUtils from "xe-utils";
-import { VxeUI } from "../../ui";
+import { VxeUI } from "@vxe-ui/core";
 import { getEventTargetNode, updatePanelPlacement, toCssUnit, getPopupContainer } from "../../ui/src/dom";
 import { getOnName } from "../../ui/src/vn";
 import { getLastZIndex, nextZIndex } from "../../ui/src/utils";
@@ -165,18 +165,27 @@ var table_select_default = defineVxeComponent({
     const computeCheckboxOpts = computed(() => {
       const { multiple } = props;
       const gridOpts = computeGridOpts.value;
-      return Object.assign({
-        reserve: multiple,
-        showReserveStatus: multiple
-      }, getConfig().table.checkboxConfig, gridOpts.checkboxConfig);
+      return Object.assign(
+        {
+          reserve: multiple,
+          showReserveStatus: multiple
+        },
+        getConfig().table.checkboxConfig,
+        gridOpts.checkboxConfig
+      );
     });
     const computeRowOpts = computed(() => {
       const { multiple } = props;
       const gridOpts = computeGridOpts.value;
       const valueField = computeValueField.value;
-      return Object.assign({
-        isCurrent: true
-      }, multiple ? { keyField: valueField } : {}, getConfig().table.rowConfig, gridOpts.rowConfig);
+      return Object.assign(
+        {
+          isCurrent: true
+        },
+        multiple ? { keyField: valueField } : {},
+        getConfig().table.rowConfig,
+        gridOpts.rowConfig
+      );
     });
     const computeRowKeyField = computed(() => {
       const rowOpts = computeRowOpts.value;
@@ -280,12 +289,7 @@ var table_select_default = defineVxeComponent({
       getRefMaps: () => refMaps,
       getComputeMaps: () => computeMaps
     };
-    const gridEventKeys = [
-      "form-submit",
-      "form-reset",
-      "form-collapse",
-      "page-change"
-    ];
+    const gridEventKeys = ["form-submit", "form-reset", "form-collapse", "page-change"];
     const gridEvents = {};
     gridEventKeys.forEach((name) => {
       gridEvents[getOnName(XEUtils.camelCase(name))] = (params) => {
@@ -318,11 +322,13 @@ var table_select_default = defineVxeComponent({
       if (checkboxOpts.reserve) {
         vals.forEach((val) => {
           const cacheItem = fullValMaps[val];
-          rows.push(cacheItem ? cacheItem.item : {
-            [rowKeyField]: val,
-            [valueField]: val,
-            [labelField]: val
-          });
+          rows.push(
+            cacheItem ? cacheItem.item : {
+              [rowKeyField]: val,
+              [valueField]: val,
+              [labelField]: val
+            }
+          );
         });
       } else {
         vals.forEach((val) => {
@@ -432,12 +438,14 @@ var table_select_default = defineVxeComponent({
         avList = fullData;
       } else {
         if (filterable && frMethod) {
-          avList = searchStr ? fullData.filter((row) => frMethod({
-            $tableSelect: $xeTableSelect,
-            row,
-            filterValue: searchValue,
-            value: modelValue
-          })) : fullData;
+          avList = searchStr ? fullData.filter(
+            (row) => frMethod({
+              $tableSelect: $xeTableSelect,
+              row,
+              filterValue: searchValue,
+              value: modelValue
+            })
+          ) : fullData;
         } else if (filterable) {
           avList = searchStr ? fullData.filter((row) => `${row[labelField] || row[valueField]}`.toLowerCase().indexOf(searchStr) > -1) : fullData;
         } else {
@@ -556,9 +564,7 @@ var table_select_default = defineVxeComponent({
       const queryMethod = remoteOpts.queryMethod;
       if (remote && queryMethod && remoteOpts.enabled) {
         reactData.searchLoading = true;
-        Promise.resolve(
-          queryMethod({ $tableSelect: $xeTableSelect, searchValue, value: modelValue })
-        ).then(() => nextTick()).catch(() => nextTick()).finally(() => {
+        Promise.resolve(queryMethod({ $tableSelect: $xeTableSelect, searchValue, value: modelValue })).then(() => nextTick()).catch(() => nextTick()).finally(() => {
           reactData.searchLoading = false;
         });
       } else {
@@ -717,133 +723,206 @@ var table_select_default = defineVxeComponent({
       const prefixSlot = slots.prefix;
       const ppClassName = popupOpts.className;
       if (formReadonly) {
-        return h("div", {
+        return h(
+          "div",
+          {
+            ref: refElem,
+            class: ["vxe-table-select--readonly", className]
+          },
+          [
+            h(
+              "span",
+              {
+                class: "vxe-table-select-label"
+              },
+              selectLabel
+            )
+          ]
+        );
+      }
+      return h(
+        "div",
+        {
           ref: refElem,
-          class: ["vxe-table-select--readonly", className]
-        }, [
-          h("span", {
-            class: "vxe-table-select-label"
-          }, selectLabel)
-        ]);
-      }
-      return h("div", {
-        ref: refElem,
-        class: ["vxe-table-select", className ? XEUtils.isFunction(className) ? className({ $tableSelect: $xeTableSelect }) : className : "", {
-          [`size--${vSize}`]: vSize,
-          "is--filterable": filterable,
-          "is--visible": visiblePanel,
-          "is--disabled": isDisabled,
-          "is--loading": loading,
-          "is--active": isActivated
-        }]
-      }, [
-        h(VxeInputComponent, {
-          ref: refInput,
-          clearable: props.clearable,
-          placeholder: loading ? getI18n("vxe.select.loadingText") : props.placeholder,
-          editable: false,
-          disabled: isDisabled,
-          type: "text",
-          prefixIcon: props.prefixIcon,
-          suffixIcon: loading ? getIcon().TABLE_SELECT_LOADED : visiblePanel ? getIcon().TABLE_SELECT_OPEN : getIcon().TABLE_SELECT_CLOSE,
-          modelValue: loading ? "" : selectLabel,
-          onClear: clearEvent,
-          onClick: clickEvent,
-          onFocus: focusEvent,
-          onBlur: blurEvent,
-          onSuffixClick: togglePanelEvent
-        }, prefixSlot ? {
-          prefix: () => prefixSlot({})
-        } : {}),
-        h(Teleport, {
-          to: getPopupContainer(appendTo),
-          disabled: btnTransfer ? !initialized : true
-        }, [
-          h("div", {
-            ref: refOptionPanel,
-            class: ["vxe-table--ignore-clear vxe-table-select--panel", ppClassName ? XEUtils.isFunction(ppClassName) ? ppClassName({ $tableSelect: $xeTableSelect }) : ppClassName : "", {
+          class: [
+            "vxe-table-select",
+            className ? XEUtils.isFunction(className) ? className({ $tableSelect: $xeTableSelect }) : className : "",
+            {
               [`size--${vSize}`]: vSize,
-              "is--transfer": btnTransfer,
-              "ani--leave": !loading && isAniVisible,
-              "ani--enter": !loading && visiblePanel
-            }],
-            placement: reactData.panelPlacement,
-            style: reactData.panelStyle
-          }, initialized ? [
-            h("div", {
-              class: "vxe-table-select--panel-wrapper"
-            }, [
-              filterable ? h("div", {
-                class: "vxe-table-select--panel-search"
-              }, [
-                h(VxeInputComponent, {
-                  ref: refInpSearch,
-                  class: "vxe-table-select-search--input",
-                  modelValue: searchValue,
-                  clearable: true,
-                  disabled: false,
-                  readonly: false,
-                  placeholder: getI18n("vxe.treeSelect.search"),
-                  prefixIcon: getIcon().INPUT_SEARCH,
-                  "onUpdate:modelValue": modelSearchEvent,
-                  onFocus: focusSearchEvent,
-                  onChange: triggerSearchEvent,
-                  onSearch: triggerSearchEvent
-                })
-              ]) : renderEmptyElement($xeTableSelect),
-              headerSlot ? h("div", {
-                class: "vxe-table-select--panel-header"
-              }, headerSlot({})) : renderEmptyElement($xeTableSelect),
-              h("div", {
-                class: "vxe-table-select--panel-body"
-              }, [
-                h("div", {
-                  ref: refGridWrapper,
-                  class: "vxe-table-select-grid--wrapper",
-                  style: popupWrapperStyle
-                }, [
-                  VxeTableGridComponent ? h(VxeTableGridComponent, {
-                    ...selectGridOpts,
-                    ...gridEvents,
-                    class: "vxe-table-select--grid",
-                    ref: refGrid,
-                    loading: remote && searchLoading,
-                    rowConfig: rowOpts,
-                    data: tableData,
-                    columns: tableColumns.length ? tableColumns : selectGridOpts.columns,
-                    height: "100%",
-                    autoResize: true,
-                    onRadioChange: radioChangeEvent,
-                    onCheckboxChange: checkboxChangeEvent,
-                    onCheckboxAll: checkboxAllEvent
-                  }, Object.assign({}, slots, {
-                    header: void 0,
-                    footer: void 0,
-                    prefixSlot: void 0
-                  })) : renderEmptyElement($xeTableSelect)
-                ])
-              ]),
-              footerSlot || filterable && searchValue && !remote && filterOpts.showResultCount ? h("div", {
-                class: "vxe-table-select--panel-footer"
-              }, footerSlot ? footerSlot({}) : [
-                h("div", {
-                  class: "vxe-table-select--search-count"
-                }, searchLoading ? "" : getI18n("vxe.tableSelect.filterCount", [tableData.length]))
-              ]) : renderEmptyElement($xeTableSelect)
-            ])
-          ] : [])
-        ])
-      ]);
-    };
-    watch(() => props.options, (val) => {
-      loadData(val || []);
-    });
-    watch(() => props.columns, (val) => {
-      loadColumn(val);
-    });
-    watch(() => props.modelValue, (val) => {
-      updateModel(val);
-    });
+              "is--filterable": filterable,
+              "is--visible": visiblePanel,
+              "is--disabled": isDisabled,
+              "is--loading": loading,
+              "is--active": isActivated
+            }
+          ]
+        },
+        [
+          h(
+            VxeInputComponent,
+            {
+              ref: refInput,
+              clearable: props.clearable,
+              placeholder: loading ? getI18n("vxe.select.loadingText") : props.placeholder,
+              editable: false,
+              disabled: isDisabled,
+              type: "text",
+              prefixIcon: props.prefixIcon,
+              suffixIcon: loading ? getIcon().TABLE_SELECT_LOADED : visiblePanel ? getIcon().TABLE_SELECT_OPEN : getIcon().TABLE_SELECT_CLOSE,
+              modelValue: loading ? "" : selectLabel,
+              onClear: clearEvent,
+              onClick: clickEvent,
+              onFocus: focusEvent,
+              onBlur: blurEvent,
+              onSuffixClick: togglePanelEvent
+            },
+            prefixSlot ? {
+              prefix: () => prefixSlot({})
+            } : {}
+          ),
+          h(
+            Teleport,
+            {
+              to: getPopupContainer(appendTo),
+              disabled: btnTransfer ? !initialized : true
+            },
+            [
+              h(
+                "div",
+                {
+                  ref: refOptionPanel,
+                  class: [
+                    "vxe-table--ignore-clear vxe-table-select--panel",
+                    ppClassName ? XEUtils.isFunction(ppClassName) ? ppClassName({ $tableSelect: $xeTableSelect }) : ppClassName : "",
+                    {
+                      [`size--${vSize}`]: vSize,
+                      "is--transfer": btnTransfer,
+                      "ani--leave": !loading && isAniVisible,
+                      "ani--enter": !loading && visiblePanel
+                    }
+                  ],
+                  placement: reactData.panelPlacement,
+                  style: reactData.panelStyle
+                },
+                initialized ? [
+                  h(
+                    "div",
+                    {
+                      class: "vxe-table-select--panel-wrapper"
+                    },
+                    [
+                      filterable ? h(
+                        "div",
+                        {
+                          class: "vxe-table-select--panel-search"
+                        },
+                        [
+                          h(VxeInputComponent, {
+                            ref: refInpSearch,
+                            class: "vxe-table-select-search--input",
+                            modelValue: searchValue,
+                            clearable: true,
+                            disabled: false,
+                            readonly: false,
+                            placeholder: getI18n("vxe.treeSelect.search"),
+                            prefixIcon: getIcon().INPUT_SEARCH,
+                            "onUpdate:modelValue": modelSearchEvent,
+                            onFocus: focusSearchEvent,
+                            onChange: triggerSearchEvent,
+                            onSearch: triggerSearchEvent
+                          })
+                        ]
+                      ) : renderEmptyElement($xeTableSelect),
+                      headerSlot ? h(
+                        "div",
+                        {
+                          class: "vxe-table-select--panel-header"
+                        },
+                        headerSlot({})
+                      ) : renderEmptyElement($xeTableSelect),
+                      h(
+                        "div",
+                        {
+                          class: "vxe-table-select--panel-body"
+                        },
+                        [
+                          h(
+                            "div",
+                            {
+                              ref: refGridWrapper,
+                              class: "vxe-table-select-grid--wrapper",
+                              style: popupWrapperStyle
+                            },
+                            [
+                              VxeTableGridComponent ? h(
+                                VxeTableGridComponent,
+                                {
+                                  ...selectGridOpts,
+                                  ...gridEvents,
+                                  class: "vxe-table-select--grid",
+                                  ref: refGrid,
+                                  loading: remote && searchLoading,
+                                  rowConfig: rowOpts,
+                                  data: tableData,
+                                  columns: tableColumns.length ? tableColumns : selectGridOpts.columns,
+                                  height: "100%",
+                                  autoResize: true,
+                                  onRadioChange: radioChangeEvent,
+                                  onCheckboxChange: checkboxChangeEvent,
+                                  onCheckboxAll: checkboxAllEvent
+                                },
+                                Object.assign({}, slots, {
+                                  header: void 0,
+                                  footer: void 0,
+                                  prefixSlot: void 0
+                                })
+                              ) : renderEmptyElement($xeTableSelect)
+                            ]
+                          )
+                        ]
+                      ),
+                      footerSlot || filterable && searchValue && !remote && filterOpts.showResultCount ? h(
+                        "div",
+                        {
+                          class: "vxe-table-select--panel-footer"
+                        },
+                        footerSlot ? footerSlot({}) : [
+                          h(
+                            "div",
+                            {
+                              class: "vxe-table-select--search-count"
+                            },
+                            searchLoading ? "" : getI18n("vxe.tableSelect.filterCount", [tableData.length])
+                          )
+                        ]
+                      ) : renderEmptyElement($xeTableSelect)
+                    ]
+                  )
+                ] : []
+              )
+            ]
+          )
+        ]
+      );
+    };
+    watch(
+      () => props.options,
+      (val) => {
+        loadData(val || []);
+      }
+    );
+    watch(
+      () => props.columns,
+      (val) => {
+        loadColumn(val);
+      }
+    );
+    watch(
+      () => props.modelValue,
+      (val) => {
+        updateModel(val);
+      }
+    );
     loadColumn(props.columns);
     loadData(props.options || []);
     onMounted(() => {