3h1-ui 2.14.28 → 2.14.29

package/es/index.js

@@ -4341,7 +4341,7 @@ const _sfc_main$1g = defineComponent({
       apiData.value = [];
       loading.value = true;
       try {
-        const res = await api(props2.initFetchParams);
+        const res = await api({ ...props2.initFetchParams, ...props2.params });
         if (Array.isArray(res)) {
           apiData.value = res;
           return;
@@ -7547,8 +7547,8 @@ const _sfc_main$$ = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const Table_vue_vue_type_style_index_0_scoped_d89f41c1_lang = "";
-const Table = /* @__PURE__ */ _export_sfc(_sfc_main$$, [["__scopeId", "data-v-d89f41c1"]]);
+const Table_vue_vue_type_style_index_0_scoped_24157632_lang = "";
+const Table = /* @__PURE__ */ _export_sfc(_sfc_main$$, [["__scopeId", "data-v-24157632"]]);
 const componentMap$2 = /* @__PURE__ */ new Map();
 componentMap$2.set("Input", Input);
 componentMap$2.set("InputGroup", Input.Group);
@@ -7929,14 +7929,12 @@ const _sfc_main$_ = /* @__PURE__ */ defineComponent({
       const on2 = {
         [eventKey]: (...args) => {
           const [e] = args;
+          if (propsData[eventKey] && args.length >= 1) {
+            propsData[eventKey](...args);
+          }
           const target = e ? e.target : null;
           const value = target ? isCheck ? target.checked : target.value : e;
-          if (props2.formModel[field] === value)
-            return;
           props2.setFormModel(field, value);
-          if (propsData[eventKey] && args.length >= 1) {
-            propsData[eventKey](value);
-          }
         }
       };
       const Comp = componentMap$2.get(component);
@@ -12304,37 +12302,12 @@ componentMap$1.set("RadioGroup", Radio.Group);
 componentMap$1.set("RadioButtonGroup", RadioButtonGroup);
 componentMap$1.set("ApiRadioGroup", ApiRadioGroup);
 componentMap$1.set("ApiCascader", ApiCascader);
-function findAncestorWithClassName(element, className) {
-  while ((element = element.parentElement) && !element.classList.contains(className))
-    ;
-  return element;
-}
 const CellComponent$1 = ({
-  component = "Input",
-  rule = true,
-  ruleMessage,
-  popoverVisible,
-  getPopupContainer: getPopupContainer2
+  component = "Input"
+  // rule = true,
 }, { attrs }) => {
   const Comp = componentMap$1.get(component);
-  const DefaultComp = h(Comp, attrs);
-  if (!rule) {
-    return DefaultComp;
-  }
-  return h(
-    Popover,
-    {
-      overlayClassName: "edit-cell-rule-popover",
-      visible: !!popoverVisible,
-      getPopupContainer: (e) => {
-        return attrs.currIndex ? findAncestorWithClassName(e, "ant-table-cell") || e.parentNode : document.body;
-      }
-    },
-    {
-      default: () => DefaultComp,
-      content: () => ruleMessage
-    }
-  );
+  return h(Comp, attrs);
 };
 const key = Symbol("basic-table");
 function createTableContext(instance) {
@@ -12561,6 +12534,10 @@ const _sfc_main$F = /* @__PURE__ */ defineComponent({
       } = props2.column;
       return `edit-cell-align-${align}`;
     });
+    const getErrorClass = computed(() => {
+      const isRule = unref(getRuleVisible);
+      return isRule ? `${prefixCls2}__rule` : "";
+    });
     const getRowEditable = computed(() => {
       const {
         editable
@@ -12831,7 +12808,8 @@ const _sfc_main$F = /* @__PURE__ */ defineComponent({
       getValues,
       handleEnter,
       handleSubmitClick,
-      spinning
+      spinning,
+      getErrorClass
     };
   },
   render() {
@@ -12864,7 +12842,7 @@ const _sfc_main$F = /* @__PURE__ */ defineComponent({
         "popoverVisible": this.getRuleVisible,
         "rule": this.getRule,
         "ruleMessage": this.ruleMessage,
-        "class": this.getWrapperClass,
+        "class": [this.getWrapperClass, this.getErrorClass],
         "ref": "elRef",
         "onChange": this.handleChange,
         "onOptionsChange": this.handleOptionsChange,
@@ -14996,7 +14974,18 @@ const _sfc_main$x = defineComponent({
       return table2 ? unref(table2.wrapRef) : document.body;
     }
     const { getBindValues } = useTableContext();
-    return { getSetting, handleColumnChange, getTableContainer, getBindValues };
+    const ifShowGlobalSearch = computed(() => {
+      return getBindValues.value.useAdvancedSearch && getBindValues.value.columns.some((item) => {
+        return item.dataIndex !== "action" && [true, void 0].includes(item.globalShow);
+      });
+    });
+    return {
+      getSetting,
+      handleColumnChange,
+      getTableContainer,
+      getBindValues,
+      ifShowGlobalSearch
+    };
   }
 });
 const index_vue_vue_type_style_index_0_lang$1 = "";
@@ -15010,7 +14999,7 @@ function _sfc_render$m(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_ColumnSetting = resolveComponent("ColumnSetting");
   const _component_FullScreenSetting = resolveComponent("FullScreenSetting");
   return openBlock(), createElementBlock("div", _hoisted_1$j, [
-    _ctx.getBindValues.useAdvancedSearch ? (openBlock(), createBlock(_component_GlobalSearch, { key: 0 })) : createCommentVNode("", true),
+    _ctx.ifShowGlobalSearch ? (openBlock(), createBlock(_component_GlobalSearch, { key: 0 })) : createCommentVNode("", true),
     _ctx.getBindValues.useAdvancedSearch ? (openBlock(), createBlock(_component_AdvancedSearchSetting, {
       key: 1,
       getPopupContainer: _ctx.getTableContainer
@@ -23166,7 +23155,10 @@ export {
   TableImg,
   _sfc_main$3 as TablePlus,
   ToolbarEnum,
+  add,
+  componentMap$2 as componentMap,
   createLoading,
+  del,
   descriptionsForm,
   getGlobalAdvancedType,
   searchType,

package/es/style.css

@@ -24831,7 +24831,7 @@ span.iconify {
 }
 .shy-countdown-input .ant-input-group-addon button {
   font-size: 14px;
-}.table-plus[data-v-d89f41c1] {
+}.table-plus[data-v-24157632] {
   width: 30px;
   height: 30px;
   font-size: 24px;
@@ -24843,21 +24843,21 @@ span.iconify {
   cursor: pointer;
   text-align: center;
 }
-.table-children[data-v-d89f41c1] .ant-form-item {
+.table-children[data-v-24157632] .ant-form-item {
   margin-bottom: 0 !important;
 }
-.delete-wrapper[data-v-d89f41c1] {
+.delete-wrapper[data-v-24157632] {
   height: 100%;
 }
-.delete-wrapper:hover .delete-item[data-v-d89f41c1] {
+.delete-wrapper:hover .delete-item[data-v-24157632] {
   display: flex;
   justify-content: center;
   align-items: center;
 }
-.delete-wrapper:hover .delete-index[data-v-d89f41c1] {
+.delete-wrapper:hover .delete-index[data-v-24157632] {
   display: none;
 }
-.delete-wrapper .delete-item[data-v-d89f41c1] {
+.delete-wrapper .delete-item[data-v-24157632] {
   background-color: red;
   border-radius: 50%;
   width: 30px;
@@ -24866,7 +24866,7 @@ span.iconify {
   display: none;
   cursor: pointer;
 }
-.delete-wrapper .delete-index[data-v-d89f41c1] {
+.delete-wrapper .delete-index[data-v-24157632] {
   display: inline-block;
 }@media screen and (max-height: 600px) {
   .ant-modal {
@@ -25353,6 +25353,12 @@ span.iconify {
 .shy-editable-cell__icon:hover svg {
   color: #006eff;
 }
+.shy-editable-cell__rule {
+  border: 1px solid #ED6F6F !important;
+}
+.shy-editable-cell__rule::placeholder, .shy-editable-cell__rule ::placeholder {
+  color: #ED6F6F !important;
+}
 .shy-editable-cell .ellipsis-cell .cell-content {
   overflow: hidden;
   text-overflow: ellipsis;

package/lib/index.js

@@ -4343,7 +4343,7 @@ const _sfc_main$1g = vue.defineComponent({
       apiData.value = [];
       loading.value = true;
       try {
-        const res = await api(props2.initFetchParams);
+        const res = await api({ ...props2.initFetchParams, ...props2.params });
         if (Array.isArray(res)) {
           apiData.value = res;
           return;
@@ -7549,8 +7549,8 @@ const _sfc_main$$ = /* @__PURE__ */ vue.defineComponent({
     };
   }
 });
-const Table_vue_vue_type_style_index_0_scoped_d89f41c1_lang = "";
-const Table = /* @__PURE__ */ _export_sfc(_sfc_main$$, [["__scopeId", "data-v-d89f41c1"]]);
+const Table_vue_vue_type_style_index_0_scoped_24157632_lang = "";
+const Table = /* @__PURE__ */ _export_sfc(_sfc_main$$, [["__scopeId", "data-v-24157632"]]);
 const componentMap$2 = /* @__PURE__ */ new Map();
 componentMap$2.set("Input", antDesignVue.Input);
 componentMap$2.set("InputGroup", antDesignVue.Input.Group);
@@ -7931,14 +7931,12 @@ const _sfc_main$_ = /* @__PURE__ */ vue.defineComponent({
       const on = {
         [eventKey]: (...args) => {
           const [e] = args;
+          if (propsData[eventKey] && args.length >= 1) {
+            propsData[eventKey](...args);
+          }
           const target = e ? e.target : null;
           const value = target ? isCheck ? target.checked : target.value : e;
-          if (props2.formModel[field] === value)
-            return;
           props2.setFormModel(field, value);
-          if (propsData[eventKey] && args.length >= 1) {
-            propsData[eventKey](value);
-          }
         }
       };
       const Comp = componentMap$2.get(component);
@@ -12306,37 +12304,12 @@ componentMap$1.set("RadioGroup", antDesignVue.Radio.Group);
 componentMap$1.set("RadioButtonGroup", RadioButtonGroup);
 componentMap$1.set("ApiRadioGroup", ApiRadioGroup);
 componentMap$1.set("ApiCascader", ApiCascader);
-function findAncestorWithClassName(element, className) {
-  while ((element = element.parentElement) && !element.classList.contains(className))
-    ;
-  return element;
-}
 const CellComponent$1 = ({
-  component = "Input",
-  rule = true,
-  ruleMessage,
-  popoverVisible,
-  getPopupContainer: getPopupContainer2
+  component = "Input"
+  // rule = true,
 }, { attrs }) => {
   const Comp = componentMap$1.get(component);
-  const DefaultComp = vue.h(Comp, attrs);
-  if (!rule) {
-    return DefaultComp;
-  }
-  return vue.h(
-    antDesignVue.Popover,
-    {
-      overlayClassName: "edit-cell-rule-popover",
-      visible: !!popoverVisible,
-      getPopupContainer: (e) => {
-        return attrs.currIndex ? findAncestorWithClassName(e, "ant-table-cell") || e.parentNode : document.body;
-      }
-    },
-    {
-      default: () => DefaultComp,
-      content: () => ruleMessage
-    }
-  );
+  return vue.h(Comp, attrs);
 };
 const key = Symbol("basic-table");
 function createTableContext(instance) {
@@ -12563,6 +12536,10 @@ const _sfc_main$F = /* @__PURE__ */ vue.defineComponent({
       } = props2.column;
       return `edit-cell-align-${align}`;
     });
+    const getErrorClass = vue.computed(() => {
+      const isRule = vue.unref(getRuleVisible);
+      return isRule ? `${prefixCls2}__rule` : "";
+    });
     const getRowEditable = vue.computed(() => {
       const {
         editable
@@ -12833,7 +12810,8 @@ const _sfc_main$F = /* @__PURE__ */ vue.defineComponent({
       getValues,
       handleEnter,
       handleSubmitClick,
-      spinning
+      spinning,
+      getErrorClass
     };
   },
   render() {
@@ -12866,7 +12844,7 @@ const _sfc_main$F = /* @__PURE__ */ vue.defineComponent({
         "popoverVisible": this.getRuleVisible,
         "rule": this.getRule,
         "ruleMessage": this.ruleMessage,
-        "class": this.getWrapperClass,
+        "class": [this.getWrapperClass, this.getErrorClass],
         "ref": "elRef",
         "onChange": this.handleChange,
         "onOptionsChange": this.handleOptionsChange,
@@ -14998,7 +14976,18 @@ const _sfc_main$x = vue.defineComponent({
       return table2 ? vue.unref(table2.wrapRef) : document.body;
     }
     const { getBindValues } = useTableContext();
-    return { getSetting, handleColumnChange, getTableContainer, getBindValues };
+    const ifShowGlobalSearch = vue.computed(() => {
+      return getBindValues.value.useAdvancedSearch && getBindValues.value.columns.some((item) => {
+        return item.dataIndex !== "action" && [true, void 0].includes(item.globalShow);
+      });
+    });
+    return {
+      getSetting,
+      handleColumnChange,
+      getTableContainer,
+      getBindValues,
+      ifShowGlobalSearch
+    };
   }
 });
 const index_vue_vue_type_style_index_0_lang$1 = "";
@@ -15012,7 +15001,7 @@ function _sfc_render$m(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_ColumnSetting = vue.resolveComponent("ColumnSetting");
   const _component_FullScreenSetting = vue.resolveComponent("FullScreenSetting");
   return vue.openBlock(), vue.createElementBlock("div", _hoisted_1$j, [
-    _ctx.getBindValues.useAdvancedSearch ? (vue.openBlock(), vue.createBlock(_component_GlobalSearch, { key: 0 })) : vue.createCommentVNode("", true),
+    _ctx.ifShowGlobalSearch ? (vue.openBlock(), vue.createBlock(_component_GlobalSearch, { key: 0 })) : vue.createCommentVNode("", true),
     _ctx.getBindValues.useAdvancedSearch ? (vue.openBlock(), vue.createBlock(_component_AdvancedSearchSetting, {
       key: 1,
       getPopupContainer: _ctx.getTableContainer
@@ -23167,7 +23156,10 @@ exports.TableDict = TableDict;
 exports.TableImg = TableImg;
 exports.TablePlus = _sfc_main$3;
 exports.ToolbarEnum = ToolbarEnum;
+exports.add = add;
+exports.componentMap = componentMap$2;
 exports.createLoading = createLoading;
+exports.del = del;
 exports.descriptionsForm = descriptionsForm;
 exports.getGlobalAdvancedType = getGlobalAdvancedType;
 exports.searchType = searchType;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "3h1-ui",
-  "version": "2.14.28",
+  "version": "2.14.29",
   "description": "",
   "module": "es/index.js",
   "main": "lib/index.js",