@steedos-widgets/sortable 1.3.4-beta.15 → 1.3.4-beta.17

package/dist/sortable.umd.js

@@ -23118,6 +23118,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
     }
 
     function getObjectFooterToolbar(mainObject, formFactor, options) {
+      // crud card模式与table模式两种情况下showPageInput默认值不一样，所以需要显式设置为false
       if (formFactor === 'SMALL') {
         // return [
         //   "load-more",
@@ -23127,15 +23128,17 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
             "switch-per-page",
             {
               "type": "pagination",
-              "maxButtons": 5
+              "maxButtons": 5,
+              "showPageInput": false
             }
           ]
         }else {
           return [
-            "statistics",
+            // "statistics",
             {
               "type": "pagination",
-              "maxButtons": 5
+              "maxButtons": 5,
+              "showPageInput": false
             }
           ]
         }
@@ -23144,7 +23147,11 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         if(options && options.isRelated){
           return [
             "statistics",
-            "pagination"
+            {
+              "type": "pagination",
+              "maxButtons": 10,
+              "showPageInput": false
+            }
           ]
 
         }
@@ -23152,7 +23159,11 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
           return [
             "switch-per-page",
             "statistics",
-            "pagination"
+            {
+              "type": "pagination",
+              "maxButtons": 10,
+              "showPageInput": false
+            }
           ]
         }
       }
@@ -24035,15 +24046,17 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         var optionsFilters = [["${valueFieldKey}", optionsFiltersOp, []]];
         if (defaultValue && !api.data.$term) { 
             const defaultValueOptionsQueryData = ${JSON.stringify(defaultValueOptionsQueryData)};
-            const defaultValueOptionsQuery = defaultValueOptionsQueryData.query.replace(/^{/,"").replace(/}$/,"");
+            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))
+            if(defaultValueOptionsQuery){
+                api.data.query = "{"+api.data.query.replace(/^{/,"").replace(/}$/,"")+","+defaultValueOptionsQuery+"}";
+            } 
         }
+        api.data.query = api.data.query.replace(/{__options_filters}/g, JSON.stringify(optionsFilters));
         return api;
     `;
         referenceTo ? referenceTo.labelField.name : '';
@@ -24868,7 +24881,20 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                         type: getAmisStaticFieldType('number', readonly),
                         min: field.min,
                         max: field.max,
-                        precision: field.scale
+                        precision: field.scale,
+                        suffix: "%",
+                        pipeIn: (value, data) => {
+                            if(value){
+                                return value*100;
+                            }
+                            return value;
+                        },
+                        pipeOut: (value, oldValue, data) => {
+                            if(value){
+                                return value/100;
+                            }
+                            return value;
+                        },
                     };
                 }
                 break;
@@ -25347,7 +25373,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                         break;
                     case "percent":
                         TempDisplayField = `
