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

package/dist/sortable.umd.js

@@ -20381,7 +20381,7 @@
             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;
@@ -20642,17 +20642,17 @@
         }
 
         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}}`
         }
     }
 
@@ -23924,10 +23924,10 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         // 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'})
             ], {
@@ -23940,7 +23940,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
             }, 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;
@@ -24034,13 +24034,16 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         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 : '';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos-widgets/sortable",
-  "version": "1.3.4-beta.11",
+  "version": "1.3.4-beta.12",
   "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": "1.3.4-beta.11"
+    "@steedos-widgets/amis-lib": "1.3.4-beta.12"
   },
-  "gitHead": "6ee9091519a18096f602769eeccde7dae10d742b"
+  "gitHead": "355e004eca0928c2e1ed468e9f6a3eed67dfcf62"
 }