npm - 3h1-ui - Versions diffs - 2.12.0-beta.2 → 2.12.0-beta.4 - Mend

3h1-ui 2.12.0-beta.2 → 2.12.0-beta.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (2388) hide show

package/es/index.js CHANGED Viewed

@@ -4000,10 +4000,10 @@ const _sfc_main$1f = defineComponent({
       emitData.value = args;
     }
     const filterOption = (input, option) => {
-      var _a2, _b;
+      var _a2, _b, _c;
       const label = ((_b = (_a2 = attrs.value) == null ? void 0 : _a2.fieldNames) == null ? void 0 : _b.label) || "label";
-      console.log("label", label);
-      return option[label].toLowerCase().indexOf(input.toLowerCase()) >= 0;
+      if (typeof option[label] === "string")
+        return ((_c = option[label]) == null ? void 0 : _c.toLowerCase().indexOf(input.toLowerCase())) >= 0;
     };
     return {
       state,
@@ -14501,15 +14501,16 @@ const searchType = [
   }
 ];
 const searchTypeNumber = searchType.filter((item) => {
-  return ["eq", "gt", "ge", "lt", "le", "bt"].includes(item.value);
+  return ["eq", "gt", "ge", "lt", "le", "bt", "nl"].includes(item.value);
 });
 const searchTypeString = searchType.filter((item) => {
-  return ["eq", "ct", "sw", "ew"].includes(item.value);
+  return ["eq", "ct", "sw", "ew", "nl"].includes(item.value);
 });
 const searchTypeDate = searchType.filter((item) => {
-  return ["eq", "gt", "ge", "lt", "le", "bt"].includes(item.value);
+  return ["eq", "gt", "ge", "lt", "le", "bt", "nl"].includes(item.value);
 });
 const searchTypeSelect = [{ label: "等于", value: "eq" }];
+const stringSearchTypeSelect = [{ label: "包含", value: "ct" }];
 const getGlobalAdvancedType = (fieldList, value) => {
   const temp = {};
   fieldList.forEach((field) => {
@@ -14532,7 +14533,7 @@ const _hoisted_5$1 = {
 };
 const _hoisted_6 = /* @__PURE__ */ createElementVNode("div", { style: { "flex": "0", "width": "40px", "margin-right": "8px" } }, " 至 ", -1);
 const _hoisted_7 = {
-  key: 0,
+  key: 1,
   style: { "margin-left": "8px", "cursor": "pointer", "position": "relative" },
   class: "shy-ui-advanced-minus-icon"
 };
@@ -14540,48 +14541,57 @@ const _hoisted_8 = ["onClick"];
 const _sfc_main$v = /* @__PURE__ */ defineComponent({
   __name: "AdvancedSearch",
   props: {
-    schemas: {
-      default: () => [
-        {
-          label: "姓名",
-          field: "name"
-        },
-        {
-          label: "年龄",
-          field: "age",
-          type: "number"
-        },
-        { label: "生日", field: "birth", type: "date" }
-      ]
-    }
+    schemas: { default: () => [
+      {
+        label: "姓名",
+        field: "name",
+        advancedShow: false
+      },
+      {
+        label: "年龄",
+        field: "age",
+        type: "number"
+      },
+      { label: "生日", field: "birth", type: "date" }
+    ] }
   },
   setup(__props, { expose }) {
     const props2 = __props;
-    reactive({});
     const advancedSearchRef = ref();
     const formRef = ref();
     const schemasCurrent = reactive([]);
-    if (props2.schemas.length !== 0)
-      schemasCurrent.push({ field: props2.schemas[0].field, op: "eq" });
     const dicColumn = computed(() => {
       const temp = [];
       props2.schemas.forEach((schama) => {
+        if (!schama.advancedShow)
+          return;
         const flag = schemasCurrent.find((item) => {
           return item.field === schama.field;
         });
         temp.push({
           label: schama.label,
           value: schama.field,
-          disabled: !!flag
+          disabled: !!flag,
+          type: schama.type,
+          component: schama.component
         });
       });
       return temp;
     });
+    if (props2.schemas.length !== 0) {
+      const firstSchema = dicColumn.value[0];
+      const op = firstSchema.type === "string" && /select/i.test(firstSchema.component) ? "ct" : "eq";
+      schemasCurrent.push({ field: firstSchema.value, op });
+    }
     const handleAdd = () => {
       const item = dicColumn.value.find((item2) => {
         return item2.disabled === false;
       });
-      schemasCurrent.push({ field: (item == null ? void 0 : item.value) || "", op: "eq" });
+      const column = props2.schemas.find((schema) => {
+        return schema.field === item.value;
+      });
+      const op = column.type === "string" && /select/i.test(column.component) ? "ct" : "eq";
+      schemasCurrent.push({ field: (item == null ? void 0 : item.value) || "", op });
     };
     const handleMinus = (index2) => {
       schemasCurrent.splice(index2, 1);
@@ -14594,6 +14604,11 @@ const _sfc_main$v = /* @__PURE__ */ defineComponent({
       });
       schema.op = "eq";
     };
+    const handlSetValNull = (schema) => {
+      if (schema.op === "nl") {
+        schema[schema.field] = "";
+      }
+    };
     const getSearchType = (field) => {
       const type = getTypeByField(field);
       switch (type) {
@@ -14605,6 +14620,8 @@ const _sfc_main$v = /* @__PURE__ */ defineComponent({
           return searchTypeDate;
         case "select":
           return searchTypeSelect;
+        case "stringSelect":
+          return stringSearchTypeSelect;
       }
     };
     const getComponent = (field) => {
@@ -14617,8 +14634,9 @@ const _sfc_main$v = /* @__PURE__ */ defineComponent({
       const column = props2.schemas.find((schema) => {
         return schema.field === field;
       });
+      const stringSelect = column.type === "string" && /select/i.test(column.component);
       const type = (column == null ? void 0 : column.type) || "string";
-      return type;
+      return stringSelect ? "stringSelect" : type;
     };
     const getComponentPropsByField = (field) => {
       const column = props2.schemas.find((schema) => {
@@ -14627,7 +14645,7 @@ const _sfc_main$v = /* @__PURE__ */ defineComponent({
       return (column == null ? void 0 : column.componentProps) || {};
     };
     const getSearchFrom = () => {
-      let form2 = {};
+      let form = {};
       schemasCurrent.forEach((item) => {
         let temp = {};
         if (item.op === "bt") {
@@ -14642,13 +14660,13 @@ const _sfc_main$v = /* @__PURE__ */ defineComponent({
             [`${item.field}-op`]: item.op
           };
         }
-        form2 = { ...form2, ...temp };
+        form = { ...form, ...temp };
       });
-      return form2;
+      return form;
     };
     const resetFields = () => {
       schemasCurrent.splice(0, schemasCurrent.length);
-      schemasCurrent.push({ field: props2.schemas[0].field });
+      schemasCurrent.push({ field: dicColumn.value[0].field });
       formRef.value.resetFields();
     };
     expose({
@@ -14708,13 +14726,17 @@ const _sfc_main$v = /* @__PURE__ */ defineComponent({
                                 "onUpdate:value": ($event) => schema.op = $event,
                                 style: { "width": "120px" },
                                 options: getSearchType(schema == null ? void 0 : schema.field),
-                                defaultValue: ((_a2 = getSearchType(schema == null ? void 0 : schema.field)[0]) == null ? void 0 : _a2.value) || ""
-                              }, null, 8, ["value", "onUpdate:value", "options", "defaultValue"])
+                                defaultValue: ((_a2 = getSearchType(schema == null ? void 0 : schema.field)[0]) == null ? void 0 : _a2.value) || "",
+                                onChange: ($event) => handlSetValNull(schema)
+                              }, null, 8, ["value", "onUpdate:value", "options", "defaultValue", "onChange"])
                             ];
                           }),
                           _: 2
                         }, 1032, ["name"]),
-                        createVNode(unref(FormItem), { class: "shy-ui-advanced-search-item-value" }, {
+                        schema.op !== "nl" ? (openBlock(), createBlock(unref(FormItem), {
+                          key: 0,
+                          class: "shy-ui-advanced-search-item-value"
+                        }, {
                           default: withCtx(() => [
                             getTypeByField(schema == null ? void 0 : schema.field) === "number" ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
                               schema.op === "bt" ? (openBlock(), createElementBlock("div", _hoisted_3$3, [
@@ -14779,11 +14801,17 @@ const _sfc_main$v = /* @__PURE__ */ defineComponent({
                               }, null, 8, ["value", "onUpdate:value"]))
                             ], 64)) : getTypeByField(schema == null ? void 0 : schema.field) === "select" ? (openBlock(), createBlock(unref(FormItem), { key: 2 }, {
                               default: withCtx(() => [
-                                createVNode(unref(Select), mergeProps({
+                                getComponent(schema.field) === "ApiSelect" ? (openBlock(), createBlock(ApiSelect, mergeProps({
+                                  key: 0,
+                                  value: schema[`${schema.field}`],
+                                  "onUpdate:value": ($event) => schema[`${schema.field}`] = $event,
+                                  valueModifiers: { number: true }
+                                }, getComponentPropsByField(schema.field)), null, 16, ["value", "onUpdate:value"])) : (openBlock(), createBlock(unref(Select), mergeProps({
+                                  key: 1,
                                   value: schema[`${schema.field}`],
                                   "onUpdate:value": ($event) => schema[`${schema.field}`] = $event,
                                   valueModifiers: { number: true }
-                                }, getComponentPropsByField(schema.field)), null, 16, ["value", "onUpdate:value"])
+                                }, getComponentPropsByField(schema.field)), null, 16, ["value", "onUpdate:value"]))
                               ]),
                               _: 2
                             }, 1024)) : (openBlock(), createElementBlock(Fragment, { key: 3 }, [
@@ -14791,15 +14819,20 @@ const _sfc_main$v = /* @__PURE__ */ defineComponent({
                                 key: 0,
                                 value: schema[schema.field],
                                 "onUpdate:value": ($event) => schema[schema.field] = $event
-                              }, getComponentPropsByField(schema.field)), null, 16, ["value", "onUpdate:value"])) : (openBlock(), createBlock(unref(Select), mergeProps({
+                              }, getComponentPropsByField(schema.field)), null, 16, ["value", "onUpdate:value"])) : getComponent(schema.field) === "ApiSelect" ? (openBlock(), createBlock(ApiSelect, mergeProps({
                                 key: 1,
+                                value: schema[`${schema.field}`],
+                                "onUpdate:value": ($event) => schema[`${schema.field}`] = $event,
+                                valueModifiers: { number: true }
+                              }, getComponentPropsByField(schema.field)), null, 16, ["value", "onUpdate:value"])) : (openBlock(), createBlock(unref(Select), mergeProps({
+                                key: 2,
                                 value: schema[schema.field],
                                 "onUpdate:value": ($event) => schema[schema.field] = $event
                               }, getComponentPropsByField(schema.field)), null, 16, ["value", "onUpdate:value"]))
                             ], 64))
                           ]),
                           _: 2
-                        }, 1024),
+                        }, 1024)) : createCommentVNode("", true),
                         schemasCurrent.length !== 1 ? (openBlock(), createElementBlock("div", _hoisted_7, [
                           createElementVNode("div", {
                             style: { "position": "absolute", "width": "14px", "height": "14px", "left": "0", "right": "0", "top": "0", "bottom": "0" },
@@ -15547,7 +15580,7 @@ const _sfc_main$q = defineComponent({
     AdvancedSearch: _sfc_main$v
   },
   emits: ["ensure"],
-  setup(props2, { emit }) {
+  setup(_, { emit }) {
     const advancedSearchRef = ref();
     const table2 = useTableContext();
     const setStyle2 = () => {
@@ -15733,8 +15766,8 @@ const _sfc_main$p = defineComponent({
     };
   }
 });
-const TableGlobalSearch_vue_vue_type_style_index_0_scoped_25de0cfe_lang = "";
-const _withScopeId = (n) => (pushScopeId("data-v-25de0cfe"), n = n(), popScopeId(), n);
+const TableGlobalSearch_vue_vue_type_style_index_0_scoped_bf2b3580_lang = "";
+const _withScopeId = (n) => (pushScopeId("data-v-bf2b3580"), n = n(), popScopeId(), n);
 const _hoisted_1$e = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createElementVNode("div", null, "搜索全部", -1));
 const _hoisted_2$4 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createElementVNode("div", null, "搜索特定字段", -1));
 const _hoisted_3$1 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createElementVNode("div", null, null, -1));
@@ -15792,7 +15825,7 @@ function _sfc_render$h(_ctx, _cache, $props, $setup, $data, $options) {
     ])
   ], 4);
 }
-const TableGlobalSearch = /* @__PURE__ */ _export_sfc(_sfc_main$p, [["render", _sfc_render$h], ["__scopeId", "data-v-25de0cfe"]]);
+const TableGlobalSearch = /* @__PURE__ */ _export_sfc(_sfc_main$p, [["render", _sfc_render$h], ["__scopeId", "data-v-bf2b3580"]]);
 const _sfc_main$o = defineComponent({
   components: {
     TableAdvancedSearch,
@@ -16304,12 +16337,12 @@ const _sfc_main$n = /* @__PURE__ */ defineComponent({
 const _sfc_main$m = defineComponent({
   name: "TableAction",
   components: {
-    MoreOutlined: MoreOutlined$1,
     Icon: Icon2,
     PopConfirmButton: _sfc_main$U,
     Divider: Divider$1,
     Dropdown: _sfc_main$n,
-    Tooltip
+    Tooltip,
+    MoreOutlined: MoreOutlined$1
   },
   props: {
     actions: {
@@ -16418,7 +16451,8 @@ const _sfc_main$m = defineComponent({
       getDropdownList,
       getAlign,
       onCellClick,
-      getTooltip
+      getTooltip,
+      MoreOutlined: MoreOutlined$1
     };
   }
 });
@@ -22529,6 +22563,7 @@ export {
   searchTypeNumber,
   searchTypeSelect,
   searchTypeString,
+  stringSearchTypeSelect,
   treeEmits,
   treeProps,
   useColumns,

package/es/style.css CHANGED Viewed

@@ -15895,7 +15895,7 @@ textarea.ant-picker-input>input {
 .ant-form-item-has-warning .ant-input-number-prefix, .ant-form-item-has-warning .ant-input-prefix {
   color: #faad14;
 }
-.ant-form-item-has-warning .ant-input-group-addon, .ant-form-item-has-warning .ant-input-number-group-addon {
+.ant-form-item-has-warning :not(.ant-input-group-addon-disabled).ant-input-group-addon, .ant-form-item-has-warning :not(.ant-input-number-group-addon-disabled).ant-input-number-group-addon {
   border-color: #faad14;
   color: #faad14;
 }
@@ -15952,7 +15952,7 @@ textarea.ant-picker-input>input {
 .ant-form-item-has-error .ant-input-number-prefix, .ant-form-item-has-error .ant-input-prefix {
   color: #ff4d4f;
 }
-.ant-form-item-has-error .ant-input-group-addon, .ant-form-item-has-error .ant-input-number-group-addon {
+.ant-form-item-has-error :not(.ant-input-group-addon-disabled).ant-input-group-addon, .ant-form-item-has-error :not(.ant-input-number-group-addon-disabled).ant-input-number-group-addon {
   border-color: #ff4d4f;
   color: #ff4d4f;
 }
@@ -25486,7 +25486,7 @@ span.iconify {
 }
 .shy-basic-table-header__toolbar > * {
   margin-right: 8px;
-}.shy-basic-table-global-search[data-v-25de0cfe] {
+}.shy-basic-table-global-search[data-v-bf2b3580] {
   position: absolute;
   top: 40px;
   right: 131px;
@@ -25498,7 +25498,7 @@ span.iconify {
   border: 1px solid #ebebeb;
   padding: 10px;
 }
-.shy-basic-table-global-search-item-global[data-v-25de0cfe] {
+.shy-basic-table-global-search-item-global[data-v-bf2b3580] {
   height: 32px;
   line-height: 32px;
   font-size: 14px;
@@ -25509,7 +25509,7 @@ span.iconify {
   align-items: center;
   justify-content: space-between;
 }
-.shy-basic-table-global-search-item-special[data-v-25de0cfe] {
+.shy-basic-table-global-search-item-special[data-v-bf2b3580] {
   height: 32px;
   line-height: 32px;
   font-size: 14px;
@@ -25520,10 +25520,10 @@ span.iconify {
   align-items: center;
   justify-content: space-between;
 }
-.shy-basic-table-global-search-checkbox-wrapper[data-v-25de0cfe] {
+.shy-basic-table-global-search-checkbox-wrapper[data-v-bf2b3580] {
   padding: 0 8px;
 }
-.shy-basic-table-global-search .selected-bg[data-v-25de0cfe] {
+.shy-basic-table-global-search .selected-bg[data-v-bf2b3580] {
   background-color: #ebf1ff;
 }.shy-basic-table-action {
   display: flex;