-                            _display["${field.name}"] = (event.data.value * 100).toFixed(${field.scale}) + '%';
+                            _display["${field.name}"] = event.data.value.toFixed(${field.scale}) + '%';
                         `;
                         quickEditSchema.body[0].onEvent["change"] = quickEditOnEvent(TempDisplayField);
                         break;
@@ -25978,23 +26004,86 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         }
     }
 
+    async function getDefaultCrudCard(columns, options) {
+        let labelFieldName = options?.labelFieldName || "name";
+        let titleColumn, bodyColumns = [];
+        columns.forEach(function (item) {
+            delete item.quickEdit;
+            delete item.width;
+            if (item.name === labelFieldName) {
+                titleColumn = item;
+            }
+            else {
+                if (item.name !== "_index") {
+                    bodyColumns.push(item);
+                }
+            }
+        });
+        let card = {
+            "header": {
+                "title": titleColumn.tpl
+            },
+            body: bodyColumns,
+            // useCardLabel: false,
+            toolbar: []
+        };
+        let hideToolbarOperation = options.formFactor === 'SMALL' || ["split"].indexOf(options.displayAs) > -1;
+        if(!hideToolbarOperation){
+            let toolbarOperation = await getTableOperation(options);
+            if (toolbarOperation) {
+                toolbarOperation.className += " inline-block w-auto";
+            }
+            card.toolbar.push(toolbarOperation);
+        }
+        return card;
+    }
+
     async function getTableSchema$1(fields, options){
         if(!options){
             options = {};
         }
         let { isLookup, hiddenColumnOperation } = options;
+        const defaults = options.defaults;
+        const listSchema = (defaults && defaults.listSchema) || {};
+
         let columns = [];
         let useMobileColumns = options.formFactor === 'SMALL' || ["split"].indexOf(options.displayAs) > -1;
         if(isLookup){
             // 在lookup手机端列表模式调式好之前不使用getMobileTableColumns
             useMobileColumns = false;
         }
+        if(listSchema.mode && listSchema.mode !== "table"){
+            // 如果指定的mode，则不走我们内置的手机端列表效果，使用steedos组件内部开发的默认card/list效果，或者由用户自己实现card/list模式的crud列表
+            useMobileColumns = false;
+        }
         if(useMobileColumns){
             columns = await getMobileTableColumns(fields, options);
         }
         else {
             columns = await getTableColumns(fields, options);
 
+            if(listSchema.mode === "cards"){
+                let card = listSchema.card;
+                if(!card){
+                    card = await getDefaultCrudCard(columns, options);
+                }
+                return {
+                    mode: "cards",
+                    name: "thelist",
+                    headerToolbarClassName: "py-2 px-2 border-gray-300 border-solid border-b",
+                    className: "",
+                    draggable: false,
+                    defaultParams: getDefaultParams(options),
+                    card: card,
+                    syncLocation: false,
+                    keepItemSelectionOnPageChange: true,
+                    checkOnItemClick: isLookup ? true : false,
+                    labelTpl: `\${${options.labelFieldName}}`,
+                    autoFillHeight: false, // 自动高度效果不理想,先关闭
+                    columnsTogglable: false
+                }
+            }
+
             if(!isLookup && !hiddenColumnOperation){
                 columns.push(await getTableOperation(options));
             }
@@ -26089,8 +26178,8 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
     /*
      * @Author: baozhoutao@steedos.com
      * @Date: 2022-07-05 15:55:39
-     * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
-     * @LastEditTime: 2023-09-21 17:35:06
+     * @LastEditors: liaodaxue
+     * @LastEditTime: 2023-10-20 11:38:25
      * @Description:
      */
 
@@ -26387,8 +26476,8 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
             "filtersFunction": listview_filters,
             "sort": sort,
             "ctx": ctx,
-            "requestAdaptor": listView.requestAdaptor,  
-            "adaptor": listView.adaptor,
+            "requestAdaptor": listView.requestAdaptor || ctx.requestAdaptor,  
+            "adaptor": listView.adaptor || ctx.adaptor,
             "headerToolbarItems": ctx.headerToolbarItems,
             "filterVisible": ctx.filterVisible,
             "rowClassNameExpr": ctx.rowClassNameExpr,
@@ -31522,7 +31611,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
     var empty = [];
     function MultipleContainers(props) {
         var _this = this;
-        var _a = props.adjustScale, adjustScale = _a === void 0 ? false : _a; props.itemCount; var cancelDrop = props.cancelDrop, _c = props.columns, columns = _c === void 0 ? 1 : _c, _d = props.handle, handle = _d === void 0 ? true : _d, containerStyle = props.containerStyle, _e = props.coordinateGetter, coordinateGetter$1 = _e === void 0 ? coordinateGetter : _e, _f = props.getItemStyles, getItemStyles = _f === void 0 ? function () { return ({}); } : _f, _g = props.wrapperStyle, wrapperStyle = _g === void 0 ? function () { return ({}); } : _g, _h = props.minimal, minimal = _h === void 0 ? false : _h, modifiers = props.modifiers, renderItem = props.renderItem, _j = props.strategy, strategy = _j === void 0 ? verticalListSortingStrategy : _j, _k = props.addable, addable = _k === void 0 ? false : _k, _l = props.trashable, trashable = _l === void 0 ? false : _l, _m = props.vertical, vertical = _m === void 0 ? false : _m, scrollable = props.scrollable, _o = props.boardSource, boardSource = _o === void 0 ? [] : _o, _p = props.cardSource, cardSource = _p === void 0 ? [] : _p, defaultValue = props.defaultValue, amisOnChange = props.onChange, amisData = props.data, amisDispatchEvent = props.dispatchEvent, amisRender = props.render, _q = props.cardSchema, cardSchema = _q === void 0 ? [{
+        var _a = props.adjustScale, adjustScale = _a === void 0 ? false : _a; props.itemCount; var cancelDrop = props.cancelDrop, _c = props.columns, columns = _c === void 0 ? 1 : _c, _d = props.handle, handle = _d === void 0 ? true : _d, containerStyle = props.containerStyle, _e = props.coordinateGetter, coordinateGetter$1 = _e === void 0 ? coordinateGetter : _e, _f = props.getItemStyles, getItemStyles = _f === void 0 ? function () { return ({}); } : _f, _g = props.wrapperStyle, wrapperStyle = _g === void 0 ? function () { return ({}); } : _g, _h = props.minimal, minimal = _h === void 0 ? false : _h, modifiers = props.modifiers, renderItem = props.renderItem, _j = props.strategy, strategy = _j === void 0 ? verticalListSortingStrategy : _j, _k = props.addable, addable = _k === void 0 ? false : _k, _l = props.trashable, trashable = _l === void 0 ? false : _l, _m = props.vertical, vertical = _m === void 0 ? false : _m, scrollable = props.scrollable, _o = props.boardSource, boardSource = _o === void 0 ? [] : _o, _p = props.cardSource, cardSource = _p === void 0 ? [] : _p, value = props.value, amisOnChange = props.onChange, amisData = props.data, amisDispatchEvent = props.dispatchEvent, amisRender = props.render, _q = props.cardSchema, cardSchema = _q === void 0 ? [{
                 "type": "tpl",
                 "tpl": "${label}",
                 "inline": false,
@@ -31530,24 +31619,24 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                 "type": "tpl",
                 "tpl": "${label}",
             }] : _r, _s = props.boardFooter, boardFooter = _s === void 0 ? [] : _s, _t = props.wrapperClassName, wrapperClassName = _t === void 0 ? "gap-2" : _t, _u = props.boardClassName, boardClassName = _u === void 0 ? "border rounded" : _u, _v = props.cardClassName, cardClassName = _v === void 0 ? "" : _v;
-        defaultValue && delete (defaultValue.$$id);
+        value && delete (value.$$id);
         var _w = __read(React.useState(function () {
             var _a;
-            return (_a = defaultValue) !== null && _a !== void 0 ? _a : {
+            return (_a = value) !== null && _a !== void 0 ? _a : {
                 A: ['A1', 'A2'],
                 B: ['B1', 'B2'],
                 C: ['C1', 'C2'],
             };
         }), 2), items = _w[0], setItems = _w[1];
         var _x = __read(React.useState(Object.keys(items)), 2), containers = _x[0], setContainers = _x[1];
-        var handleChange = function () { return __awaiter(_this, void 0, void 0, function () {
+        var handleChange = function (newItems) { return __awaiter(_this, void 0, void 0, function () {
             var value, rendererEvent;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         if (!amisDispatchEvent || !amisOnChange)
                             return [2 /*return*/];
-                        value = items;
+                        value = newItems || items;
                         return [4 /*yield*/, amisDispatchEvent('change', createObject(amisData, {
                                 value: value
                             }))];
@@ -31734,19 +31823,21 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                     return;
                 }
                 var overContainer = findContainer(overId);
+                var newItems = items;
                 if (overContainer) {
                     var activeIndex_1 = items[activeContainer].indexOf(active.id);
                     var overIndex_1 = items[overContainer].indexOf(overId);
                     if (activeIndex_1 !== overIndex_1) {
                         setItems(function (items) {
                             var _a;
-                            return (__assign$1(__assign$1({}, items), (_a = {}, _a[overContainer] = arrayMove(items[overContainer], activeIndex_1, overIndex_1), _a)));
+                            newItems = __assign$1(__assign$1({}, items), (_a = {}, _a[overContainer] = arrayMove(items[overContainer], activeIndex_1, overIndex_1), _a));
+                            return newItems;
                         });
                     }
                 }
                 setActiveId(null);
                 // console.log('拖动结束2，更新form value')
-                handleChange();
+                handleChange(newItems);
             }, cancelDrop: cancelDrop, onDragCancel: onDragCancel, modifiers: modifiers },
             React__default["default"].createElement("div", { style: {
                     display: 'inline-grid',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos-widgets/sortable",
-  "version": "1.3.4-beta.15",
+  "version": "1.3.4-beta.17",
   "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.15"
+    "@steedos-widgets/amis-lib": "1.3.4-beta.17"
   },
-  "gitHead": "00240969040c173c8ec7ade77767184c617876a8"
+  "gitHead": "184247f4260015e19c82a49fa4d6562839e73d2c"
 }

package/src/components/MultipleContainers.tsx

@@ -153,7 +153,7 @@ interface Props {
   vertical?: boolean;
   boardSource: [{id:string, label:string}?],
   cardSource: [{id:string, label:string, color: string, columnSpan: number, body: [any]}?],
-  defaultValue: any,
+  value: any,
   onChange: Function,
   data: any,
   dispatchEvent: Function,
@@ -171,7 +171,6 @@ const PLACEHOLDER_ID = 'placeholder';
 const empty: UniqueIdentifier[] = [];
 
 export function MultipleContainers(props) {
-
   let {
     adjustScale = false,
     itemCount = 3,
@@ -192,7 +191,7 @@ export function MultipleContainers(props) {
     scrollable,
     boardSource = [],
     cardSource = [],
-    defaultValue,
+    value,
     onChange: amisOnChange,
     data: amisData,
     dispatchEvent: amisDispatchEvent,
@@ -212,11 +211,11 @@ export function MultipleContainers(props) {
     cardClassName = "",
   }: Props = props
 
-  defaultValue && delete(defaultValue.$$id);
+  value && delete(value.$$id);
 
   const [items, setItems] = useState<Items>(
     () => {
-      return (defaultValue as Items) ?? {
+      return (value as Items) ?? {
         A: ['A1', 'A2'],
         B: ['B1', 'B2'],
         C: ['C1', 'C2'],
@@ -228,10 +227,10 @@ export function MultipleContainers(props) {
     Object.keys(items) as UniqueIdentifier[]
   );
 
-  const handleChange = async () => {
+  const handleChange = async (newItems? : any) => {
     if (!amisDispatchEvent || !amisOnChange)
       return 
-    const value = items;
+    const value = newItems || items;
 
     // 支持 amis OnEvent.change
     const rendererEvent = await amisDispatchEvent(
@@ -494,26 +493,31 @@ export function MultipleContainers(props) {
 
         const overContainer = findContainer(overId);
 
+        let newItems = items;
+
         if (overContainer) {
           const activeIndex = items[activeContainer].indexOf(active.id);
           const overIndex = items[overContainer].indexOf(overId);
 
           if (activeIndex !== overIndex) {
-            setItems((items) => ({
-              ...items,
-              [overContainer]: arrayMove(
-                items[overContainer],
-                activeIndex,
-                overIndex
-              ),
-            }));
+            setItems((items) => {
+              newItems = {
+                ...items,
+                [overContainer]: arrayMove(
+                  items[overContainer],
+                  activeIndex,
+                  overIndex
+                ),
+              }
+              return newItems;
+            });
           }
         }
 
         setActiveId(null);
 
         // console.log('拖动结束2，更新form value')
-        handleChange()
+        handleChange(newItems)
       }}
       cancelDrop={cancelDrop}
       onDragCancel={onDragCancel}