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

package/dist/sortable.umd.js

@@ -21297,7 +21297,8 @@
         }
       });
 
-    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')){
@@ -21765,7 +21766,7 @@
         }
     }
 
-    async function getTableColumns(fields, options){
+    async function getTableColumns(object, fields, options){
         const columns = [];
         if(!options.isLookup && !options.isInputTable){
             if(!options.enable_tree){
@@ -21779,7 +21780,7 @@
                 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"){
@@ -22351,7 +22352,7 @@
         return card;
     }
 
-    async function getTableSchema$1(fields, options){
+    async function getTableSchema$1(object, fields, options){
         if(!options){
             options = {};
         }
@@ -22373,7 +22374,7 @@
             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;
@@ -25008,8 +25009,8 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
     /*
      * @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:
      */
 
@@ -25331,7 +25332,22 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
     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}"
         });
@@ -25342,7 +25358,8 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         // });
         // 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}"
         });
@@ -25409,7 +25426,20 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
     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}"`
@@ -25424,8 +25454,6 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
             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;
@@ -25435,11 +25463,10 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         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 = `
@@ -25793,6 +25820,18 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
             }
         });
 
+        // 把自动填充规则中依赖的字段也加到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);
@@ -26049,7 +26088,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
             if(refObjectConfig.name === 'organizations'){
               labelFieldName = 'name';
             }
-            pickerSchema = await getTableSchema$1(tableFields, {
+            pickerSchema = await getTableSchema$1(refObjectConfig, tableFields, {
                 labelFieldName,
                 top:  top,
                 isLookup: true,
@@ -26224,22 +26263,31 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
 
         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;
@@ -26263,7 +26311,6 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
             };
         }
 
-        const refObjectConfig = referenceTo && await getUISchema(referenceTo.objectName);
         let listView = getLookupListView(refObjectConfig);
 
         let listviewFilter = getListViewFilter(listView);
@@ -26449,13 +26496,13 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
     }
 
     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}",
@@ -26645,7 +26692,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                 actions: false
             });
         }else {
-            pickerSchema = await getTableSchema$1(tableFields, {
+            pickerSchema = await getTableSchema$1(refObjectConfig, tableFields, {
                 labelFieldName: refObjectConfig.NAME_FIELD_KEY,
                 top:  top,
                 isLookup: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos-widgets/sortable",
-  "version": "3.6.4-beta.2",
+  "version": "3.6.4-beta.4",
   "main": "dist/sortable.cjs.js",
   "module": "dist/sortable.esm.js",
   "unpkg": "dist/sortable.umd.js",
@@ -45,7 +45,7 @@
   "dependencies": {
     "@dnd-kit/core": "^6.0.5",
     "@dnd-kit/sortable": "^7.0.1",
-    "@steedos-widgets/amis-lib": "3.6.4-beta.2"
+    "@steedos-widgets/amis-lib": "3.6.4-beta.4"
   },
-  "gitHead": "74e7975b7f134d1192dea186f90e0a1c6c11275c"
+  "gitHead": "68fe9858b14e597c08872caa7057c23ffc254573"
 }