@steedos-widgets/sortable 1.3.4-beta.11 → 1.3.4-beta.13

package/dist/assets.json

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

package/dist/sortable.cjs.js

@@ -54080,7 +54080,7 @@ function getSelectMap(selectOptions){
         if(optionColor){
             const background = optionColor.charAt(0) === '#' ? optionColor : '#'+optionColor;
             const color = getContrastColor(background);
-            const optionColorStyle = 'background:'+background+';color:'+color;
+            const optionColorStyle = 'background:'+background+';color:'+color+';line-height:1.5rem';
             map[optionValue] = `<span class="rounded-xl px-2 py-1" style='${optionColorStyle}'>${option.label}</span>`;
         }else {
             map[optionValue] = option.label;
@@ -54341,17 +54341,17 @@ async function getFindQuery(object, recordId, fields, options){
     }
 
     const countQuery = options.count === false ? "" : `,count:${object.name}__count(filters:{__filters})`;
-    const moreQuerie = options.moreQueries?.length ? ("," + options.moreQueries.map(function(item){
-        // 把最外层的{}去除
-        return item.replace(/^{/,"").replace(/}$/,"");
-    }).join(",")) : "";
+    // const moreQuerie = options.moreQueries?.length ? ("," + options.moreQueries.map(function(item){
+    //     // 把最外层的{}去除
+    //     return item.replace(/^{/,"").replace(/}$/,"");
+    // }).join(",")) : "";
 
     return {
         orderBy: "${orderBy}",
         orderDir: "${orderDir}",
         pageNo: "${page}",
         pageSize: "${perPage}",
-        query: `{${alias}:${object.name}${queryOptions}{${await getFieldsTemplate(fields, options.expand)}${treeFields}${cfsFields}}${countQuery}${moreQuerie}}`
+        query: `{${alias}:${object.name}${queryOptions}{${await getFieldsTemplate(fields, options.expand)}${treeFields}${cfsFields}}${countQuery}}`
     }
 }
 
@@ -57623,10 +57623,10 @@ async function lookupToAmisSelect(field, readonly, ctx){
     // const labelFieldKey = referenceTo && referenceTo.labelField?.name || 'name';
 
     let apiInfo;
-
+    let defaultValueOptionsQueryData;
     if(referenceTo){
         // 字段值单独走一个请求合并到source的同一个GraphQL接口中
-        const defaultValueOptionsQueryData = await getFindQuery({ name: referenceTo.objectName }, null, [
+        defaultValueOptionsQueryData = await getFindQuery({ name: referenceTo.objectName }, null, [
             Object.assign({}, referenceTo.labelField, {alias: 'label'}),
             Object.assign({}, referenceTo.valueField, {alias: 'value'})
         ], {
@@ -57639,7 +57639,7 @@ async function lookupToAmisSelect(field, readonly, ctx){
         }, null, [
             Object.assign({}, referenceTo.labelField, {alias: 'label'}),
             Object.assign({}, referenceTo.valueField, {alias: 'value'})
-        ], {expand: false, alias: 'options', queryOptions: `filters: {__filters}, top: {__top}, sort: "{__sort}"`, moreQueries: [defaultValueOptionsQueryData.query]});
+        ], {expand: false, alias: 'options', queryOptions: `filters: {__filters}, top: {__top}, sort: "{__sort}"`});
 
         apiInfo.adaptor = `
             const data = payload.data;
@@ -57733,13 +57733,16 @@ async function lookupToAmisSelect(field, readonly, ctx){
         var optionsFiltersOp = "${field.multiple ? "in" : "="}";
         var optionsFilters = [["${valueFieldKey}", optionsFiltersOp, []]];
         if (defaultValue && !api.data.$term) { 
+            const defaultValueOptionsQueryData = ${JSON.stringify(defaultValueOptionsQueryData)};
+            const defaultValueOptionsQuery = defaultValueOptionsQueryData.query.replace(/^{/,"").replace(/}$/,"");
             // 字段值单独请求，没值的时候在请求中返回空
             optionsFilters = [["${valueFieldKey}", optionsFiltersOp, defaultValue]];
             if(filters.length > 0){
                 optionsFilters = [filters, optionsFilters];
             }
+            api.data.query = "{"+api.data.query.replace(/^{/,"").replace(/}$/,"")+","+defaultValueOptionsQuery+"}";
+            api.data.query = api.data.query.replace(/{__options_filters}/g, JSON.stringify(optionsFilters))
         }
-        api.data.query = api.data.query.replace(/{__options_filters}/g, JSON.stringify(optionsFilters));
         return api;
     `;
     referenceTo ? referenceTo.labelField.name : '';