@steedos-widgets/sortable 3.6.4-beta.2 → 3.6.4-beta.4

package/dist/sortable.esm.js

@@ -54992,7 +54992,8 @@ instance
     }
   });
 
-async function getQuickEditSchema(field, options){
+async function getQuickEditSchema(object, columnField, options){
+    let field = object.fields[columnField.name];
     //判断在amis3.2以上环境下，放开批量编辑与lookup的单元格编辑
     let isAmisVersionforBatchEdit = false;
     if(window.amisRequire && window.amisRequire('amis')){
@@ -55460,7 +55461,7 @@ function getFieldWidth(width){
     }
 }
 
-async function getTableColumns(fields, options){
+async function getTableColumns(object, fields, options){
     const columns = [];
     if(!options.isLookup && !options.isInputTable){
         if(!options.enable_tree){
@@ -55474,7 +55475,7 @@ async function getTableColumns(fields, options){
             continue;
         }
         //增加quickEdit属性，实现快速编辑
-        const quickEditSchema = allowEdit ? await getQuickEditSchema(field, options) : allowEdit;
+        const quickEditSchema = allowEdit ? await getQuickEditSchema(object, field, options) : allowEdit;
         let className = "";
         const bowserType = getBowserType();
         if(bowserType === "Safari"){
@@ -56046,7 +56047,7 @@ async function getDefaultCrudCard(columns, options) {
     return card;
 }
 
-async function getTableSchema$1(fields, options){
+async function getTableSchema$1(object, fields, options){
     if(!options){
         options = {};
     }
@@ -56068,7 +56069,7 @@ async function getTableSchema$1(fields, options){
         columns = await getMobileTableColumns(fields, options);
     }
     else {
-        columns = await getTableColumns(fields, options);
+        columns = await getTableColumns(object, fields, options);
 
         if(listSchema.mode === "cards"){
             let card = listSchema.card;
@@ -58703,8 +58704,8 @@ async function getObjectFilter(objectSchema, fields, options) {
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-07-05 15:55:39
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2024-02-18 16:05:21
+ * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+ * @LastEditTime: 2024-02-23 16:37:06
  * @Description:
  */
 
@@ -59026,7 +59027,22 @@ if(typeof window != 'undefined'){
 async function getSource(field, ctx) {
     // data.query 最终格式 "{ \tleftOptions:organizations(filters: {__filters}){value:_id,label:name,children},   children:organizations(filters: {__filters}){ref:_id,children}, defaultValueOptions:space_users(filters: {__options_filters}){user,name} }"
     const refObjectName = ctx.objectName;
-    const data = await getFindQuery({ name: refObjectName }, null, [{ name: ctx.valueField, alias: "value" }, { name: ctx.labelField, alias: "label" }, { name: "children" }], {
+    let optionQueryFields = [{ name: ctx.valueField, alias: "value" }, { name: ctx.labelField, alias: "label" }, { name: "children" }];
+    let defaultOptionQueryFields = optionQueryFields.filter(function (f) { return f.name !== "children" });
+
+    // 把自动填充规则中依赖的字段也加到api请求中
+    let autoFillMapping = !field.multiple && field.auto_fill_mapping;
+    if (autoFillMapping && autoFillMapping.length) {
+        autoFillMapping.forEach(function (item) {
+            if(item.from !== "children"){
+                optionQueryFields.push({ name: item.from });
+            }
+            defaultOptionQueryFields.push({ name: item.from });
+        });
+    }
+
+    const data = await getFindQuery({ name: refObjectName }, null, optionQueryFields, {
+        expand: false,
         alias: "options",
         filters: "{__filters}"
     });
@@ -59037,7 +59053,8 @@ async function getSource(field, ctx) {
     // });
     // childrenData.query = childrenData.query.replace(/,count\:.+/, "}");
     // data.query = data.query.replace(/}$/, "," + childrenData.query.replace(/{(.+)}/, "$1}"));
-    const defaultValueOptionsData = await getFindQuery({ name: refObjectName }, null, [{ name: ctx.valueField, alias: "value" }, { name: ctx.labelField, alias: "label" }], {
+    const defaultValueOptionsData = await getFindQuery({ name: refObjectName }, null, defaultOptionQueryFields, {
+        expand: false,
         alias: "defaultValueOptions",
         filters: "{__options_filters}"
     });
@@ -59104,7 +59121,20 @@ async function getSource(field, ctx) {
 async function getDeferApi(field, ctx) {
     // data.query 最终格式 "{ \toptions:{__object_name}(filters:{__filters}){{__fields}} }"
     const refObjectName = ctx.objectName;
-    const data = await getFindQuery({ name: "{__object_name}" }, null, [], {
+    let optionQueryFields = [{ name: ctx.valueField, alias: "value" }, { name: ctx.labelField, alias: "label" }, { name: "children" }];
+
+    // 把自动填充规则中依赖的字段也加到api请求中
+    let autoFillMapping =  !field.multiple && field.auto_fill_mapping;
+    if (autoFillMapping && autoFillMapping.length) {
+        autoFillMapping.forEach(function (item) {
+            if(item.from !== "children"){
+                optionQueryFields.push({ name: item.from });
+            }
+        });
+    }
+
+    const data = await getFindQuery({ name: "{__object_name}" }, null, optionQueryFields, {
+        expand: false,
         alias: "options",
         // filters: "{__filters}",
         queryOptions: `filters: {__filters}, sort: "{__sort}"`
@@ -59119,8 +59149,6 @@ async function getDeferApi(field, ctx) {
         filters = filters(field);
     }
     data.query = data.query.replace(/,count\:.+/, "}");
-    // 字段要根据请求参数动态生成，写死为__fields后续在发送适配器中替换
-    data.query = data.query.replace("{_id}", "{{__fields}}");
     const requestAdaptor = `
         var dep = api.query.dep;
         var term = api.query.term;
@@ -59130,11 +59158,10 @@ async function getDeferApi(field, ctx) {
         var sort = "";
         if (dep) {
             objectName = "${refObjectName}";
-            fields = "_id,value:${ctx.valueField},label:${ctx.labelField},children";
             filters = [['parent', '=', dep]];
             sort = "${ctx.sort}";
         }
-        api.data.query = api.data.query.replace(/{__object_name}/g, objectName).replace(/{__fields}/g, fields).replace(/{__filters}/g, JSON.stringify(filters)).replace('{__sort}', sort.trim());
+        api.data.query = api.data.query.replace(/{__object_name}/g, objectName).replace(/{__filters}/g, JSON.stringify(filters)).replace('{__sort}', sort.trim());
         return api;
     `;
     const adaptor = `
@@ -59488,6 +59515,18 @@ async function lookupToAmisPicker(field, readonly, ctx){
         }
     });
 
+    // 把自动填充规则中依赖的字段也加到api请求中
+    let autoFillMapping = !field.multiple && field.auto_fill_mapping;
+    if (autoFillMapping && autoFillMapping.length) {
+        autoFillMapping.forEach(function (item) {
+            if(!lodash.exports.find(tableFields, function(f){
+                return f.name === item.from
+            })){
+                tableFields.push(refObjectConfig.fields[item.from]);
+            }
+        });
+    }
+
     lodash.exports.each(refObjectConfig.fields, function (field) {
       if(isFieldQuickSearchable(field, refObjectConfig.NAME_FIELD_KEY)){
           searchableFields.push(field.name);
@@ -59744,7 +59783,7 @@ async function lookupToAmisPicker(field, readonly, ctx){
         if(refObjectConfig.name === 'organizations'){
           labelFieldName = 'name';
         }
-        pickerSchema = await getTableSchema$1(tableFields, {
+        pickerSchema = await getTableSchema$1(refObjectConfig, tableFields, {
             labelFieldName,
             top:  top,
             isLookup: true,
@@ -59919,22 +59958,31 @@ async function lookupToAmisSelect(field, readonly, ctx){
 
     let apiInfo;
     let defaultValueOptionsQueryData;
+    const refObjectConfig = referenceTo && await getUISchema(referenceTo.objectName);
     if(referenceTo){
-        // 字段值单独走一个请求合并到source的同一个GraphQL接口中
-        defaultValueOptionsQueryData = await getFindQuery({ name: referenceTo.objectName }, null, [
+        let queryFields = [
             Object.assign({}, referenceTo.labelField, {alias: 'label'}),
             Object.assign({}, referenceTo.valueField, {alias: 'value'})
-        ], {
+        ];
+
+        // 把自动填充规则中依赖的字段也加到api请求中
+        let autoFillMapping = !field.multiple && field.auto_fill_mapping;
+        if (autoFillMapping && autoFillMapping.length) {
+            autoFillMapping.forEach(function (item) {
+                queryFields.push(refObjectConfig.fields[item.from]);
+            });
+        }
+
+        // 字段值单独走一个请求合并到source的同一个GraphQL接口中
+        defaultValueOptionsQueryData = await getFindQuery({ name: referenceTo.objectName }, null, queryFields, {
+            expand: false,
             alias: "defaultValueOptions",
             filters: "{__options_filters}",
             count: false
         });
         apiInfo = await getApi({
             name: referenceTo.objectName
-        }, null, [
-            Object.assign({}, referenceTo.labelField, {alias: 'label'}),
-            Object.assign({}, referenceTo.valueField, {alias: 'value'})
-        ], {expand: false, alias: 'options', queryOptions: `filters: {__filters}, top: {__top}, sort: "{__sort}"`});
+        }, null, queryFields, {expand: false, alias: 'options', queryOptions: `filters: {__filters}, top: {__top}, sort: "{__sort}"`});
 
         apiInfo.adaptor = `
             const data = payload.data;
@@ -59958,7 +60006,6 @@ async function lookupToAmisSelect(field, readonly, ctx){
         };
     }
 
-    const refObjectConfig = referenceTo && await getUISchema(referenceTo.objectName);
     let listView = getLookupListView(refObjectConfig);
 
     let listviewFilter = getListViewFilter(listView);
@@ -60144,13 +60191,13 @@ async function getApi(object, recordId, fields, options){
 }
 
 async function getAutoFill(field, refObject) {
-    let autoFillMapping = field.auto_fill_mapping;
+    let autoFillMapping = !field.multiple && field.auto_fill_mapping;
     if (autoFillMapping && autoFillMapping.length) {
         let fillMapping = {};
-        let fieldsForApi = [];
+        // let fieldsForApi = [];
         autoFillMapping.forEach(function (item) {
             fillMapping[item.to] = `\${${item.from}}`;
-            fieldsForApi.push(item.from);
+            // fieldsForApi.push(item.from);
         });
         // let api = {
         //     // "url": "/amis/api/mock2/form/autoUpdate?browser=${browser}&version=${version}",
@@ -60340,7 +60387,7 @@ async function getIdsPickerSchema(field, readonly, ctx){
             actions: false
         });
     }else {
-        pickerSchema = await getTableSchema$1(tableFields, {
+        pickerSchema = await getTableSchema$1(refObjectConfig, tableFields, {
             labelFieldName: refObjectConfig.NAME_FIELD_KEY,
             top:  top,
             isLookup: true,