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

package/dist/sortable.esm.js

@@ -56813,6 +56813,7 @@ function getObjectHeaderToolbar(mainObject, fields, formFactor, {
 }
 
 function getObjectFooterToolbar(mainObject, formFactor, options) {
+  // crud card模式与table模式两种情况下showPageInput默认值不一样，所以需要显式设置为false
   if (formFactor === 'SMALL') {
     // return [
     //   "load-more",
@@ -56822,15 +56823,17 @@ function getObjectFooterToolbar(mainObject, formFactor, options) {
         "switch-per-page",
         {
           "type": "pagination",
-          "maxButtons": 5
+          "maxButtons": 5,
+          "showPageInput": false
         }
       ]
     }else {
       return [
-        "statistics",
+        // "statistics",
         {
           "type": "pagination",
-          "maxButtons": 5
+          "maxButtons": 5,
+          "showPageInput": false
         }
       ]
     }
@@ -56839,7 +56842,11 @@ function getObjectFooterToolbar(mainObject, formFactor, options) {
     if(options && options.isRelated){
       return [
         "statistics",
-        "pagination"
+        {
+          "type": "pagination",
+          "maxButtons": 10,
+          "showPageInput": false
+        }
       ]
 
     }
@@ -56847,7 +56854,11 @@ function getObjectFooterToolbar(mainObject, formFactor, options) {
       return [
         "switch-per-page",
         "statistics",
-        "pagination"
+        {
+          "type": "pagination",
+          "maxButtons": 10,
+          "showPageInput": false
+        }
       ]
     }
   }
@@ -57730,15 +57741,17 @@ async function lookupToAmisSelect(field, readonly, ctx){
         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 : '';
@@ -58563,7 +58576,20 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
                     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;
@@ -59042,7 +59068,7 @@ async function getQuickEditSchema(field, options){
                     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;
@@ -59673,23 +59699,86 @@ async function getTableOperation(ctx){
     }
 }
 
+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));
         }
@@ -59784,8 +59873,8 @@ function isObject(obj) {
 /*
  * @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:
  */
 
@@ -60082,8 +60171,8 @@ async function getListSchema(
         "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,
@@ -65217,7 +65306,7 @@ var PLACEHOLDER_ID = 'placeholder';
 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,
@@ -65225,10 +65314,10 @@ function MultipleContainers(props) {
             "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);
+    // defaultValue && delete(defaultValue.$$id);
     var _w = __read(react.exports.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'],