@steedos-widgets/sortable 3.6.4-beta.1 → 3.6.4-beta.3

package/dist/assets.json

@@ -3,8 +3,8 @@
         {
             "package": "@steedos-widgets/sortable",
             "urls": [
-                "https://unpkg.com/@steedos-widgets/sortable@3.6.4-beta.1/dist/sortable.umd.js",
-                "https://unpkg.com/@steedos-widgets/sortable@3.6.4-beta.1/dist/sortable.umd.css"
+                "https://unpkg.com/@steedos-widgets/sortable@3.6.4-beta.3/dist/sortable.umd.js",
+                "https://unpkg.com/@steedos-widgets/sortable@3.6.4-beta.3/dist/sortable.umd.css"
             ],
             "library": "BuilderSortable"
         }
@@ -15,10 +15,10 @@
             "npm": {
                 "package": "@steedos-widgets/sortable"
             },
-            "url": "https://unpkg.com/@steedos-widgets/sortable@3.6.4-beta.1/dist/meta.js",
+            "url": "https://unpkg.com/@steedos-widgets/sortable@3.6.4-beta.3/dist/meta.js",
             "urls": {
-                "default": "https://unpkg.com/@steedos-widgets/sortable@3.6.4-beta.1/dist/meta.js",
-                "design": "https://unpkg.com/@steedos-widgets/sortable@3.6.4-beta.1/dist/meta.js"
+                "default": "https://unpkg.com/@steedos-widgets/sortable@3.6.4-beta.3/dist/meta.js",
+                "design": "https://unpkg.com/@steedos-widgets/sortable@3.6.4-beta.3/dist/meta.js"
             }
         }
     ]

package/dist/sortable.cjs.js

@@ -54145,7 +54145,7 @@ function getNameTpl(field, ctx){
     if(ctx && ctx.isLookup){
         linkTarget = "target='_blank'";
     }
-    if(ctx.isRelated){
+    if(ctx.isRelated && window.innerWidth >= 768){
         return `<a href="${href}" ${linkTarget} onclick="return false;">\${${field.name} | raw}</a>`
     }else {
         return `<a href="${href}" ${linkTarget}>\${${field.name} | raw}</a>`
@@ -54203,7 +54203,7 @@ function getRelatedFieldTpl(field, ctx){
                 const href = Router.getObjectDetailPath({
                     formFactor: ctx.formFactor, appId: "${appId}", objectName: `${objectNameTpl}`, recordId: `${recordIdTpl}`
                 });
-                if(ctx.isRelated){
+                if(ctx.isRelated && window.innerWidth >= 768){
                     labelTpl = `<a href="${href}" ${linkTarget} onclick="return false;">${labelTpl}</a>`;
                 }else {
                     labelTpl = `<a href="${href}" ${linkTarget}>${labelTpl}</a>`;
@@ -55628,7 +55628,7 @@ async function getTableColumns(fields, options){
                     columnItem.defaultColor = null;
                 }
 
-                if(((field.is_name || field.name === options.labelFieldName) || ((field.type == 'lookup' || field.type == 'master_detail') && lodash.exports.isString(field.reference_to) && field.multiple != true)) && options.isRelated){
+                if(window.innerWidth >= 768 && ((field.is_name || field.name === options.labelFieldName) || ((field.type == 'lookup' || field.type == 'master_detail') && lodash.exports.isString(field.reference_to) && field.multiple != true)) && options.isRelated){
                     
                     const drawerRecordDetailSchema = {
                         "type": "steedos-record-detail",
@@ -55656,16 +55656,17 @@ async function getTableColumns(fields, options){
                                 "drawer": {
                                   "type": "drawer",
                                   "title": "&nbsp;",
-                                  "headerClassName": "",
+                                  "headerClassName": "hidden",
                                   "size": "lg",
-                                  "bodyClassName": "p-0 m-0 border-t",
+                                  "bodyClassName": "p-0 m-0",
                                   "closeOnEsc": true,
+                                  "closeOnOutside": true,
                                   "resizable": true,
                                   "actions": [],
                                   "body": [
                                     drawerRecordDetailSchema
                                   ],
-                                  "className": "app-popover",
+                                  "className": "steedos-record-detail-drawer app-popover",
                                   "id": "u:fc5f055afa8c"
                                 },
                                 "preventDefault": true
@@ -55723,7 +55724,7 @@ function getMobileLines(tpls){
     let isNewLine = false;
     let isLeft = true;
     let lineChildrenClassName = "";
-    let lineClassName = "flex items-center justify-between";
+    let lineClassName = "flex items-center justify-between mb-1";
     tpls.forEach(function(item){
         if(isNewLine && lines.length < maxLineCount){
             lines.push({
@@ -59029,7 +59030,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}"
     });
@@ -59040,7 +59056,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}"
     });
@@ -59107,7 +59124,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}"`
@@ -59122,8 +59152,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;
@@ -59133,11 +59161,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 = `
@@ -59491,6 +59518,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);
@@ -59922,22 +59961,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;
@@ -59961,7 +60009,6 @@ async function lookupToAmisSelect(field, readonly, ctx){
         };
     }
 
-    const refObjectConfig = referenceTo && await getUISchema(referenceTo.objectName);
     let listView = getLookupListView(refObjectConfig);
 
     let listviewFilter = getListViewFilter(listView);
@@ -60146,6 +60193,33 @@ async function getApi(object, recordId, fields, options){
     }
 }
 
+async function getAutoFill(field, refObject) {
+    let autoFillMapping = !field.multiple && field.auto_fill_mapping;
+    if (autoFillMapping && autoFillMapping.length) {
+        let fillMapping = {};
+        // let fieldsForApi = [];
+        autoFillMapping.forEach(function (item) {
+            fillMapping[item.to] = `\${${item.from}}`;
+            // fieldsForApi.push(item.from);
+        });
+        // let api = {
+        //     // "url": "/amis/api/mock2/form/autoUpdate?browser=${browser}&version=${version}",
+        //     "url": `/api/v1/${refObject.name}/\${${field.name}}?fields=${JSON.stringify(fieldsForApi)}`,
+        //     // "responseData": {
+        //     //     "name": "${name}"
+        //     // },
+        //     "silent": false
+        // }
+        // return {
+        //     fillMapping,
+        //     // api
+        // }
+        // 因为autoFill中配置了api的话，在表单初始化（比如新建记录）时并不会触发执行autoFill，所以只能暂时不用api
+        // 给amis报过问题了，见：https://github.com/baidu/amis/issues/9631
+        return fillMapping;
+    }
+}
+
 async function lookupToAmis(field, readonly, ctx){
     if(!ctx){
         ctx = {};
@@ -60229,6 +60303,10 @@ async function lookupToAmis(field, readonly, ctx){
             amisSchema = lodash.exports.defaultsDeep({}, pageAmisSchema, amisSchema);
         }
     }
+    const autoFill = await getAutoFill(field);
+    if(autoFill){
+        amisSchema.autoFill = autoFill;
+    }
     return amisSchema;
 }
 
@@ -60400,6 +60478,7 @@ const getMarkdownFieldSchema = (field, readonly, ctx)=>{
                       {
                         "type": "editor",
                         "name": field.name,
+                        "labelClassName": "none",
                         "language": "markdown",
                       }
                     ]