3h1-ui 2.9.4 → 2.9.6

package/es/index.js

@@ -14403,9 +14403,10 @@ const searchTypeSelect = [{ label: "等于", value: "eq" }];
 const getGlobalAdvancedType = (fieldList, value) => {
   const temp = {};
   fieldList.forEach((field) => {
-    temp[`${field}-op`] = "ct";
-    temp[field] = value;
+    temp[`${field}.${field}-op`] = "ct";
+    temp[`${field}.${field}`] = value;
   });
+  temp.gexpr = fieldList.join("|");
   return temp;
 };
 const _hoisted_1$e = { class: "shy-ui-advanced-search" };
@@ -14476,6 +14477,7 @@ const _sfc_main$p = /* @__PURE__ */ defineComponent({
           return;
         delete schema[key2];
       });
+      schema.op = "eq";
     };
     const getSearchType = (field) => {
       const type = getTypeByField(field);
@@ -15107,10 +15109,30 @@ function useTableFooter(propsRef, scrollRef, tableElRef, getDataSourceRef) {
   }
   return { getFooterProps };
 }
+function deepCopy(obj) {
+  if (typeof obj !== "object" || obj === null) {
+    return obj;
+  }
+  let copy;
+  if (Array.isArray(obj)) {
+    copy = [];
+    for (let i = 0; i < obj.length; i++) {
+      copy[i] = deepCopy(obj[i]);
+    }
+  } else {
+    copy = {};
+    for (let key2 in obj) {
+      if (Object.prototype.hasOwnProperty.call(obj, key2)) {
+        copy[key2] = deepCopy(obj[key2]);
+      }
+    }
+  }
+  return copy;
+}
 function useTableForm(propsRef, slots, fetch, getLoading) {
   const getFormConfig = computed(() => {
     const { formConfig } = unref(propsRef);
-    const temp = JSON.parse(JSON.stringify(formConfig));
+    const temp = deepCopy(formConfig);
     temp == null ? void 0 : temp.schemas.forEach((item) => {
       if (item.component === "Input") {
         item.componentProps = {
@@ -15172,6 +15194,11 @@ const useAdvancedSearch = ({ getProps, reload }) => {
       };
     });
   });
+  const schemasAdvancedSearchString = computed(() => {
+    return schemasAdvancedSearch.value.filter((item) => {
+      return item.type === "string";
+    });
+  });
   const openAdvancedSearch = () => {
     isVisibleAdvancedSearch.value = true;
   };
@@ -15234,7 +15261,8 @@ const useAdvancedSearch = ({ getProps, reload }) => {
     setGlobalSearchValue,
     getGlobalSearchValue,
     setCurSearchParams,
-    getCurSearchParams
+    getCurSearchParams,
+    schemasAdvancedSearchString
   };
 };
 const basicProps$3 = reactive({
@@ -15507,8 +15535,8 @@ const _sfc_main$j = defineComponent({
     };
   }
 });
-const TableGlobalSearch_vue_vue_type_style_index_0_scoped_e43dae4b_lang = "";
-const _withScopeId = (n) => (pushScopeId("data-v-e43dae4b"), n = n(), popScopeId(), n);
+const TableGlobalSearch_vue_vue_type_style_index_0_scoped_fa3d98b2_lang = "";
+const _withScopeId = (n) => (pushScopeId("data-v-fa3d98b2"), n = n(), popScopeId(), n);
 const _hoisted_1$a = { class: "shy-basic-table-global-search" };
 const _hoisted_2$4 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createElementVNode("div", null, "搜索全部", -1));
 const _hoisted_3$1 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createElementVNode("div", null, "搜索特定字段", -1));
@@ -15563,7 +15591,7 @@ function _sfc_render$c(_ctx, _cache, $props, $setup, $data, $options) {
     ])
   ]);
 }
-const TableGlobalSearch = /* @__PURE__ */ _export_sfc(_sfc_main$j, [["render", _sfc_render$c], ["__scopeId", "data-v-e43dae4b"]]);
+const TableGlobalSearch = /* @__PURE__ */ _export_sfc(_sfc_main$j, [["render", _sfc_render$c], ["__scopeId", "data-v-fa3d98b2"]]);
 const _sfc_main$i = defineComponent({
   components: {
     TableAdvancedSearch,
@@ -15754,6 +15782,7 @@ const _sfc_main$i = defineComponent({
     });
     const {
       schemasAdvancedSearch,
+      schemasAdvancedSearchString,
       isVisibleAdvancedSearch,
       openAdvancedSearch,
       closeAdvancedSearch,
@@ -15863,7 +15892,8 @@ const _sfc_main$i = defineComponent({
       schemasAdvancedSearch,
       isVisibleAdvancedSearch,
       handleAdvancedEnsure,
-      isVisibleGlobalSearch
+      isVisibleGlobalSearch,
+      schemasAdvancedSearchString
     };
   }
 });
@@ -15908,7 +15938,7 @@ function _sfc_render$b(_ctx, _cache, $props, $setup, $data, $options) {
         }, null, 8, ["schemasAdvancedSearch", "onEnsure"]), [
           [vShow, _ctx.isVisibleAdvancedSearch]
         ]),
