3h1-ui 2.11.0 → 2.11.2

package/es/index.js

@@ -8008,19 +8008,19 @@ const _sfc_main$U = /* @__PURE__ */ defineComponent({
     return (_ctx, _cache) => {
       return openBlock(), createBlock(unref(Button$1), mergeProps(unref(getBindValue), {
         class: unref(getButtonClass),
-        onClick: _ctx.onClick
+        onClick: props2.onClick
       }), {
         default: withCtx((data) => [
-          _ctx.preIcon ? (openBlock(), createBlock(unref(Icon2), {
+          props2.preIcon ? (openBlock(), createBlock(unref(Icon2), {
             key: 0,
-            icon: _ctx.preIcon,
-            size: _ctx.iconSize
+            icon: props2.preIcon,
+            size: props2.iconSize
           }, null, 8, ["icon", "size"])) : createCommentVNode("", true),
           renderSlot(_ctx.$slots, "default", normalizeProps(guardReactiveProps(data || {}))),
-          _ctx.postIcon ? (openBlock(), createBlock(unref(Icon2), {
+          props2.postIcon ? (openBlock(), createBlock(unref(Icon2), {
             key: 1,
-            icon: _ctx.postIcon,
-            size: _ctx.iconSize
+            icon: props2.postIcon,
+            size: props2.iconSize
           }, null, 8, ["icon", "size"])) : createCommentVNode("", true)
         ]),
         _: 3
@@ -8067,12 +8067,12 @@ const _sfc_main$T = defineComponent({
   }
 });
 const Button = withInstall$2(_sfc_main$U);
-const key$4 = Symbol();
+const key$3 = Symbol();
 function createFormContext(context) {
-  return createContext$1(context, key$4);
+  return createContext$1(context, key$3);
 }
 function useFormContext() {
-  return useContext$2(key$4);
+  return useContext$2(key$3);
 }
 const _sfc_main$S = defineComponent({
   name: "BasicFormAction",
@@ -9135,12 +9135,12 @@ function createContext(context, key2 = Symbol(), options = {}) {
 function useContext$1(key2 = Symbol(), defaultValue) {
   return inject(key2, defaultValue || {});
 }
-const key$3 = Symbol();
+const key$2 = Symbol();
 function createModalContext(context) {
-  return createContext(context, key$3);
+  return createContext(context, key$2);
 }
 function useModalContext() {
-  return useContext$1(key$3);
+  return useContext$1(key$2);
 }
 const props$6 = {
   loading: { type: Boolean },
@@ -9435,9 +9435,9 @@ function getPopupContainer(node) {
 function useContext(key2 = Symbol(), defaultValue) {
   return inject(key2, defaultValue || {});
 }
-const key$2 = Symbol();
+const key$1 = Symbol();
 function useAppProviderContext() {
-  return useContext(key$2);
+  return useContext(key$1);
 }
 function useDesign(scope) {
   const values = useAppProviderContext();
@@ -12184,12 +12184,12 @@ const CellComponent$1 = ({
     }
   );
 };
-const key$1 = Symbol("basic-table");
-function createTableContext$1(instance) {
-  provide(key$1, instance);
+const key = Symbol("basic-table");
+function createTableContext(instance) {
+  provide(key, instance);
 }
-function useTableContext$1() {
-  return inject(key$1);
+function useTableContext() {
+  return inject(key);
 }
 const nodeList = /* @__PURE__ */ new Map();
 let startClick;
@@ -12280,7 +12280,7 @@ const _sfc_main$A = /* @__PURE__ */ defineComponent({
     index: propTypes.number
   },
   setup(props2) {
-    const table2 = useTableContext$1();
+    const table2 = useTableContext();
     const isEdit = ref(false);
     const elRef = ref();
     const ruleVisible = ref(false);
@@ -12896,7 +12896,7 @@ function useColumns$1(propsRef, getPaginationRef) {
         if (column.flag === "INDEX" || column.flag === "ACTION") {
           column.sorter = false;
         } else {
-          column.sorter = true;
+          column.sorter = (column == null ? void 0 : column.sorter) === void 0 ? true : column.sorter;
         }
       }
       return reactive(column);
@@ -13248,7 +13248,7 @@ function useDataSource(propsRef, {
         params = await beforeFetch(params) || params;
       }
       const newval = Object.keys(params).reduce((prev, cur) => {
-        if (params[cur])
+        if (params[cur] !== void 0 && params[cur] !== null)
           prev[cur] = params[cur];
         return prev;
       }, {});
@@ -13767,7 +13767,7 @@ const _sfc_main$z = defineComponent({
   setup(_, { emit, attrs }) {
     const { t: t2 } = useI18n$1();
     t2("component.table.settingColumn");
-    const table2 = useTableContext$1();
+    const table2 = useTableContext();
     const defaultRowSelection = omit$1(table2.getRowSelection(), "selectedRowKeys");
     let inited = false;
     const cachePlainOptions = ref([]);
@@ -14146,7 +14146,7 @@ const _sfc_main$y = defineComponent({
     MenuItem: Menu.Item
   },
   setup() {
-    const table2 = useTableContext$1();
+    const table2 = useTableContext();
     const { t: t2 } = useI18n$1();
     const selectedKeysRef = ref([table2.getSize()]);
     function handleTitleClick({ key: key2 }) {
@@ -14227,7 +14227,7 @@ const _sfc_main$x = defineComponent({
     Tooltip
   },
   setup() {
-    const table2 = useTableContext$1();
+    const table2 = useTableContext();
     const { t: t2 } = useI18n$1();
     const { toggle, isFullscreen } = useFullscreen(table2.wrapRef);
     return {
@@ -14265,7 +14265,7 @@ const _sfc_main$w = defineComponent({
     Tooltip
   },
   setup() {
-    const table2 = useTableContext$1();
+    const table2 = useTableContext();
     const { t: t2 } = useI18n$1();
     function redo() {
       const useSearchForm = unref(table2.getBindValues).useSearchForm;
@@ -14296,7 +14296,7 @@ const _sfc_main$v = defineComponent({
     FilterOutlined: FilterOutlined$1
   },
   setup() {
-    const { isVisibleAdvancedSearch, closeGlobalSearch } = useTableContext$1();
+    const { isVisibleAdvancedSearch, closeGlobalSearch } = useTableContext();
     const handleIconClick = () => {
       nextTick(() => {
         isVisibleAdvancedSearch.value = !isVisibleAdvancedSearch.value;
@@ -14719,7 +14719,7 @@ const _sfc_main$u = /* @__PURE__ */ defineComponent({
 const _sfc_main$t = /* @__PURE__ */ defineComponent({
   __name: "GlobalSearch",
   setup(__props) {
-    const table2 = useTableContext$1();
+    const table2 = useTableContext();
     const handleClick = () => {
       table2.isVisibleGlobalSearch.value = !table2.isVisibleGlobalSearch.value;
       table2.closeAdvancedSearch();
@@ -14737,6 +14737,8 @@ const _sfc_main$t = /* @__PURE__ */ defineComponent({
         const schemas = table2.getGlobalSchemas().map((item) => {
           return item.field;
         });
+        if (!globalSearchValue.value)
+          return table2.reload({ searchInfo: {} });
         if (type === 1) {
           const params = getGlobalAdvancedType(schemas, globalSearchValue.value);
           table2.reload({ searchInfo: { ...params } });
@@ -14800,7 +14802,7 @@ const _sfc_main$s = defineComponent({
   },
   emits: ["columns-change"],
   setup(props2, { emit }) {
-    const table2 = useTableContext$1();
+    const table2 = useTableContext();
     const getSetting = computed(() => {
       return {
         redo: true,
@@ -14816,7 +14818,7 @@ const _sfc_main$s = defineComponent({
     function getTableContainer() {
       return table2 ? unref(table2.wrapRef) : document.body;
     }
-    const { getBindValues } = useTableContext$1();
+    const { getBindValues } = useTableContext();
     return { getSetting, handleColumnChange, getTableContainer, getBindValues };
   }
 });
@@ -15019,7 +15021,7 @@ const _sfc_main$q = defineComponent({
     rowKey: propTypes.string.def("key")
   },
   setup(props2) {
-    const table2 = useTableContext$1();
+    const table2 = useTableContext();
     const getDataSource = computed(() => {
       const { summaryFunc, summaryData } = props2;
       if (summaryData == null ? void 0 : summaryData.length) {
@@ -15204,10 +15206,18 @@ const useAdvancedSearch = ({ getProps, reload }) => {
         field: column.dataIndex,
         type: (column == null ? void 0 : column.advancedType) || "string",
         component: (column == null ? void 0 : column.component) || "Input",
-        componentProps: (column == null ? void 0 : column.componentProps) || {}
+        componentProps: (column == null ? void 0 : column.componentProps) || {},
+        sortShow: (column == null ? void 0 : column.sortShow) === void 0 ? true : column.sortShow,
+        globalShow: (column == null ? void 0 : column.globalShow) === void 0 ? true : column.globalShow,
+        advancedShow: (column == null ? void 0 : column.advancedShow) === void 0 ? true : column.advancedShow
       };
     });
   });
+  const schemasAdvancedSearchGlobal = computed(() => {
+    return schemasAdvancedSearch.value.filter((item) => {
+      return item.globalShow;
+    });
+  });
   const schemasAdvancedSearchString = computed(() => {
     return schemasAdvancedSearch.value.filter((item) => {
       return item.type === "string";
@@ -15276,7 +15286,8 @@ const useAdvancedSearch = ({ getProps, reload }) => {
     getGlobalSearchValue,
     setCurSearchParams,
     getCurSearchParams,
-    schemasAdvancedSearchString
+    schemasAdvancedSearchString,
+    schemasAdvancedSearchGlobal
   };
 };
 const basicProps$3 = reactive({
@@ -15431,7 +15442,7 @@ const _sfc_main$p = defineComponent({
   emits: ["ensure"],
   setup(props2, { emit }) {
     const advancedSearchRef = ref();
-    const table2 = useTableContext$1();
+    const table2 = useTableContext();
     const setStyle2 = () => {
       const dom = document.querySelector(".table-settings");
       if (dom) {
@@ -15529,7 +15540,7 @@ const _sfc_main$o = defineComponent({
   components: { CheckboxGroup, Checkbox, CheckOutlined: CheckOutlined$1 },
   emits: ["ensure"],
   setup(props2, { emit }) {
-    const table2 = useTableContext$1();
+    const table2 = useTableContext();
     const advancedSearchRef = ref();
     const fieldList = ref([]);
     const curSelected = ref(1);
@@ -15615,8 +15626,8 @@ const _sfc_main$o = defineComponent({
     };
   }
 });
-const TableGlobalSearch_vue_vue_type_style_index_0_scoped_46f4dcdc_lang = "";
-const _withScopeId = (n) => (pushScopeId("data-v-46f4dcdc"), n = n(), popScopeId(), n);
+const TableGlobalSearch_vue_vue_type_style_index_0_scoped_25de0cfe_lang = "";
+const _withScopeId = (n) => (pushScopeId("data-v-25de0cfe"), n = n(), popScopeId(), n);
 const _hoisted_1$d = /* @__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));
@@ -15674,7 +15685,7 @@ function _sfc_render$h(_ctx, _cache, $props, $setup, $data, $options) {
     ])
   ], 4);
 }
-const TableGlobalSearch = /* @__PURE__ */ _export_sfc(_sfc_main$o, [["render", _sfc_render$h], ["__scopeId", "data-v-46f4dcdc"]]);
+const TableGlobalSearch = /* @__PURE__ */ _export_sfc(_sfc_main$o, [["render", _sfc_render$h], ["__scopeId", "data-v-25de0cfe"]]);
 const _sfc_main$n = defineComponent({
   components: {
     TableAdvancedSearch,
@@ -15866,6 +15877,7 @@ const _sfc_main$n = defineComponent({
     const {
       schemasAdvancedSearch,
       schemasAdvancedSearchString,
+      schemasAdvancedSearchGlobal,
       isVisibleAdvancedSearch,
       openAdvancedSearch,
       closeAdvancedSearch,
@@ -15925,7 +15937,7 @@ const _sfc_main$n = defineComponent({
         return unref(getBindValues).size;
       }
     };
-    createTableContext$1({
+    createTableContext({
       ...tableAction,
       wrapRef,
       getBindValues,
@@ -15976,7 +15988,8 @@ const _sfc_main$n = defineComponent({
       isVisibleAdvancedSearch,
       handleAdvancedEnsure,
       isVisibleGlobalSearch,
-      schemasAdvancedSearchString
+      schemasAdvancedSearchString,
+      schemasAdvancedSearchGlobal
     };
   }
 });
@@ -16024,7 +16037,7 @@ function _sfc_render$g(_ctx, _cache, $props, $setup, $data, $options) {
         }, null, 8, ["schemasAdvancedSearch", "onEnsure"]), [
           [vShow, _ctx.isVisibleAdvancedSearch]
         ]),
-        withDirectives(createVNode(_component_TableGlobalSearch, { schemasAdvancedSearch: _ctx.schemasAdvancedSearchString }, null, 8, ["schemasAdvancedSearch"]), [
+        withDirectives(createVNode(_component_TableGlobalSearch, { schemasAdvancedSearch: _ctx.schemasAdvancedSearchGlobal }, null, 8, ["schemasAdvancedSearch"]), [
           [vShow, _ctx.isVisibleGlobalSearch]
         ]),
         withDirectives(createVNode(_component_Table, mergeProps({ ref: "tableElRef" }, _ctx.getBindValues, {
@@ -16184,11 +16197,11 @@ const _sfc_main$m = /* @__PURE__ */ defineComponent({
 const _sfc_main$l = defineComponent({
   name: "TableAction",
   components: {
+    MoreOutlined: MoreOutlined$1,
     Icon: Icon2,
     PopConfirmButton: _sfc_main$T,
     Divider: Divider$1,
     Dropdown: _sfc_main$m,
-    MoreOutlined: MoreOutlined$1,
     Tooltip
   },
   props: {
@@ -16205,14 +16218,14 @@ const _sfc_main$l = defineComponent({
     stopButtonPropagation: propTypes.bool.def(false),
     showCount: {
       type: Number,
-      default: () => 2
+      default: () => 3
     }
   },
   setup(props2) {
     const { prefixCls: prefixCls2 } = useDesign$1("basic-table-action");
     let table2 = {};
     if (!props2.outside) {
-      table2 = useTableContext$1();
+      table2 = useTableContext();
     }
     function isIfShow(action) {
       const ifShow = action.ifShow;
@@ -16227,7 +16240,12 @@ const _sfc_main$l = defineComponent({
     }
     const getActions = computed(() => {
       return (toRaw(props2.actions) || []).filter((action, index2) => {
-        return isIfShow(action) && index2 < props2.showCount;
+        var _a2;
+        if (((_a2 = props2.actions) == null ? void 0 : _a2.length) === props2.showCount) {
+          return isIfShow(action);
+        } else {
+          return isIfShow(action) && index2 <= props2.showCount - 2;
+        }
       }).map((action) => {
         const { popConfirm } = action;
         return {
@@ -16244,7 +16262,11 @@ const _sfc_main$l = defineComponent({
     });
     const getDropdownList = computed(() => {
       const list = (toRaw(props2.actions) || []).filter((action, index2) => {
-        return isIfShow(action) && index2 >= props2.showCount;
+        if (props2.actions.length === props2.showCount) {
+          return false;
+        } else {
+          return isIfShow(action) && index2 >= props2.showCount - 1;
+        }
       });
       return list.map((action, index2) => {
         const { label, popConfirm } = action;
@@ -16493,6 +16515,11 @@ function _sfc_render$d(_ctx, _cache, $props, $setup, $data, $options) {
 }
 const TableDict = /* @__PURE__ */ _export_sfc(_sfc_main$j, [["render", _sfc_render$d], ["__scopeId", "data-v-b15bfa99"]]);
 const index$1 = "";
+var RoleEnum = /* @__PURE__ */ ((RoleEnum2) => {
+  RoleEnum2["SUPER"] = "super";
+  RoleEnum2["TEST"] = "test";
+  return RoleEnum2;
+})(RoleEnum || {});
 function useTable(tableProps) {
   const tableRef = ref(null);
   const loadedRef = ref(false);
@@ -21246,13 +21273,6 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const key = Symbol("basic-table");
-function createTableContext(instance) {
-  provide(key, instance);
-}
-function useTableContext() {
-  return inject(key);
-}
 const _sfc_main$5 = defineComponent({
   name: "ColumnSetting",
   components: {
@@ -21267,7 +21287,7 @@ const _sfc_main$5 = defineComponent({
     Icon: Icon2
   },
   emits: ["columns-change"],
-  setup(_, { emit, attrs }) {
+  setup() {
     const table2 = useTableContext();
     const defaultRowSelection = [];
     const cachePlainOptions = ref([]);
@@ -21926,7 +21946,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const getFormConfig = computed(() => {
       return {
         ...getProps.value.formConfig,
-        showAdvancedButton: true
+        showAdvancedButton: true,
+        rowProps: { gutter: 20 }
       };
     });
     const [registerForm, formActions] = useForm();
@@ -22278,6 +22299,7 @@ export {
   PageWrapperFixedHeightKey,
   _sfc_main$T as PopConfirmButton,
   RadioButtonGroup,
+  RoleEnum,
   ScrollContainer$1 as ScrollContainer,
   Scrollbar,
   StrengthMeter,

package/es/style.css

@@ -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;
 }
@@ -25482,7 +25482,7 @@ span.iconify {
 }
 .shy-basic-table-header__toolbar > * {
   margin-right: 8px;
-}.shy-basic-table-global-search[data-v-46f4dcdc] {
+}.shy-basic-table-global-search[data-v-25de0cfe] {
   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-46f4dcdc] {
+.shy-basic-table-global-search-item-global[data-v-25de0cfe] {
   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-46f4dcdc] {
+.shy-basic-table-global-search-item-special[data-v-25de0cfe] {
   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-46f4dcdc] {
+.shy-basic-table-global-search-checkbox-wrapper[data-v-25de0cfe] {
   padding: 0 8px;
 }
-.shy-basic-table-global-search .selected-bg[data-v-46f4dcdc] {
+.shy-basic-table-global-search .selected-bg[data-v-25de0cfe] {
   background-color: #ebf1ff;
 }.shy-basic-table-action {
   display: flex;