@steedos-widgets/amis-object 1.3.7 → 1.3.9

package/dist/amis/AmisInputTable.d.ts

@@ -0,0 +1,20 @@
+export declare const AmisInputTable: (props: any) => Promise<{
+    type: string;
+    size: string;
+    body: {
+        type: string;
+        label: any;
+        name: any;
+        addable: any;
+        editable: any;
+        draggable: any;
+        showIndex: any;
+        perPage: any;
+        id: any;
+        columns: any;
+        needConfirm: boolean;
+        strictMode: boolean;
+        showTableAddBtn: boolean;
+        showFooterAddBtn: boolean;
+    }[];
+}>;

package/dist/amis/index.d.ts

@@ -18,3 +18,4 @@ export * from './AmisGlobalHeader';
 export * from './AmisSteedosField';
 export * from './AmisSelectFlow';
 export * from './AmisInstanceDetail';
+export * from './AmisInputTable';

package/dist/amis-object.cjs.css

@@ -1622,6 +1622,9 @@ body.steedos {
   .antd-Select-popover .antd-Select-menu .antd-Select-option .antd-Checkbox--checkbox {
     white-space: nowrap;
   }
+  .antd-Select-popover .antd-Select-menu .antd-Select-option .antd-Checkbox--checkbox > span {
+    vertical-align: middle;
+  }
 }
 .steedos-object-form .steedos-input-rich-text-readonly .antd-RichTextControl {
   border: 0;
@@ -1803,7 +1806,7 @@ body.steedos {
 
 @media (min-width: 767px) {
   /* 列表快速编辑功能样式 */
-  .steedos-object-table thead tr th:nth-child(3) {
+  .steedos-object-table thead tr th:nth-child(2) {
     display: none;
   }
   .steedos-object-table tbody td.antd-Field--quickEditable > div {

package/dist/amis-object.cjs.js

@@ -3351,6 +3351,217 @@ const amisRender = (root, schema, data = {}, env = {}, options) => {
   return amis.embed(root, schema, data, Object.assign(getEvn(router), env));
 };
 
+/*
+ * @Author: 殷亮辉 yinlianghui@hotoa.com
+ * @Date: 2023-11-15 09:50:22
+ * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+ * @LastEditTime: 2023-11-16 18:38:21
+ */
+
+/**
+ * @param {*} props 
+ * @param {*} mode edit/new/readonly
+ */
+function getFormFields$1(props, mode = "edit") {
+    return props.fields || [];
+}
+
+/**
+ * @param {*} props 
+ * @param {*} mode edit/new/readonly
+ */
+function getInputTableColumns(props) {
+    return props.fields.map(function(item){
+        return Object.assign({}, item, {
+            "type": "static"
+        });
+    }) || [];
+}
+
+/**
+ * @param {*} props 
+ * @param {*} mode edit/new/readonly
+ */
+function getForm(props, mode = "edit") {
+    let schema = {
+        "type": "form",
+        "title": "表单",
+        "body": getFormFields$1(props, mode)
+    };
+    if (mode === "edit") {
+        Object.assign(schema, {
+            "onEvent": {
+                "submit": {
+                    "weight": 0,
+                    "actions": [
+                        {
+                            "actionType": "setValue",
+                            "args": {
+                                "index": "${index}",
+                                "value": {
+                                    "&": "$$"
+                                }
+                            },
+                            "componentId": props.id
+                        }
+                    ]
+                }
+            }
+        });
+    }
+    else if (mode === "new") {
+        Object.assign(schema, {
+            "onEvent": {
+                "submit": {
+                    "weight": 0,
+                    "actions": [
+                        {
+                            "componentId": props.id,
+                            "actionType": "addItem",
+                            "args": {
+                                "index": `\${${props.name}.length || 9000}`,//这里加9000是因为字段如果没放在form组件内，props.name.length拿不到值
+                                "item": {
+                                    "&": "$$"
+                                }
+                            }
+                        }
+                    ]
+                }
+            }
+        });
+    }
+    return schema;
+}
+
+function getButtonNew(props) {
+    return {
+        "label": "新增",
+        "type": "button",
+        "icon": "fa fa-plus",
+        "onEvent": {
+            "click": {
+                "actions": [
+                    {
+                        "actionType": "dialog",
+                        "dialog": {
+                            "type": "dialog",
+                            "title": "弹框标题",
+                            "body": [
+                                getForm(props, "new")
+                            ],
+                            "showCloseButton": true,
+                            "showErrorMsg": true,
+                            "showLoading": true,
+                            "className": "app-popover",
+                            "closeOnEsc": false
+                        }
+                    }
+                ]
+            }
+        },
+        "level": "primary"
+    };
+}
+
+function getButtonEdit(props) {
+    return {
+        "type": "button",
+        "label": "编辑",
+        "onEvent": {
+            "click": {
+                "actions": [
+                    {
+                        "actionType": "dialog",
+                        "dialog": {
+                            "type": "dialog",
+                            "title": "弹框标题",
+                            "body": [
+                                getForm(props, "edit")
+                            ],
+                            "showCloseButton": true,
+                            "showErrorMsg": true,
+                            "showLoading": true,
+                            "className": "app-popover",
+                            "closeOnEsc": false
+                        }
+                    }
+                ]
+            }
+        }
+    };
+}
+
+function getButtonDelete(props) {
+    return {
+        "type": "button",
+        "label": "删除",
+        "onEvent": {
+            "click": {
+                "actions": [
+                    {
+                        "actionType": "deleteItem",
+                        "args": {
+                            "index": "${index+','}" //这里不加逗号后续会报错，语法是逗号分隔可以删除多行
+                        },
+                        "componentId": props.id
+                    }
+                ]
+            }
+        }
+    };
+}
+
+const getAmisInputTableSchema =  async (props, readonly) => {
+    if (!props.id) {
+        props.id = "steedos_input_table_" + props.name + "_" + Math.random().toString(36).substr(2, 9);
+    }
+    let buttonNewSchema = getButtonNew(props);
+    let buttonEditSchema = getButtonEdit(props);
+    let buttonDeleteSchema = getButtonDelete(props);
+    let buttonsForColumnOperations = [];
+    if(props.editable){
+        buttonsForColumnOperations.push(buttonEditSchema);
+    }
+    if(props.removable){
+        buttonsForColumnOperations.push(buttonDeleteSchema);
+    }
+    let inputTableSchema = {
+        "type": "input-table",
+        "label": props.label,
+        "name": props.name,
+        "addable": props.addable,
+        "editable": props.editable,
+        // "removable": props.removable, //不可以removable设置为true，因为会在原生的操作列显示减号操作按钮，此开关实测只控制这个按钮显示不会影响删除功能
+        "draggable": props.draggable,
+        "showIndex": props.showIndex,
+        "perPage": props.perPage,
+        "id": props.id,
+        "columns": getInputTableColumns(props),
+        "needConfirm": false,
+        "strictMode": true,
+        "showTableAddBtn": false,
+        "showFooterAddBtn": false
+    };
+    if(buttonsForColumnOperations.length){
+        inputTableSchema.columns.push({
+            "name": "__op__",
+            "type": "static",
+            "body": buttonsForColumnOperations
+        });
+    }
+    let schema = {
+        "type": "wrapper",
+        "size": "none",
+        "body": [
+            inputTableSchema
+        ]
+    };
+    if(props.addable){
+        schema.body.push(buttonNewSchema);
+    }
+    return schema;
+};
+
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-07-04 11:24:28
@@ -4080,6 +4291,7 @@ function getSaveDataTpl(fields){
         delete formData.initialValues;
         delete formData.editFormInited;
         delete formData.isLookup;
+        delete formData.selectedRowResponseResult;
         ${getScriptForReadonlyFields(fields)}
         ${getScriptForRemoveUrlPrefixForImgFields(fields)}
         ${getScriptForSimplifiedValueForFileFields(fields)}
@@ -10982,7 +11194,7 @@ var config = {
 };
 
 async function getQuickEditSchema(field, options){
-    //判断在amis3.2以上环境下，放开批量编辑
+    //判断在amis3.2以上环境下，放开批量编辑与lookup的单元格编辑
     let isAmisVersionforBatchEdit = false;
     if(window.amisRequire && window.amisRequire('amis')){
         isAmisVersionforBatchEdit = window.amisRequire('amis').version[0] >= 3 && window.amisRequire('amis').version[2] >= 2;
@@ -11383,6 +11595,10 @@ async function getQuickEditSchema(field, options){
         } else {
             quickEditSchema = false;
         }
+        //amis3.2以下禁用lookup的单元格编辑
+        if(field.type == "lookup" && !isAmisVersionforBatchEdit){
+            quickEditSchema = false;
+        }
         //TODO:附件多选时会覆盖老数据，暂时禁用
         if(field.type == "file" && field.multiple){
             quickEditSchema = false;
@@ -11413,9 +11629,9 @@ function getFieldWidth(width){
 async function getTableColumns$1(fields, options){
     const columns = [];
     if(!options.isLookup){
-        columns.push({name: '_index',type: 'text', width: 32, placeholder: ""});
         //将_display放入crud的columns中，可以通过setvalue修改行内数据域的_display，而不影响上层items的_display,用于批量编辑
         columns.push({name: '_display',type: 'static', width: 32, placeholder: "",id: "_display_${_index}", className: "hidden"});
+        columns.push({name: '_index',type: 'text', width: 32, placeholder: ""});
     }
     const allowEdit = options.permissions?.allowEdit && !options.isLookup && options.enable_inline_edit != false;
     
@@ -11507,14 +11723,14 @@ async function getTableColumns$1(fields, options){
         }
         else {
             const tpl = await getFieldTpl(field, options);
-            let type = 'text';
+            let type = 'static-text';
             if(tpl){
                 type = 'static';
             }else if(field.type === 'html'){
-                type = 'markdown';
+                type = 'static-markdown';
             }else if(field.type === 'url'){
                 if(field.show_as_qr){
-                    type = 'qr-code';
+                    type = 'static-qr-code';
                 }else {
                     type = 'input-url';
                 }
@@ -12666,6 +12882,7 @@ function getSaveApi(object, recordId, fields, options){
         },
         adaptor: `
             if(payload.errors){
+                delete payload.data;
                 payload.status = 2;
                 payload.msg = window.t ? window.t(payload.errors[0].message) : payload.errors[0].message;
             }
@@ -17942,6 +18159,7 @@ var index_esm$1 = /*#__PURE__*/Object.freeze({
     extendObject: extendObject,
     fetchAPI: fetchAPI,
     filtersToConditions: filtersToConditions,
+    getAmisInputTableSchema: getAmisInputTableSchema,
     getApp: getApp,
     getApps: getApps,
     getAuthToken: getAuthToken,
@@ -18303,8 +18521,8 @@ var SteedosDropdownButton = function (props) {
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-09-01 14:44:57
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2023-10-13 15:57:39
+ * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+ * @LastEditTime: 2023-11-15 11:32:11
  * @Description:
  */
 var SteedosIcon = function (props) {
@@ -18331,9 +18549,9 @@ var SteedosIcon = function (props) {
         category = foo[0];
         name = foo[1];
     }
-    return React__default["default"].createElement("span", { className: "slds-icon_container slds-icon-".concat(category, "-").concat(name, " ").concat(containerClassName) },
+    return React__default["default"].createElement("span", { className: "slds-icon_container slds-icon-".concat(category, "-").concat(name.replace("_", "-"), " ").concat(containerClassName) },
         React__default["default"].createElement("svg", { className: "slds-icon slds-icon_".concat(size, " slds-icon-text-").concat(colorVariant, " ").concat(className) },
-            React__default["default"].createElement("use", { xlinkHref: "/assets/icons/".concat(category, "-sprite/svg/symbols.svg#").concat(name) })));
+            React__default["default"].createElement("use", { xlinkHref: "/assets/icons/".concat(category, "-sprite/svg/symbols.svg#").concat(name.replace("-", "_")) })));
 };
 
 antd.Tabs.TabPane;
@@ -18757,6 +18975,9 @@ var AmisObjectTable = function (props) { return __awaiter(void 0, void 0, void 0
                 if (!ctx) {
                     ctx = {};
                 }
+                if (!ctx.hiddenColumnOperation) {
+                    ctx.hiddenColumnOperation = hiddenColumnOperation;
+                }
                 if (!ctx.formFactor) {
                     ctx.formFactor = formFactor;
                 }
@@ -18796,7 +19017,7 @@ var AmisObjectTable = function (props) { return __awaiter(void 0, void 0, void 0
                 appId = (data === null || data === void 0 ? void 0 : data.appId) || (defaultData === null || defaultData === void 0 ? void 0 : defaultData.appId);
                 // ctx中值为undefined的属性不能保留，否则会导致 filters等被覆盖。
                 ctx = _$1.pickBy(ctx, function (value) { return value !== undefined; });
-                return [4 /*yield*/, getTableSchema(appId, objectApiName, columns, __assign$2(__assign$2({ filters: tableFilters, filtersFunction: filtersFunction, top: top, sort: sort, sortField: sortField, sortOrder: sortOrder, extraColumns: extraColumns, defaults: defaults }, ctx), { setDataToComponentId: setDataToComponentId, requestAdaptor: requestAdaptor, adaptor: adaptor, filterVisible: filterVisible, headerToolbarItems: headerToolbarItems, crudDataFilter: crudDataFilter, onCrudDataFilter: onCrudDataFilter, amisData: allData, env: env, hiddenColumnOperation: hiddenColumnOperation }))];
+                return [4 /*yield*/, getTableSchema(appId, objectApiName, columns, __assign$2(__assign$2({ filters: tableFilters, filtersFunction: filtersFunction, top: top, sort: sort, sortField: sortField, sortOrder: sortOrder, extraColumns: extraColumns, defaults: defaults }, ctx), { setDataToComponentId: setDataToComponentId, requestAdaptor: requestAdaptor, adaptor: adaptor, filterVisible: filterVisible, headerToolbarItems: headerToolbarItems, crudDataFilter: crudDataFilter, onCrudDataFilter: onCrudDataFilter, amisData: allData, env: env }))];
             case 1:
                 amisSchema = (_e.sent()).amisSchema;
                 amisSchema.data = Object.assign({}, amisSchema.data, amisSchemaData);
@@ -20269,8 +20490,8 @@ var AmisSteedosField = function (props) { return __awaiter(void 0, void 0, void
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2023-01-14 16:41:24
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2023-09-14 13:08:43
+ * @LastEditors: liaodaxue
+ * @LastEditTime: 2023-11-17 10:53:59
  * @Description:
  */
 var getSelectFlowSchema = function (id, props) {
@@ -20422,7 +20643,7 @@ var getSelectFlowSchema = function (id, props) {
             method: "post",
             url: "${context.rootUrl}/graphql?keywords=${keywords}",
             requestAdaptor: "\n                const keywords = api.body.keywords || '';\n                const appId = '".concat(data.app_id || "", "';\n                api.data = {\n                    query: `\n                        {\n                        options: flows__getList(action: \"").concat(action, "\", keywords: \"${keywords}\", appId: \"${appId}\", distributeInstanceId: \"").concat(distributeInstanceId, "\", distributeStepId: \"").concat(distributeStepId, "\", allData: ").concat(allData, "){\n                          value:_id\n                          label:name\n                          children: flows{\n                            value: _id,\n                            label: name\n                          }\n                        }\n                      }\n                    `\n                }\n            "),
-            adaptor: "\n                var options = payload.data.options;\n                if(options){\n                  options.forEach(function(item,index) {\n                      if(item.value != 'startFlows' && (!item.children || item.children.length == 0)){\n                          payload.data.options.splice(index,1)\n                      }\n                  })\n                }\n                // if(payload.data.options.length === 1 && payload.data.options[0].children.length === 1){\n                //   payload.data.value = payload.data.options[0].children[0].value\n                // }\n                return payload;\n            ",
+            adaptor: "\n                var options = payload.data.options;\n                if (options) {\n                    var filteredOptions = options.filter(function(item) {\n                        return item.value == 'startFlows' || (item.children && item.children.length > 0);\n                    });\n                    payload.data.options = filteredOptions;\n                }\n                // if(payload.data.options.length === 1 && payload.data.options[0].children.length === 1){\n                //   payload.data.value = payload.data.options[0].children[0].value\n                // }\n                return payload;\n            ",
             "headers": {
                 "Authorization": "Bearer ${context.tenantId},${context.authToken}"
             }
@@ -20499,6 +20720,20 @@ var AmisInstanceDetail = function (props) { return __awaiter(void 0, void 0, voi
     });
 }); };
 
+var AmisInputTable = function (props) { return __awaiter(void 0, void 0, void 0, function () {
+    var amisSchema;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                props.$schema, props.fields, props.name, props.id, props.data;
+                return [4 /*yield*/, getAmisInputTableSchema(props)];
+            case 1:
+                amisSchema = _a.sent();
+                return [2 /*return*/, amisSchema];
+        }
+    });
+}); };
+
 var PageListView = function (props) { return __awaiter(void 0, void 0, void 0, function () {
     var formFactor, appId, objectApiName, display, data, _display, page, listSchema;
     return __generator(this, function (_b) {
@@ -20692,6 +20927,7 @@ exports.AmisAppMenu = AmisAppMenu;
 exports.AmisGlobalFooter = AmisGlobalFooter;
 exports.AmisGlobalHeader = AmisGlobalHeader;
 exports.AmisGlobalHeaderToolbar = AmisGlobalHeaderToolbar;
+exports.AmisInputTable = AmisInputTable;
 exports.AmisInstanceDetail = AmisInstanceDetail;
 exports.AmisLib = index_esm$1;
 exports.AmisLogo = AmisLogo;