@ftjs/antd 3.1.0 → 3.2.0

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";
@@ -237,22 +237,26 @@ const cascader = defineFormItem((props) => {
   const locale = useLocale();
   return () => {
     const _props = unrefs(props.column.props);
+    const fieldNames = (_props == null ? void 0 : _props.fieldNames) || {};
+    const labelKey = fieldNames.label || "label";
+    const valueKey = fieldNames.value || "value";
+    const childrenKey = fieldNames.children || "children";
     const placeholder = locale.value.placeholder.select(formItemProps.value.label);
     const getTextFromOptions = (options, value, level = 0) => {
       if (!options || !value || level >= value.length) return void 0;
       const currentValue = value[level];
-      const currentOption = options.find((option) => option.value === currentValue);
+      const currentOption = options.find((option) => option[valueKey] === currentValue);
       if (!currentOption) return void 0;
       if (level === value.length - 1) {
-        return currentOption.label;
+        return currentOption[labelKey];
       }
-      if (currentOption.children && currentOption.children.length > 0) {
-        const childText = getTextFromOptions(currentOption.children, value, level + 1);
+      if (currentOption[childrenKey] && currentOption[childrenKey].length > 0) {
+        const childText = getTextFromOptions(currentOption[childrenKey], value, level + 1);
         if (childText) {
-          return `${currentOption.label} / ${childText}`;
+          return `${currentOption[labelKey]} / ${childText}`;
         }
       }
-      return currentOption.label;
+      return currentOption[labelKey];
     };
     const isViewText = computed(() => {
       if (props.isView && valueComputed.value) {
@@ -783,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,
@@ -872,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"

package/package.json

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