@hzab/list-render 1.10.5 → 1.10.6

package/CHANGELOG.md

@@ -1,3 +1,7 @@
+# @hzab/list-render@1.10.6
+
+fix: table render getVal 增加 getOptItByVal 支持通过 fieldNames 配置 下拉数据格式
+
 # @hzab/list-render@1.10.5
 
 feat: 行内编辑默认聚焦

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hzab/list-render",
-  "version": "1.10.5",
+  "version": "1.10.6",
   "description": "",
   "main": "src",
   "scripts": {

package/src/common/utils.js

@@ -24,6 +24,8 @@ const dateFormatEnum = {
  * @returns
  */
 export function getVal(field = {}, data = {}, opt = {}) {
+  console.log("field", field);
+
   const {} = opt;
   let val = _.get(data, field.name);
   const {} = field || {};
@@ -70,11 +72,11 @@ export function getVal(field = {}, data = {}, opt = {}) {
     Array.isArray(dataSource)
   ) {
     if (!Array.isArray(val)) {
-      return dataSource?.find((option) => option.value === val)?.label || val;
+      return getFieldOptItByVal(val, field, opt)?.label || val;
     } else if (Array.isArray(val)) {
       let _val = [];
       val.forEach((valIt) => {
-        _val.push(dataSource?.find((option) => option.value === valIt)?.label || valIt);
+        _val.push(getFieldOptItByVal(val, field, opt)?.label || valIt);
       });
       val = _val;
     }
@@ -161,7 +163,10 @@ export const getFieldOptItByVal = function (val, field, opt) {
     : Array.isArray(field.options)
     ? field.options
     : field.dataSource || [];
-  return getOptItByVal(val, options, { fieldNames: field.fieldNames, ...opt });
+  return getOptItByVal(val, options, {
+    fieldNames: field.fieldNames || field["x-component-props"]?.fieldNames,
+    ...opt,
+  });
 };
 
 /**