yxuse 3.0.63 → 3.0.65

package/lib/index.es6.js

@@ -20411,13 +20411,12 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
       columns.value = typeof props.columns === "function" ? await props.columns() : props.columns;
       columns.value.forEach((col) => {
         var _a, _b;
-        if (!col.renderType) return;
-        if (["select", "cascader"].includes(col.renderType) && ((_a = col == null ? void 0 : col.config) == null ? void 0 : _a.loadOptions)) {
-          loadOptions(col.config);
-        }
-        if (col.required || ((_b = col.rules) == null ? void 0 : _b.length)) {
+        if (col.required || ((_a = col.rules) == null ? void 0 : _a.length)) {
           isFormTable.value = true;
         }
+        if ((col == null ? void 0 : col.renderType) && ["select", "cascader"].includes(col == null ? void 0 : col.renderType) && ((_b = col == null ? void 0 : col.config) == null ? void 0 : _b.loadOptions)) {
+          loadOptions(col.config);
+        }
       });
       if (isFormTable.value) {
         getRules();
@@ -20511,7 +20510,6 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
     const renderForm = (prop, index2, component) => {
       return createVNode(resolveComponent("el-form-item"), {
         "prop": "tableData." + index2 + "." + prop,
-        "label": " ",
         "rules": formTableRules.value[prop]
       }, _isSlot$1(component) ? component : {
         default: () => [component]
@@ -20573,7 +20571,7 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
               if (cell == null ? void 0 : cell.render) {
                 const renderResult = cell.render(scope.row, scope.$index, cell);
                 const needsValidation = cell.required || cell.rules;
-                const isFragment = typeof (renderResult == null ? void 0 : renderResult.type) === "symbol";
+                const isFragment = ["symbol", "object"].includes(typeof (renderResult == null ? void 0 : renderResult.type));
                 if (needsValidation && isFragment) {
                   return renderForm(cell.prop, scope.$index, renderResult);
                 }
@@ -20583,9 +20581,16 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
               return (cell == null ? void 0 : cell.slotName) && columnSlots(cell, scope);
             },
             header: (scope) => {
-              var _a;
+              var _a, _b;
+              if (cell == null ? void 0 : cell.required) {
+                return createVNode("span", {
+                  "class": "flex items-center gap-5"
+                }, [createVNode("span", {
+                  "class": "text-red-500"
+                }, [createTextVNode("* ")]), ((_a = scope == null ? void 0 : scope.column) == null ? void 0 : _a.label) ?? ""]);
+              }
               if (cell == null ? void 0 : cell.headerRender) return cell == null ? void 0 : cell.headerRender(scope.row);
-              if (cell == null ? void 0 : cell.headerSlotName) return (_a = slots[cell == null ? void 0 : cell.headerSlotName]) == null ? void 0 : _a.call(slots, scope);
+              if (cell == null ? void 0 : cell.headerSlotName) return (_b = slots[cell == null ? void 0 : cell.headerSlotName]) == null ? void 0 : _b.call(slots, scope);
             }
           });
         });