liyu-pc-base 1.0.158 → 1.0.163

package/dist/{FormRender3-d001b6c6.js → FormRender3-38d66078.js}

@@ -9889,20 +9889,24 @@ const Cre = /* @__PURE__ */ dt(vre, [["render", wre]]), Sre = Me({
       current: 1,
       pageSize: 200,
       is_pagination: !0,
+      request_source: "strict",
       is_active: !0,
       ...e.init_model,
       // 普通查询条件
       column_fields: [],
+      sort_fields: [],
       conditions: [],
       simpleSearchParams: {}
     };
     e.field.queryType === "simple" ? u.simpleSearchParams = l() : u.conditions = a();
     const s = () => e.valueKey || "id", c = () => e.labelKey || "name", d = () => {
-      var D;
+      var A;
       const O = [];
-      e != null && e.labelKeyList && ((D = e == null ? void 0 : e.labelKeyList) == null ? void 0 : D.length) > 0 && e.labelKeyType !== 1 ? O.push(s(), ...e.labelKeyList) : O.push(s(), c()), u.column_fields = [].concat(O);
+      e != null && e.labelKeyList && ((A = e == null ? void 0 : e.labelKeyList) == null ? void 0 : A.length) > 0 && e.labelKeyType !== 1 ? O.push(s(), ...e.labelKeyList) : O.push(s(), c());
+      const D = [...new Set(O)];
+      u.column_fields = [].concat(D);
     };
-    d();
+    d(), u.sort_fields = [c()];
     const f = (O) => {
       if (Array.isArray(n.selectedRows)) {
         if (n.selectedRows.includes(O))
@@ -10022,10 +10026,11 @@ const Cre = /* @__PURE__ */ dt(vre, [["render", wre]]), Sre = Me({
       var O;
       if (e.field.postUrl) {
         let D = {};
-        if (e.field.queryType === "simple" ? D = {
+        if (e.field.queryType === "simple" ? (D = {
+          ...u,
           ...u.simpleSearchParams,
           required_condition: b()
-        } : (D = { ...u, required_condition: b() }, delete D.simpleSearchParams), w === null) {
+        }, delete D.conditions) : (D = { ...u, required_condition: b() }, delete D.simpleSearchParams), w === null) {
           const A = await Yc(D, e.field.postUrl, !1, { skip_error: !0 });
           w = A.total, n.datasource = (A == null ? void 0 : A.data) || [], h();
         } else if (w > n.datasource.length) {
@@ -10063,7 +10068,7 @@ const Cre = /* @__PURE__ */ dt(vre, [["render", wre]]), Sre = Me({
         e.field.postUrl
       ],
       (O, D) => {
-        ak(O, D) || (w = null, d(), C());
+        ak(O, D) || (w = null, d(), u.sort_fields = [c()], C());
       },
       { deep: !0 }
     ), Se(
@@ -10088,7 +10093,7 @@ const Cre = /* @__PURE__ */ dt(vre, [["render", wre]]), Sre = Me({
           u.conditions[T] = [
             {
               field_name: A,
-              operator: "contains",
+              operator: "icontains",
               format: "input",
               value: [O],
               class_name: "str"
@@ -10098,7 +10103,7 @@ const Cre = /* @__PURE__ */ dt(vre, [["render", wre]]), Sre = Me({
           [
             {
               field_name: c(),
-              operator: "contains",
+              operator: "icontains",
               format: "input",
               value: [O],
               class_name: "str"