-        withDirectives(createVNode(_component_TableGlobalSearch, { schemasAdvancedSearch: _ctx.schemasAdvancedSearch }, null, 8, ["schemasAdvancedSearch"]), [
+        withDirectives(createVNode(_component_TableGlobalSearch, { schemasAdvancedSearch: _ctx.schemasAdvancedSearchString }, null, 8, ["schemasAdvancedSearch"]), [
           [vShow, _ctx.isVisibleGlobalSearch]
         ]),
         withDirectives(createVNode(_component_Table, mergeProps({ ref: "tableElRef" }, _ctx.getBindValues, {

package/es/style.css

@@ -25482,7 +25482,7 @@ span.iconify {
 }
 .shy-basic-table-header__toolbar > * {
   margin-right: 8px;
-}.shy-basic-table-global-search[data-v-e43dae4b] {
+}.shy-basic-table-global-search[data-v-fa3d98b2] {
   position: absolute;
   top: 40px;
   right: 131px;
@@ -25494,7 +25494,7 @@ span.iconify {
   border: 1px solid #ebebeb;
   padding: 10px;
 }
-.shy-basic-table-global-search-item-global[data-v-e43dae4b] {
+.shy-basic-table-global-search-item-global[data-v-fa3d98b2] {
   height: 32px;
   line-height: 32px;
   font-size: 14px;
@@ -25505,7 +25505,7 @@ span.iconify {
   align-items: center;
   justify-content: space-between;
 }
-.shy-basic-table-global-search-item-special[data-v-e43dae4b] {
+.shy-basic-table-global-search-item-special[data-v-fa3d98b2] {
   height: 32px;
   line-height: 32px;
   font-size: 14px;
@@ -25516,10 +25516,10 @@ span.iconify {
   align-items: center;
   justify-content: space-between;
 }
-.shy-basic-table-global-search-checkbox-wrapper[data-v-e43dae4b] {
+.shy-basic-table-global-search-checkbox-wrapper[data-v-fa3d98b2] {
   padding: 0 8px;
 }
-.shy-basic-table-global-search .selected-bg[data-v-e43dae4b] {
+.shy-basic-table-global-search .selected-bg[data-v-fa3d98b2] {
   background-color: #ebf1ff;
 }.shy-basic-table-action {
   display: flex;

package/es/ui/src/Table/src/hooks/useAdvancedSearch.d.ts

@@ -31,6 +31,7 @@ export declare const useAdvancedSearch: ({ getProps, reload }: {
     getGlobalSearchValue: () => string;
     setCurSearchParams: (value: any) => void;
     getCurSearchParams: () => {};
+    schemasAdvancedSearchString: import("vue").ComputedRef<any>;
 };
 export declare const useAdvancedSearchKv: () => {
     getKvOperator: () => {

package/lib/index.js

@@ -14405,9 +14405,10 @@ const searchTypeSelect = [{ label: "等于", value: "eq" }];
 const getGlobalAdvancedType = (fieldList, value) => {
   const temp = {};
   fieldList.forEach((field) => {
-    temp[`${field}-op`] = "ct";
-    temp[field] = value;
+    temp[`${field}.${field}-op`] = "ct";
+    temp[`${field}.${field}`] = value;
   });
+  temp.gexpr = fieldList.join("|");
   return temp;
 };
 const _hoisted_1$e = { class: "shy-ui-advanced-search" };
@@ -14478,6 +14479,7 @@ const _sfc_main$p = /* @__PURE__ */ vue.defineComponent({
           return;
         delete schema[key2];
       });
+      schema.op = "eq";
     };
     const getSearchType = (field) => {
       const type = getTypeByField(field);
@@ -15109,10 +15111,30 @@ function useTableFooter(propsRef, scrollRef, tableElRef, getDataSourceRef) {
   }
   return { getFooterProps };
 }
+function deepCopy(obj) {
+  if (typeof obj !== "object" || obj === null) {
+    return obj;
+  }
+  let copy;
+  if (Array.isArray(obj)) {
+    copy = [];
+    for (let i = 0; i < obj.length; i++) {
+      copy[i] = deepCopy(obj[i]);
+    }
+  } else {
+    copy = {};
+    for (let key2 in obj) {
+      if (Object.prototype.hasOwnProperty.call(obj, key2)) {
+        copy[key2] = deepCopy(obj[key2]);
+      }
+    }
+  }
+  return copy;
+}
 function useTableForm(propsRef, slots, fetch, getLoading) {
   const getFormConfig = vue.computed(() => {
     const { formConfig } = vue.unref(propsRef);
-    const temp = JSON.parse(JSON.stringify(formConfig));
+    const temp = deepCopy(formConfig);
     temp == null ? void 0 : temp.schemas.forEach((item) => {
       if (item.component === "Input") {
         item.componentProps = {
@@ -15174,6 +15196,11 @@ const useAdvancedSearch = ({ getProps, reload }) => {
       };
     });
   });
+  const schemasAdvancedSearchString = vue.computed(() => {
+    return schemasAdvancedSearch.value.filter((item) => {
+      return item.type === "string";
+    });
+  });
   const openAdvancedSearch = () => {
     isVisibleAdvancedSearch.value = true;
   };
@@ -15236,7 +15263,8 @@ const useAdvancedSearch = ({ getProps, reload }) => {
     setGlobalSearchValue,
     getGlobalSearchValue,
     setCurSearchParams,
-    getCurSearchParams
+    getCurSearchParams,
+    schemasAdvancedSearchString
   };
 };
 const basicProps$3 = vue.reactive({
@@ -15509,8 +15537,8 @@ const _sfc_main$j = vue.defineComponent({
     };
   }
 });
-const TableGlobalSearch_vue_vue_type_style_index_0_scoped_e43dae4b_lang = "";
-const _withScopeId = (n) => (vue.pushScopeId("data-v-e43dae4b"), n = n(), vue.popScopeId(), n);
+const TableGlobalSearch_vue_vue_type_style_index_0_scoped_fa3d98b2_lang = "";
+const _withScopeId = (n) => (vue.pushScopeId("data-v-fa3d98b2"), n = n(), vue.popScopeId(), n);
 const _hoisted_1$a = { class: "shy-basic-table-global-search" };
 const _hoisted_2$4 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ vue.createElementVNode("div", null, "搜索全部", -1));
 const _hoisted_3$1 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ vue.createElementVNode("div", null, "搜索特定字段", -1));
@@ -15565,7 +15593,7 @@ function _sfc_render$c(_ctx, _cache, $props, $setup, $data, $options) {
     ])
   ]);
 }
-const TableGlobalSearch = /* @__PURE__ */ _export_sfc(_sfc_main$j, [["render", _sfc_render$c], ["__scopeId", "data-v-e43dae4b"]]);
+const TableGlobalSearch = /* @__PURE__ */ _export_sfc(_sfc_main$j, [["render", _sfc_render$c], ["__scopeId", "data-v-fa3d98b2"]]);
 const _sfc_main$i = vue.defineComponent({
   components: {
     TableAdvancedSearch,
@@ -15756,6 +15784,7 @@ const _sfc_main$i = vue.defineComponent({
     });
     const {
       schemasAdvancedSearch,
+      schemasAdvancedSearchString,
       isVisibleAdvancedSearch,
       openAdvancedSearch,
       closeAdvancedSearch,
@@ -15865,7 +15894,8 @@ const _sfc_main$i = vue.defineComponent({
       schemasAdvancedSearch,
       isVisibleAdvancedSearch,
       handleAdvancedEnsure,
-      isVisibleGlobalSearch
+      isVisibleGlobalSearch,
+      schemasAdvancedSearchString
     };
   }
 });
@@ -15910,7 +15940,7 @@ function _sfc_render$b(_ctx, _cache, $props, $setup, $data, $options) {
         }, null, 8, ["schemasAdvancedSearch", "onEnsure"]), [
           [vue.vShow, _ctx.isVisibleAdvancedSearch]
         ]),
-        vue.withDirectives(vue.createVNode(_component_TableGlobalSearch, { schemasAdvancedSearch: _ctx.schemasAdvancedSearch }, null, 8, ["schemasAdvancedSearch"]), [
+        vue.withDirectives(vue.createVNode(_component_TableGlobalSearch, { schemasAdvancedSearch: _ctx.schemasAdvancedSearchString }, null, 8, ["schemasAdvancedSearch"]), [
           [vue.vShow, _ctx.isVisibleGlobalSearch]
         ]),
         vue.withDirectives(vue.createVNode(_component_Table, vue.mergeProps({ ref: "tableElRef" }, _ctx.getBindValues, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "3h1-ui",
-  "version": "2.9.4",
+  "version": "2.9.6",
   "description": "",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -31,8 +31,8 @@
     "vue-types": "^5.0.2",
     "vxe-table": "^4.3.6",
     "xe-utils": "^3.5.7",
-    "@shy-plugins/utils": "1.0.15",
-    "@shy-plugins/use": "1.0.4"
+    "@shy-plugins/use": "1.0.4",
+    "@shy-plugins/utils": "1.0.15"
   },
   "types": "es/ui/index.d.ts",
   "devDependencies": {