el-plus-crud 0.0.100 → 0.0.101

package/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [0.0.101](https://github.com/KDJack/el-plus-crud/compare/v0.0.100...v0.0.101) (2023-11-22)
+
 ### [0.0.100](https://github.com/KDJack/el-plus-crud/compare/v0.0.99...v0.0.100) (2023-11-15)
 
 ### [0.0.99](https://github.com/KDJack/el-plus-crud/compare/v0.0.98...v0.0.99) (2023-11-13)

package/dist/el-plus-crud.mjs

@@ -26,14 +26,14 @@ function ht(s) {
     case "validCode":
     case "tag":
     case "textarea":
-      return { placeholder: (s == null ? void 0 : s.placeholder) || "请输入" + (s == null ? void 0 : s._label) };
+      return { placeholder: (s == null ? void 0 : s.placeholder) || "请输入" + ((s == null ? void 0 : s._label) || "") };
     case "switch":
       return {};
     case "area":
     case "select":
     case "category":
     case "cascader":
-      return { placeholder: (s == null ? void 0 : s.placeholder) || "请选择" + (s.remote ? s.initLoad !== !1 ? "（默认查10个，其余请输入搜索）" : "或输入进行搜索" : s == null ? void 0 : s._label) };
+      return { placeholder: (s == null ? void 0 : s.placeholder) || "请选择" + (s.remote ? s.initLoad !== !1 ? "（默认查10个，其余请输入搜索）" : "或输入进行搜索" : (s == null ? void 0 : s._label) || "") };
     case "data":
     case "datetime":
     case "datas":
@@ -2357,7 +2357,8 @@ const st = /* @__PURE__ */ ze(_a, [["__scopeId", "data-v-a71c4b82"]]), va = /* @
     field: {},
     loading: { type: Boolean },
     desc: {},
-    formData: {}
+    formData: {},
+    rowIndex: {}
   },
   setup(s) {
     const t = s;
@@ -2383,7 +2384,7 @@ const st = /* @__PURE__ */ ze(_a, [["__scopeId", "data-v-a71c4b82"]]), va = /* @
         if (!t.desc.format)
           n.value = t.modelValue === "" ? t.desc.default ?? "-" : t.modelValue ?? t.desc.default ?? "-";
         else if (typeof t.desc.format == "function") {
-          const r = t.desc.format(t.modelValue, t.formData, t.field);
+          const r = t.desc.format(t.modelValue, t.formData, t.rowIndex);
           n.value = Ze(r) ? await r : r;
         } else
           typeof t.desc.format == "string" ? n.value = l[t.desc.format] ? l[t.desc.format](t.modelValue, t.formData, t.field) : "--" : n.value = t.modelValue || "-";
@@ -2402,7 +2403,7 @@ const st = /* @__PURE__ */ ze(_a, [["__scopeId", "data-v-a71c4b82"]]), va = /* @
     ], 16));
   }
 });
-const ut = /* @__PURE__ */ ze(Oa, [["__scopeId", "data-v-83245562"]]), Sa = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({ __proto__: null, default: ut }, Symbol.toStringTag, { value: "Module" })), ka = {
+const ut = /* @__PURE__ */ ze(Oa, [["__scopeId", "data-v-3abef1f1"]]), Sa = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({ __proto__: null, default: ut }, Symbol.toStringTag, { value: "Module" })), ka = {
   name: "ElPlusFormTextarea",
   inheritAttrs: !1,
   typeName: "textarea",
@@ -3008,7 +3009,7 @@ const $n = ["innerHTML"], Jn = {
     showReset: { type: Boolean, default: !0 },
     resetBtnText: { default: "重置" },
     showLabel: { type: Boolean, default: !0 },
-    labelWidth: { default: "" },
+    labelWidth: { default: "auto" },
     disabled: { type: Boolean, default: !1 },
     isDialog: { type: Boolean, default: !1 },
     size: { default: "default" },
@@ -3024,7 +3025,7 @@ const $n = ["innerHTML"], Jn = {
     let j = null;
     const M = J(() => l.size || i.size), g = [..._t, ...((W = i.form) == null ? void 0 : W.comList) || []], b = J(() => ({ display: "flex", flexDirection: l.isTable ? "row" : "column" })), p = J(() => ({
       ...l.formAttrs,
-      _labelWidth: l.labelWidth === "auto" ? l.isDialog ? "100px" : "120px" : parseInt(l.labelWidth + "") + "px",
+      _labelWidth: l.isTable ? "auto" : l.labelWidth === "auto" ? l.isDialog ? "100px" : "120px" : parseInt(l.labelWidth + "") + "px",
       // validateOnRuleChange: false,
       disabled: l.disabled || o.value,
       rules: f,
@@ -3723,20 +3724,19 @@ function ru(s) {
 function vt(s, t, e, l, i) {
   const u = [];
   return s && s.length > 0 && tl(s).map((n) => {
-    var r;
-    switch (n.children && (n.children = vt(n.children, t, e, l, i)), n.type || (n.type = "text"), n.type) {
+    switch (n.children ? (n.headerAlign = n.headerAlign || "center", n.children = vt(n.children, t, e, "center", i)) : n.headerAlign = n.headerAlign || l || "left", n.type || (n.type = "text"), n.type) {
       case "image":
         n.width = n.width || "110px", n.align = n.align || "left", n.headerAlign = n.headerAlign || l || "left";
         break;
       case "btns":
         if (!n.minWidth && n.btns && n.btns.length >= 2) {
-          let a = 0;
-          n.btns.map((o) => a += typeof o.label == "string" ? o.label.length : 4), n.width = n.width || a * 24 + "px";
+          let r = 0;
+          n.btns.map((a) => r += typeof a.label == "string" ? a.label.length : 4), n.width = n.width || r * 24 + "px";
         }
         n.align = n.align || "left", n.headerAlign = n.headerAlign || l || "left", n.text = !0;
         break;
     }
-    n.minWidth = n.minWidth || (n.label !== "操作" ? i : "auto"), n.showOverflowTooltip = n.label !== "操作", Mu(n, t, e), (r = n.children) != null && r.length && (n.headerAlign = n.headerAlign || l || "center"), u.push(n);
+    n.minWidth = n.minWidth || (n.label !== "操作" ? i : "auto"), n.showOverflowTooltip = n.label !== "操作", Mu(n, t, e), u.push(n);
   }), u;
 }
 function Mu(s, t, e) {

package/lib/components/el-plus-form/ElPlusForm.vue

@@ -149,7 +149,7 @@ const props = withDefaults(defineProps<IFormProps>(), {
   // 是否显示标签
   showLabel: true,
   // 标签宽度
-  labelWidth: '',
+  labelWidth: 'auto',
   // 全局禁用表单
   disabled: false,
   // 是否为弹窗
@@ -192,7 +192,7 @@ const formLayout = computed(() => ({ display: 'flex', flexDirection: props.isTab
 const computedFormAttrs = computed(() => {
   return {
     ...props.formAttrs,
-    _labelWidth: props.labelWidth === 'auto' ? (props.isDialog ? '100px' : '120px') : parseInt(props.labelWidth + '') + 'px',
+    _labelWidth: props.isTable ? 'auto' : props.labelWidth === 'auto' ? (props.isDialog ? '100px' : '120px') : parseInt(props.labelWidth + '') + 'px',
     // validateOnRuleChange: false,
     disabled: props.disabled || innerIsLoading.value,
     rules: computedRules,

package/lib/components/el-plus-form/components/ElPlusFormText.vue

@@ -28,6 +28,7 @@ const props = defineProps<{
   loading?: boolean
   desc: { [key: string]: any }
   formData?: { [key: string]: any }
+  rowIndex?: number
 }>()
 
 // 有点击事件时，才inject
@@ -84,7 +85,7 @@ watch(
     } else {
       if (typeof props.desc.format === 'function') {
         // 如果有方法类型的判断，则需要启用动态监测
-        const result = props.desc.format(props.modelValue, props.formData, props.field)
+        const result = props.desc.format(props.modelValue, props.formData, props.rowIndex)
         formatValue.value = isPromiseLike<any>(result) ? await result : result
       } else if (typeof props.desc.format === 'string') {
         formatValue.value = format[props.desc.format] ? format[props.desc.format](props.modelValue, props.formData, props.field) : '--'

package/lib/components/el-plus-form/mixins/index.ts

@@ -78,14 +78,14 @@ function getPlaceholder(desc: { [key: string]: any }) {
     case 'validCode':
     case 'tag':
     case 'textarea':
-      return { placeholder: desc?.placeholder || '请输入' + desc?._label }
+      return { placeholder: desc?.placeholder || '请输入' + (desc?._label || '') }
     case 'switch':
       return {}
     case 'area':
     case 'select':
     case 'category':
     case 'cascader':
-      return { placeholder: desc?.placeholder || '请选择' + (desc.remote ? (desc.initLoad !== false ? '（默认查10个，其余请输入搜索）' : '或输入进行搜索') : desc?._label) }
+      return { placeholder: desc?.placeholder || '请选择' + (desc.remote ? (desc.initLoad !== false ? '（默认查10个，其余请输入搜索）' : '或输入进行搜索') : desc?._label || '') }
     case 'data':
     case 'datetime':
     case 'datas':

package/lib/components/el-plus-table/util/index.ts

@@ -72,7 +72,12 @@ export function handelListColumn(columnList: Array<IColumnItem> | undefined, def
     cloneDeep(columnList).map((item: IColumnItem) => {
       // 如果有子集
       if (item.children) {
-        item.children = handelListColumn(item.children, defaultConf, tbName, headerAlign, minWidth)
+        // 表头居中
+        item.headerAlign = item.headerAlign || 'center'
+        item.children = handelListColumn(item.children, defaultConf, tbName, 'center', minWidth)
+      } else {
+        // 表头居中
+        item.headerAlign = item.headerAlign || headerAlign || 'left'
       }
 
       // 处理下一个单元格显示多个数据
@@ -111,11 +116,6 @@ export function handelListColumn(columnList: Array<IColumnItem> | undefined, def
       // 处理vif
       handelVIf(item, defaultConf, tbName)
 
-      // 表头居中
-      if (item.children?.length) {
-        item.headerAlign = item.headerAlign || headerAlign || 'center'
-      }
-
       tempColumnList.push(item)
     })
   }

package/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "el-plus-crud",
-  "version": "0.0.100",
+  "version": "0.0.101",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "el-plus-crud",
-      "version": "0.0.100",
+      "version": "0.0.101",
       "license": "MIT",
       "dependencies": {
         "@element-plus/icons-vue": "^2.1.0",

package/package.json

@@ -2,7 +2,7 @@
   "name": "el-plus-crud",
   "description": "采用Vue3 + TS，封装的element-plus数据驱动表单、列表组件",
   "author": "K.D.Jack",
-  "version": "0.0.100",
+  "version": "0.0.101",
   "license": "MIT",
   "private": false,
   "main": "dist/el-plus-crud.mjs",