Skip to content

Commit

Permalink
Merge branch '3.6' of https://github.com/steedos/steedos-widgets into…
Browse files Browse the repository at this point in the history
… 3.6
  • Loading branch information
baozhoutao committed Jan 16, 2024
2 parents bd977d8 + 70fab17 commit 2217e28
Showing 1 changed file with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* @Author: [email protected]
* @Date: 2022-12-26 18:07:37
* @LastEditors: [email protected]
* @LastEditTime: 2024-01-16 17:43:35
* @LastEditTime: 2024-01-16 17:47:02
* @Description:
*/
import "./AmisSteedosField.less";
Expand Down Expand Up @@ -418,11 +418,11 @@ export const AmisSteedosField = async (props) => {
});
} else if (steedosField.type === "table") {
if (steedosField.subFields) {
// console.log(`convertData ======>`, field, convertData)
// console.log(`convertData ======>`, steedosField, convertData)
let tableFields = [];
for (const subField of field.subFields) {
for (const subField of steedosField.subFields) {
if (!subField.name.endsWith(".$")) {
const subFieldName = subField.name.replace(`${field._prefix || ''}${field.name}.$.`, '').replace(`${field.name}.`, '');
const subFieldName = subField.name.replace(`${steedosField._prefix || ''}${steedosField.name}.$.`, '').replace(`${steedosField.name}.`, '');
// const gridSub = await convertSFieldToAmisField(Object.assign({}, subField, {name: subFieldName, isTableField: true}), readonly, ctx);
tableFields.push(Object.assign({}, subField, { name: subFieldName }))
}
Expand Down

0 comments on commit 2217e28

Please sign in to comment.