@qin-ui/antd-vue-pro 1.0.39 → 1.0.41

package/es/component-provider/index.js

@@ -1,6 +1,6 @@
 import { defineComponent, provide, renderSlot } from "vue";
 import "ant-design-vue";
-import { I as INJECT_COMPONENT_PROPS_KEYS } from "../form/index-41d46d27.js";
+import { I as INJECT_COMPONENT_PROPS_KEYS } from "../form/index-914194dc.js";
 import { PRO_TABLE_INJECT_COMPONENT_PROPS_KEYS } from "../table/index.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "index",

package/es/form/{index-41d46d27.js → index-914194dc.js}

@@ -15818,7 +15818,7 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
       ]);
       delete baseFormItemProps.className;
       const defaultProps = {
-        first: true
+        validateFirst: true
       };
       if (field.fields) {
         Object.assign(defaultProps, {
@@ -16653,19 +16653,20 @@ export {
   _sfc_main$4 as d,
   _sfc_main$1 as e,
   FORM_DATA as f,
-  UPDATE_REFS as g,
-  COMMAND as h,
-  UPDATE_ACTIVE_PATH as i,
-  FunctionRegexp as j,
-  ArrowFunctionRegexp as k,
-  INIT_COMPONENT_PROPS_MAP as l,
-  isFunctionString as m,
-  jsonStringifyReplacer as n,
+  get$1 as g,
+  UPDATE_REFS as h,
+  COMMAND as i,
+  UPDATE_ACTIVE_PATH as j,
+  FunctionRegexp as k,
+  ArrowFunctionRegexp as l,
+  INIT_COMPONENT_PROPS_MAP as m,
+  isFunctionString as n,
   omit$1 as o,
-  jsonParseReviver as p,
-  useFields as q,
-  useFormData as r,
-  useCommand as s,
-  useInitProps as t,
-  useForm as u
+  jsonStringifyReplacer as p,
+  jsonParseReviver as q,
+  useFields as r,
+  useFormData as s,
+  useCommand as t,
+  useForm as u,
+  useInitProps as v
 };

package/es/form/index.js

@@ -1,30 +1,30 @@
-import { k, B, d, h, C, b, f, F, j, l, I, R, e, i, U, g, _, m, p, n, s, q, u, r, t } from "./index-41d46d27.js";
+import { l, B, d, i, C, b, f, F, k, m, I, R, e, j, U, h, _, n, q, p, t, r, u, s, v } from "./index-914194dc.js";
 import "vue";
 import "ant-design-vue";
 export {
-  k as ArrowFunctionRegexp,
+  l as ArrowFunctionRegexp,
   B as BaseField,
   d as BaseFormItem,
-  h as COMMAND,
+  i as COMMAND,
   C as COMPONENT_MAP,
   b as ContainerFragment,
   f as FORM_DATA,
   F as FORM_ITEM_SLOT_KEYS,
-  j as FunctionRegexp,
-  l as INIT_COMPONENT_PROPS_MAP,
+  k as FunctionRegexp,
+  m as INIT_COMPONENT_PROPS_MAP,
   I as INJECT_COMPONENT_PROPS_KEYS,
   R as RULE_TYPE_MAP,
   e as SlotComponent,
-  i as UPDATE_ACTIVE_PATH,
+  j as UPDATE_ACTIVE_PATH,
   U as UPDATE_FORM_DATA,
-  g as UPDATE_REFS,
+  h as UPDATE_REFS,
   _ as default,
-  m as isFunctionString,
-  p as jsonParseReviver,
-  n as jsonStringifyReplacer,
-  s as useCommand,
-  q as useFields,
+  n as isFunctionString,
+  q as jsonParseReviver,
+  p as jsonStringifyReplacer,
+  t as useCommand,
+  r as useFields,
   u as useForm,
-  r as useFormData,
-  t as useInitProps
+  s as useFormData,
+  v as useInitProps
 };

package/es/index.js

@@ -1,6 +1,6 @@
 import "./style.css";
-import { _ as _sfc_main } from "./form/index-41d46d27.js";
-import { k, B, d, h, C, b, f, F, j, l, I, R, e, i, U, g, m, p, n, s, q, u, r, t } from "./form/index-41d46d27.js";
+import { _ as _sfc_main } from "./form/index-914194dc.js";
+import { l, B, d, i, C, b, f, F, k, m, I, R, e, j, U, h, n, q, p, t, r, u, s, v } from "./form/index-914194dc.js";
 import BaseTable from "./table/index.js";
 import { PRO_TABLE_INIT_COMPONENT_PROPS_MAP, PRO_TABLE_INJECT_COMPONENT_PROPS_KEYS, useTable } from "./table/index.js";
 import _sfc_main$1 from "./component-provider/index.js";
@@ -24,16 +24,16 @@ const index = {
   }
 };
 export {
-  k as ArrowFunctionRegexp,
+  l as ArrowFunctionRegexp,
   B as BaseField,
   d as BaseFormItem,
-  h as COMMAND,
+  i as COMMAND,
   C as COMPONENT_MAP,
   b as ContainerFragment,
   f as FORM_DATA,
   F as FORM_ITEM_SLOT_KEYS,
-  j as FunctionRegexp,
-  l as INIT_COMPONENT_PROPS_MAP,
+  k as FunctionRegexp,
+  m as INIT_COMPONENT_PROPS_MAP,
   I as INJECT_COMPONENT_PROPS_KEYS,
   PRO_TABLE_INIT_COMPONENT_PROPS_MAP,
   PRO_TABLE_INJECT_COMPONENT_PROPS_KEYS,
@@ -42,17 +42,17 @@ export {
   ProTable,
   R as RULE_TYPE_MAP,
   e as SlotComponent,
-  i as UPDATE_ACTIVE_PATH,
+  j as UPDATE_ACTIVE_PATH,
   U as UPDATE_FORM_DATA,
-  g as UPDATE_REFS,
+  h as UPDATE_REFS,
   index as default,
-  m as isFunctionString,
-  p as jsonParseReviver,
-  n as jsonStringifyReplacer,
-  s as useCommand,
-  q as useFields,
+  n as isFunctionString,
+  q as jsonParseReviver,
+  p as jsonStringifyReplacer,
+  t as useCommand,
+  r as useFields,
   u as useForm,
-  r as useFormData,
-  t as useInitProps,
+  s as useFormData,
+  v as useInitProps,
   useTable
 };

package/es/style.css

@@ -2,21 +2,21 @@
   width: 100%;
   min-width: 120px;
 }
-.search[data-v-41c82259] {
+.search[data-v-917bc550] {
   display: flex;
   gap: 24px;
 }
-.search .pro-form[data-v-41c82259] {
+.search .pro-form[data-v-917bc550] {
   flex: 1;
 }
-.search .pro-form[data-v-41c82259] .ant-form-item {
+.search .pro-form[data-v-917bc550] .ant-form-item {
   margin-bottom: 0;
 }
-.search .buttons[data-v-41c82259] {
+.search .buttons[data-v-917bc550] {
   display: flex;
   gap: 8px;
 }
-.search .expand-transition[data-v-41c82259] {
+.search .expand-transition[data-v-917bc550] {
   transition: all 0.25s;
 }
 .control-icon[data-v-2776fca6] {
@@ -41,11 +41,11 @@
   padding: 24px 24px 16px;
   background-color: #fff;
 }
-.pro-table[data-v-864e5a75] {
+.pro-table[data-v-fd9aab35] {
   display: flex;
   flex-direction: column;
   min-width: 800px;
 }
-.pro-table[data-v-864e5a75] .ant-pagination .ant-pagination-total-text {
+.pro-table[data-v-fd9aab35] .ant-pagination .ant-pagination-total-text {
   flex: 1;
 }

package/es/table/index.js

@@ -1,6 +1,6 @@
 import { createVNode, defineComponent, ref, onMounted, openBlock, createElementBlock, unref, normalizeStyle, createElementVNode, withCtx, createTextVNode, createBlock, toDisplayString, createCommentVNode, mergeModels, useModel, computed, watch, Fragment, renderList, withModifiers, renderSlot, inject, useAttrs, useSlots, mergeProps, createSlots, normalizeProps, guardReactiveProps, nextTick } from "vue";
 import { Button, Space, Dropdown, Menu, MenuItem, Checkbox, MenuDivider, Table } from "ant-design-vue";
-import { A as AntdIcon, _ as _sfc_main$6, a as _export_sfc, o as omit, b as _sfc_main$7, c as cloneDeep, u as useForm } from "../form/index-41d46d27.js";
+import { A as AntdIcon, _ as _sfc_main$6, g as get, a as _export_sfc, o as omit, b as _sfc_main$7, c as cloneDeep, u as useForm } from "../form/index-914194dc.js";
 var ColumnHeightOutlined$2 = { "icon": { "tag": "svg", "attrs": { "viewBox": "64 64 896 896", "focusable": "false" }, "children": [{ "tag": "path", "attrs": { "d": "M840 836H184c-4.4 0-8 3.6-8 8v60c0 4.4 3.6 8 8 8h656c4.4 0 8-3.6 8-8v-60c0-4.4-3.6-8-8-8zm0-724H184c-4.4 0-8 3.6-8 8v60c0 4.4 3.6 8 8 8h656c4.4 0 8-3.6 8-8v-60c0-4.4-3.6-8-8-8zM610.8 378c6 0 9.4-7 5.7-11.7L515.7 238.7a7.14 7.14 0 00-11.3 0L403.6 366.3a7.23 7.23 0 005.7 11.7H476v268h-62.8c-6 0-9.4 7-5.7 11.7l100.8 127.5c2.9 3.7 8.5 3.7 11.3 0l100.8-127.5c3.7-4.7.4-11.7-5.7-11.7H548V378h62.8z" } }] }, "name": "column-height", "theme": "outlined" };
 const ColumnHeightOutlinedSvg = ColumnHeightOutlined$2;
 function _objectSpread$2(target) {
@@ -117,21 +117,46 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
   },
   emits: ["search", "reset"],
   setup(__props, { emit: __emit }) {
-    const proFormRef = ref();
-    const expandStatus = ref(true);
+    const props = __props;
     const emit = __emit;
     let initProFormHeight = "unset";
     const showExpandToggle = ref(false);
+    const proFormRef = ref();
+    const expandStatus = ref(true);
     const expand = () => {
       expandStatus.value = !expandStatus.value;
     };
+    const setInitExpandStatus = () => {
+      expandStatus.value = false;
+      if (proFormRef.value) {
+        const formEl = proFormRef.value.$el;
+        const formItemsEl = formEl.querySelectorAll(".ant-form-item>[path]");
+        const observer = new IntersectionObserver(
+          (entries) => {
+            expandStatus.value = entries.some((e) => {
+              if (e.intersectionRatio === 0) {
+                const path = e.target.getAttribute("path");
+                const searchFieldValue = path ? get(props.form.formData.value, path) : void 0;
+                return ![null, void 0].includes(searchFieldValue);
+              }
+              return false;
+            });
+            observer.disconnect();
+          },
+          { root: formEl }
+        );
+        formItemsEl.forEach((element) => {
+          observer.observe(element);
+        });
+      }
+    };
     onMounted(() => {
       var _a, _b;
       const proFormEl = (_a = proFormRef.value) == null ? void 0 : _a.$el;
       const { height = 0 } = ((_b = proFormEl == null ? void 0 : proFormEl.getBoundingClientRect) == null ? void 0 : _b.call(proFormEl)) || {};
       initProFormHeight = height;
       showExpandToggle.value = height > HEIGHT_THRESHOLD;
-      expandStatus.value = false;
+      setInitExpandStatus();
     });
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("div", _hoisted_1$4, [
@@ -184,8 +209,8 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const SearchForm_vue_vue_type_style_index_0_scoped_41c82259_lang = "";
-const SearchForm = /* @__PURE__ */ _export_sfc(_sfc_main$5, [["__scopeId", "data-v-41c82259"]]);
+const SearchForm_vue_vue_type_style_index_0_scoped_917bc550_lang = "";
+const SearchForm = /* @__PURE__ */ _export_sfc(_sfc_main$5, [["__scopeId", "data-v-917bc550"]]);
 const _sfc_main$4 = /* @__PURE__ */ defineComponent({
   __name: "Control",
   props: mergeModels({
@@ -409,7 +434,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const injectProps = inject(
       PRO_TABLE_INJECT_COMPONENT_PROPS_KEYS.table
     );
-    const cache = props.paramCache === void 0 ? injectProps == null ? void 0 : injectProps.paramCache : props.paramCache;
+    const cache = props.paramCache === null ? null : props.paramCache ?? (injectProps == null ? void 0 : injectProps.paramCache);
     const size = ref(unref(props.size));
     const attrs = useAttrs();
     const { table = {} } = props;
@@ -431,11 +456,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         current,
         pageSize
       });
-      cache == null ? void 0 : cache.set((pre = {}) => ({
-        ...pre,
-        pagination: unref(pagination),
-        searchParam: unref(searchParam)
-      }));
+      cache == null ? void 0 : cache.set(
+        (pre = {}) => cloneDeep({
+          ...pre,
+          pagination: unref(pagination),
+          searchParam: unref(searchParam)
+        })
+      );
     };
     const reset = () => {
       var _a2;
@@ -538,9 +565,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             Object.hasOwn(_ctx.$slots, "search") ? renderSlot(_ctx.$slots, "search", { key: 0 }, void 0, true) : (openBlock(), createBlock(unref(SearchForm), {
               key: 1,
               form,
+              cache: unref(cache),
               onSearch: searchPage1st,
               onReset: reset
-            }, null, 8, ["form"]))
+            }, null, 8, ["form", "cache"]))
           ]),
           _: 3
         }, 8, ["component"])) : createCommentVNode("", true),
@@ -586,8 +614,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const Table_vue_vue_type_style_index_0_scoped_864e5a75_lang = "";
-const BaseTable = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-864e5a75"]]);
+const Table_vue_vue_type_style_index_0_scoped_fd9aab35_lang = "";
+const BaseTable = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-fd9aab35"]]);
 const getDefaultPagination = () => ({ current: 1, pageSize: 10, total: 0 });
 const useTable = ({
   columns: initColumns = [],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qin-ui/antd-vue-pro",
-  "version": "1.0.39",
+  "version": "1.0.41",
   "description": "二次封装antd vue组件",
   "type": "module",
   "main": "",