@steedos-widgets/amis-object 6.3.0-beta.5 → 6.3.0-beta.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/amis-object.cjs.css +3 -0
- package/dist/amis-object.cjs.js +27 -10
- package/dist/amis-object.cjs.js.map +1 -1
- package/dist/amis-object.esm.css +3 -0
- package/dist/amis-object.esm.js +27 -10
- package/dist/amis-object.esm.js.map +1 -1
- package/dist/amis-object.umd.css +3 -0
- package/dist/amis-object.umd.js +10 -8
- package/dist/amis-object.umd.js.map +1 -1
- package/dist/assets.json +21 -21
- package/package.json +3 -3
package/dist/amis-object.cjs.css
CHANGED
package/dist/amis-object.cjs.js
CHANGED
|
@@ -12260,6 +12260,10 @@ async function getFormSchemaWithDataFilter(form, options = {}){
|
|
|
12260
12260
|
async function getObjectForm(objectSchema, ctx){
|
|
12261
12261
|
const { recordId, formFactor, layout = formFactor === 'SMALL' ? 'normal' : "horizontal", labelAlign, tabId, appId, defaults, submitSuccActions = [],
|
|
12262
12262
|
formDataFilter, onFormDataFilter, amisData, env } = ctx;
|
|
12263
|
+
//优先识别组件上的enableTabs属性,若不存在,则识别对象上定义的
|
|
12264
|
+
if (typeof ctx.enableTabs !== 'boolean') {
|
|
12265
|
+
ctx.enableTabs = objectSchema.enable_form_tabs;
|
|
12266
|
+
}
|
|
12263
12267
|
const fields = _$1__default["default"].values(objectSchema.fields);
|
|
12264
12268
|
const formFields = getFormFields$1(objectSchema, ctx);
|
|
12265
12269
|
const formSchema = defaults && defaults.formSchema || {};
|
|
@@ -14422,7 +14426,7 @@ async function lookupToAmisPicker(field, readonly, ctx){
|
|
|
14422
14426
|
});
|
|
14423
14427
|
|
|
14424
14428
|
// 把自动填充规则中依赖的字段也加到api请求中
|
|
14425
|
-
let autoFillMapping =
|
|
14429
|
+
let autoFillMapping = field.auto_fill_mapping;
|
|
14426
14430
|
if (autoFillMapping && autoFillMapping.length) {
|
|
14427
14431
|
autoFillMapping.forEach(function (item) {
|
|
14428
14432
|
if(!_$1__namespace.find(tableFields, function(f){
|
|
@@ -14894,7 +14898,7 @@ async function lookupToAmisSelect(field, readonly, ctx){
|
|
|
14894
14898
|
];
|
|
14895
14899
|
|
|
14896
14900
|
// 把自动填充规则中依赖的字段也加到api请求中
|
|
14897
|
-
let autoFillMapping =
|
|
14901
|
+
let autoFillMapping = field.auto_fill_mapping;
|
|
14898
14902
|
if (autoFillMapping && autoFillMapping.length) {
|
|
14899
14903
|
autoFillMapping.forEach(function (item) {
|
|
14900
14904
|
queryFields.push(refObjectConfig.fields[item.from]);
|
|
@@ -15136,14 +15140,25 @@ async function getApi(object, recordId, fields, options){
|
|
|
15136
15140
|
}
|
|
15137
15141
|
|
|
15138
15142
|
async function getAutoFill(field, refObject) {
|
|
15139
|
-
let autoFillMapping =
|
|
15143
|
+
let autoFillMapping = field.auto_fill_mapping;
|
|
15140
15144
|
if (autoFillMapping && autoFillMapping.length) {
|
|
15141
15145
|
let fillMapping = {};
|
|
15146
|
+
if (field.multiple) {
|
|
15147
|
+
autoFillMapping.forEach(function (item) {
|
|
15148
|
+
//from的字段类型为lookup、master_detail、select时,需要保留数组格式;其他类型需要转变为字符串格式
|
|
15149
|
+
if (_$1__namespace.includes(["lookup","master_detail","select"], refObject.fields[item.from].type)) {
|
|
15150
|
+
fillMapping[item.to] = `\${items | pick:${item.from}}`;
|
|
15151
|
+
} else {
|
|
15152
|
+
fillMapping[item.to] = `\${items | pick:${item.from} | join}`;
|
|
15153
|
+
}
|
|
15154
|
+
});
|
|
15155
|
+
}else {
|
|
15156
|
+
autoFillMapping.forEach(function (item) {
|
|
15157
|
+
fillMapping[item.to] = `\${${item.from}}`;
|
|
15158
|
+
});
|
|
15159
|
+
}
|
|
15142
15160
|
// let fieldsForApi = [];
|
|
15143
|
-
|
|
15144
|
-
fillMapping[item.to] = `\${${item.from}}`;
|
|
15145
|
-
// fieldsForApi.push(item.from);
|
|
15146
|
-
});
|
|
15161
|
+
// fieldsForApi.push(item.from);
|
|
15147
15162
|
// let api = {
|
|
15148
15163
|
// // "url": "/amis/api/mock2/form/autoUpdate?browser=${browser}&version=${version}",
|
|
15149
15164
|
// "url": `/api/v1/${refObject.name}/\${${field.name}}?fields=${JSON.stringify(fieldsForApi)}`,
|
|
@@ -15245,7 +15260,7 @@ async function lookupToAmis(field, readonly, ctx){
|
|
|
15245
15260
|
amisSchema = _$1__namespace.defaultsDeep({}, pageAmisSchema, amisSchema);
|
|
15246
15261
|
}
|
|
15247
15262
|
}
|
|
15248
|
-
const autoFill = await getAutoFill(field);
|
|
15263
|
+
const autoFill = await getAutoFill(field, refObject);
|
|
15249
15264
|
if(autoFill){
|
|
15250
15265
|
amisSchema.autoFill = autoFill;
|
|
15251
15266
|
// 这里不配置initAutoFill值,按amis规则initAutoFill默认值为fillIfNotSet处理--需要amis sdk 版本 > 3.6.3-patch.6(不包括)版本
|
|
@@ -23058,7 +23073,8 @@ var AmisGlobalHeaderToolbar = function (props) { return __awaiter(void 0, void 0
|
|
|
23058
23073
|
"color": "#FFFFFF"
|
|
23059
23074
|
},
|
|
23060
23075
|
},
|
|
23061
|
-
]
|
|
23076
|
+
],
|
|
23077
|
+
"xs": "auto"
|
|
23062
23078
|
},
|
|
23063
23079
|
{
|
|
23064
23080
|
"body": [
|
|
@@ -23074,7 +23090,8 @@ var AmisGlobalHeaderToolbar = function (props) { return __awaiter(void 0, void 0
|
|
|
23074
23090
|
"tpl": "${context.user.email}",
|
|
23075
23091
|
"inline": true,
|
|
23076
23092
|
},
|
|
23077
|
-
]
|
|
23093
|
+
],
|
|
23094
|
+
"columnClassName": "break-all"
|
|
23078
23095
|
}
|
|
23079
23096
|
]
|
|
23080
23097
|
},
|