yxuse 3.0.51 → 3.0.53

package/lib/index.es6.js

@@ -55,7 +55,7 @@ import { genFileId } from "element-plus";
 import { j as jumpToHome, b as getUserConfig } from "./index.es12.js";
 import { u as uploadResourceApi } from "./index.es13.js";
 const _hoisted_1$4 = { class: "dialog-footer flex justify-end" };
-const _sfc_main$9 = /* @__PURE__ */ defineComponent({
+const _sfc_main$8 = /* @__PURE__ */ defineComponent({
   __name: "index",
   setup(__props, { expose: __expose }) {
     const dialogOptions = reactive({
@@ -148,7 +148,7 @@ const _sfc_main$9 = /* @__PURE__ */ defineComponent({
   }
 });
 const _hoisted_1$3 = { class: "dialog-footer flex justify-end" };
-const _sfc_main$8 = /* @__PURE__ */ defineComponent({
+const _sfc_main$7 = /* @__PURE__ */ defineComponent({
   __name: "index",
   setup(__props, { expose: __expose }) {
     const drawerOptions = reactive({
@@ -240,7 +240,7 @@ const _sfc_main$8 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const _sfc_main$7 = /* @__PURE__ */ defineComponent({
+const _sfc_main$6 = /* @__PURE__ */ defineComponent({
   __name: "index",
   props: {
     conf: {},
@@ -20459,7 +20459,7 @@ const exportToExcel = ({ header, tableData, fileName }) => {
 function _isSlot$1(s) {
   return typeof s === "function" || Object.prototype.toString.call(s) === "[object Object]" && !isVNode(s);
 }
-const _sfc_main$6 = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues({}, {
+const _sfc_main$5 = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues({}, {
   name: "YxTable"
 }), {
   __name: "index",
@@ -20491,7 +20491,13 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues
         startSort();
       });
     });
+    watch(() => props.columns, () => {
+      initTable();
+    });
     onBeforeMount(() => __async(this, null, function* () {
+      yield initTable();
+    }));
+    const initTable = () => __async(this, null, function* () {
       columns.value = typeof props.columns === "function" ? yield props.columns() : props.columns;
       columns.value.forEach((col) => {
         var _a;
@@ -20500,7 +20506,7 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues
           loadOptions(col.config);
         }
       });
-    }));
+    });
     const loadOptions = (config) => __async(this, null, function* () {
       if ((config == null ? void 0 : config.options) && (config == null ? void 0 : config.options.length) === 0 && (config == null ? void 0 : config.loadOptions) && typeof (config == null ? void 0 : config.loadOptions) === "function") {
         config.options = yield config == null ? void 0 : config.loadOptions();
@@ -20550,7 +20556,7 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues
                   prop: cell.prop,
                   config: cell.config
                 };
-                return createVNode(_sfc_main$7, {
+                return createVNode(_sfc_main$6, {
                   "conf": conf,
                   "model": scope.row,
                   "onChange": cell == null ? void 0 : cell.change
@@ -20619,105 +20625,29 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues
         default: () => [_slot]
       }), pagination()]);
     };
-    const exportDataToExcel = ({
-      header,
-      tableData,
-      fileName
-    }) => {
+    const exportDataToExcel = (fileName) => {
+      const header = columns.value.filter((cell) => cell.prop);
+      const tableData = props.tableData;
       exportToExcel({
         header,
         tableData,
-        fileName
+        fileName: fileName || Date.now()
       });
     };
+    const updateColumns = (newColumns) => __async(this, null, function* () {
+      if (!columns.value) return;
+      columns.value = typeof newColumns === "function" ? yield newColumns() : newColumns;
+    });
     __expose({
       tableRef,
-      exportDataToExcel
+      exportDataToExcel,
+      updateColumns
     });
     return (_ctx, _cache) => {
       return openBlock(), createBlock(resolveDynamicComponent(render2(props)));
     };
   }
 }));
-const _sfc_main$5 = /* @__PURE__ */ defineComponent({
-  __name: "index",
-  props: {
-    searchColumns: {},
-    searchParams: {},
-    showSearchBtn: {
-      type: Boolean,
-      default: true
-    },
-    showAddBtn: {
-      type: Boolean,
-      default: true
-    },
-    style: {},
-    labelStyle: {},
-    className: {},
-    classLabelName: {}
-  },
-  emits: ["search", "add"],
-  setup(__props, {
-    emit: __emit
-  }) {
-    const slots = useSlots();
-    const props = __props;
-    const emit = __emit;
-    const render2 = (props2) => {
-      const {
-        searchColumns,
-        searchParams,
-        showSearchBtn,
-        showAddBtn,
-        style,
-        labelStyle,
-        className,
-        classLabelName
-      } = props2;
-      const renderColumn = (searchColumns2) => {
-        return searchColumns2.filter((cell) => !cell.show || cell.show()).map((cell) => {
-          var _a, _b;
-          const conf = {
-            renderType: cell.renderType,
-            prop: cell.key,
-            config: cell.config
-          };
-          return createVNode("div", {
-            "class": `flex items-center search-item ${className != null ? className : ""} ${(_a = cell.className) != null ? _a : ""}`,
-            "style": __spreadValues(__spreadValues({}, style), cell.style)
-          }, [createVNode("span", {
-            "class": `whitespace-nowrap label ${classLabelName != null ? classLabelName : ""} ${(_b = cell.classLabelName) != null ? _b : ""}`,
-            "style": __spreadValues(__spreadValues({}, labelStyle), cell.labelStyle)
-          }, [createTextVNode(" "), cell.label, createTextVNode(" ")]), createVNode(_sfc_main$7, {
-            "class": cell.componentClassName,
-            "style": cell.componentStyle,
-            "conf": conf,
-            "model": searchParams,
-            "onChange": cell == null ? void 0 : cell.change
-          }, null)]);
-        });
-      };
-      return createVNode(Fragment, null, [createVNode("div", {
-        "class": "table-search flex gap-10"
-      }, [renderColumn(searchColumns), showSearchBtn && createVNode(resolveComponent("el-button"), {
-        "onClick": () => emit("search"),
-        "class": "search-item"
-      }, {
-        default: () => [createTextVNode("搜索"), " "]
-      }), showAddBtn && createVNode(resolveComponent("el-button"), {
-        "class": "search-item",
-        "onClick": () => emit("add")
-      }, {
-        default: () => [createTextVNode("添加")]
-      }), slots.default && slots.default()])]);
-    };
-    return (_ctx, _cache) => {
-      return openBlock(), createBlock(resolveDynamicComponent(render2(props)));
-    };
-  }
-});
-const index$2 = /* @__PURE__ */ _export_sfc(_sfc_main$5, [["__scopeId", "data-v-c70da20e"]]);
 const _hoisted_1$2 = {
   xmlns: "http://www.w3.org/2000/svg",
   viewBox: "0 0 1024 1024"
@@ -20803,7 +20733,7 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues
       if ((config == null ? void 0 : config.options) && (config == null ? void 0 : config.options.length) === 0 && (config == null ? void 0 : config.loadOptions) && typeof (config == null ? void 0 : config.loadOptions) === "function") {
         config.options = yield config == null ? void 0 : config.loadOptions();
         if (prop && ((_a = props == null ? void 0 : props.formParams) == null ? void 0 : _a[prop])) {
-          formData.value[prop] = props.formParams[prop];
+          formData.value[prop] = props == null ? void 0 : props.formParams[prop];
         }
       }
     });
@@ -20823,21 +20753,22 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues
     });
     const getRules = () => {
       var _a;
-      let rules = {};
+      const rules = {};
       if (!((_a = formColumn.value) == null ? void 0 : _a.length)) return;
       const handleRule = (item) => {
         var _a2;
-        if (!item.required) return;
         if (!item.prop) return;
         const isSelect = (item == null ? void 0 : item.renderType) && ["select", "cascader"].includes(item == null ? void 0 : item.renderType);
         const defaultRule = {
           required: true,
-          message: `${(_a2 = item.label) != null ? _a2 : ""}不能为空`,
+          message: `${(_a2 = item.label) != null ? _a2 : "该字段"}不能为空`,
           trigger: isSelect ? "change" : "blur"
         };
-        rules[item.prop] = rules[item.prop] ? [...rules[item.prop], defaultRule] : [defaultRule];
-        if (item.rules) {
-          rules[item.prop] = [...rules[item.prop], ...item.rules];
+        if (item.required) {
+          rules[item.prop] = [defaultRule];
+        }
+        if (item.rules && item.rules.length > 0) {
+          rules[item.prop] = [...rules[item == null ? void 0 : item.prop] || [], ...item.rules];
         }
       };
       formColumn.value.forEach((form) => {
@@ -21020,7 +20951,7 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent(__spreadProps(__spreadValues
     };
   }
 }));
-const index$1 = /* @__PURE__ */ _export_sfc(_sfc_main$4, [["__scopeId", "data-v-2435d575"]]);
+const index$1 = /* @__PURE__ */ _export_sfc(_sfc_main$4, [["__scopeId", "data-v-4196aa66"]]);
 let versionKey, curVersion, updateApp;
 const updateSysVersion = () => {
   localStorage.setItem(versionKey, curVersion);
@@ -21280,25 +21211,23 @@ const components2 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineP
   LogoTitleRender,
   Toolbar,
   Update,
-  YxDialog: _sfc_main$9,
-  YxDrawer: _sfc_main$8,
+  YxDialog: _sfc_main$8,
+  YxDrawer: _sfc_main$7,
   YxForm: index$1,
   YxIcon: index,
-  YxSearchForm: index$2,
-  YxTable: _sfc_main$6,
+  YxTable: _sfc_main$5,
   YxUpload: _sfc_main$1
 }, Symbol.toStringTag, { value: "Module" }));
 export {
   LogoTitleRender as L,
   Update as U,
-  _sfc_main$9 as _,
-  _sfc_main$8 as a,
-  _sfc_main$6 as b,
+  _sfc_main$8 as _,
+  _sfc_main$7 as a,
+  _sfc_main$5 as b,
   components2 as c,
-  index$1 as d,
-  index as e,
-  _sfc_main$1 as f,
-  LogoTitle as g,
-  index$2 as i
+  index as d,
+  _sfc_main$1 as e,
+  LogoTitle as f,
+  index$1 as i
 };
 //# sourceMappingURL=index.es6.js.map