@ftjs/antd 3.1.1 → 3.2.1

package/dist/index.js

@@ -1,6 +1,6 @@
 import { getField, useFormItem, useLocale, unrefs, useFormInject, toValueWithForm, useForm, set, useTable, get } from "@ftjs/core";
 import { computed, toValue, createVNode, mergeProps, unref, createTextVNode, isVNode, defineComponent, createBlock, openBlock, resolveDynamicComponent, createElementBlock, Fragment, renderList, normalizeClass, ref, useId, withCtx, renderSlot, createCommentVNode, toDisplayString, createElementVNode, onMounted, h, useTemplateRef, normalizeStyle, createSlots, normalizeProps } from "vue";
-import { FormItem, Input, Select, DatePicker, RangePicker, Radio, Textarea, Upload, Cascader, AutoComplete, CheckboxGroup, InputNumber, Mentions, Rate, Slider, Switch, TreeSelect, Form, Button, Modal, Tree, Divider, Spin, Pagination } from "ant-design-vue";
+import { FormItem, Input, Select, DatePicker, RangePicker, Radio, Textarea, Upload, Cascader, AutoComplete, CheckboxGroup, InputNumber, Mentions, Rate, Slider, Switch, TreeSelect, Form, Button, Modal, Tree, Badge, Divider, Spin, Pagination } from "ant-design-vue";
 import dayjs from "dayjs";
 import { SwapOutlined, SettingOutlined } from "@ant-design/icons-vue";
 import { VxeGrid } from "vxe-table";
@@ -787,6 +787,9 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
       list.splice(fromIndex, 1);
       list.splice(toIndex, 0, dragNode);
     };
+    const hideCountNum = computed(() => {
+      return props.cache ? props.columns.length - columnsChecked.value.length : 0;
+    });
     __expose({
       formInstance: formRef,
       formData: form,
@@ -876,18 +879,23 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
             createVNode(unref(FormItem), { style: { "--ft-form-control-width": "220px" } }, {
               default: withCtx(() => [
                 createElementVNode("div", _hoisted_4, [
-                  _ctx.cache ? (openBlock(), createBlock(unref(Button), {
+                  _ctx.cache ? (openBlock(), createBlock(unref(Badge), {
                     key: 0,
-                    onClick: setting
+                    count: hideCountNum.value
                   }, {
-                    icon: withCtx(() => [
-                      createVNode(unref(SettingOutlined))
-                    ]),
                     default: withCtx(() => [
-                      createTextVNode(" " + toDisplayString(unref(locale).form.settings), 1)
+                      createVNode(unref(Button), { onClick: setting }, {
+                        icon: withCtx(() => [
+                          createVNode(unref(SettingOutlined))
+                        ]),
+                        default: withCtx(() => [
+                          createTextVNode(" " + toDisplayString(unref(locale).form.settings), 1)
+                        ]),
+                        _: 1
+                      })
                     ]),
                     _: 1
-                  })) : createCommentVNode("", true),
+                  }, 8, ["count"])) : createCommentVNode("", true),
                   createVNode(unref(Button), {
                     type: "primary",
                     htmlType: "submit"
@@ -1169,6 +1177,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     }
     const current = ref(1);
     const pageSize = ref(props.defaultPageSize);
+    const locale = useLocale();
+    const showPaginationTotal = computed(() => {
+      if ((props.total ?? 0) <= 0) return void 0;
+      return (total) => locale.value.table.paginationTotal(total);
+    });
     async function refresh() {
       var _a;
       current.value = 1;
@@ -1252,13 +1265,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           showQuickJumper: "",
           showSizeChanger: "",
           showLessItems: "",
+          showTotal: showPaginationTotal.value,
           total: _ctx.total,
           defaultPageSize: _ctx.defaultPageSize,
           onChange: _cache[2] || (_cache[2] = () => {
             var _a;
             return (_a = _ctx.onSearch) == null ? void 0 : _a.call(_ctx);
           })
-        }, null, 8, ["current", "pageSize", "total", "defaultPageSize"])])) : createCommentVNode("", true)]),
+        }, null, 8, ["current", "pageSize", "showTotal", "total", "defaultPageSize"])])) : createCommentVNode("", true)]),
         loading: withCtx((slotData) => [_ctx.$slots.loading ? renderSlot(_ctx.$slots, "loading", normalizeProps(mergeProps({
           key: 0
         }, slotData))) : (openBlock(), createElementBlock("div", _hoisted_2, [createVNode(unref(Spin))]))]),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ftjs/antd",
-  "version": "3.1.1",
+  "version": "3.2.1",
   "keywords": [],
   "author": "",
   "license": "MIT",