@steedos-widgets/amis-object 3.6.2-beta.13 → 3.6.2-beta.15

package/dist/amis/AmisInputTable.d.ts

@@ -1,3 +1,4 @@
+import './AmisInputTable.less';
 export declare const AmisInputTable: (props: any) => Promise<{
     type: string;
     body: {
@@ -25,5 +26,5 @@ export declare const AmisInputTable: (props: any) => Promise<{
     labelRemark: any;
     labelAlign: any;
     mode: any;
-    className: any;
+    className: string;
 }>;

package/dist/amis-object.cjs.css

@@ -353,6 +353,9 @@ fieldset.antd-Collapse > legend{
 .steedos-record-related-crud .antd-Table-table > thead > tr > th:not(:last-child) {
     border-right: 0px;
 }
+.ant-dropdown{
+    z-index: 1400;
+}
 
 .ant-dropdown-menu {
     border: 1px solid #e5e5e5;
@@ -601,6 +604,9 @@ fieldset.antd-Collapse > legend{
 .mt-2 {
     margin-top: 0.5rem
 }
+.mt-3 {
+    margin-top: 0.75rem
+}
 .mt-\[50px\] {
     margin-top: 50px
 }
@@ -706,6 +712,9 @@ fieldset.antd-Collapse > legend{
 .w-8 {
     width: 2rem
 }
+.w-80 {
+    width: 20rem
+}
 .w-96 {
     width: 24rem
 }
@@ -2514,6 +2523,10 @@ body.sidebar #sidebar {
   color: #000;
 }
 
+.steedos-input-table .antd-DropDown-popover .antd-PopOver-overlay {
+  display: none;
+}
+
 
 .steedos-record-selected {
   background: var(--Table-onChecked-bg) !important;

package/dist/amis-object.cjs.js

@@ -3570,8 +3570,8 @@ const Router$1 = {
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-07-20 16:29:22
- * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2023-12-28 14:59:08
+ * @LastEditors: liaodaxue
+ * @LastEditTime: 2024-01-25 14:44:17
  * @Description: 
  */
 
@@ -3643,6 +3643,25 @@ function getComparableAmisVersion() {
   }
 }
 
+/**
+ * 判断浏览器类型
+ * @returns 按需返回浏览器类型;
+ */
+ function getBowserType() {
+    const userAgent = navigator.userAgent;
+    if (userAgent.indexOf("Chrome")!== -1 && userAgent.indexOf("Safari") !== -1 && userAgent.indexOf("Edg") === -1) {
+      return "Chrome";
+    } else if (userAgent.indexOf("Firefox") !== -1) {
+      return "Firefox";
+    } else if (userAgent.indexOf("Safari") !== -1 && userAgent.indexOf("Chrome") === -1 && userAgent.indexOf("Edge") === -1) {
+      return "Safari";
+    } else if (userAgent.indexOf("Edg") !== -1) {
+      return "Edge";
+    } else {
+      return "Unknown browser"; // 其他浏览器...（可根据自己需要确定是否新增其他浏览器的判断）
+    }
+}
+
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-05-23 09:53:08
@@ -5046,7 +5065,8 @@ async function getQuickEditSchema(field, options){
                                         "failed": "失败了呢。。"
                                       }
                                     }
-                                }
+                                },
+                                "expression": "${!recordPermissions.modifyAllRecords}"
                             },
                             {
                                 "actionType": "setValue",
@@ -5062,7 +5082,7 @@ async function getQuickEditSchema(field, options){
                                 "componentId": quickEditId,
                                 "args": {
                                     "value":{
-                                        "quickedit_record_permissions": "${event.data}"
+                                        "quickedit_record_permissions": "${recordPermissions.modifyAllRecords ? {'allowEdit': true} : event.data}"
                                     }
                                 }
                             }
@@ -5126,7 +5146,7 @@ async function getQuickEditSchema(field, options){
                                           `
                                         }
                                     },
-                                    "expression":"${event.data.value}"
+                                    "expression":"${event.data.value && !recordPermissions.modifyAllRecords}"
                                 },
                                 {
                                     "actionType": "setValue",
@@ -5157,10 +5177,20 @@ async function getQuickEditSchema(field, options){
                                                         "script": `
                                                             const noPermission = event.data.noPermission;
                                                             const crudComponent = event.context.scoped.getComponentById("${options.crudId}");
-                                                            const selectedItems = crudComponent && crudComponent.props.store.selectedItems.concat();
+                                                            let selectedItems = crudComponent && crudComponent.props.store.selectedItems.concat();
                                                             noPermission.forEach(function (item) {
                                                                 crudComponent && crudComponent.unSelectItem(_.find(selectedItems,{_id:item}));
+                                                                _.remove(selectedItems, (selected) => selected._id === item);
                                                             })
+                                                            doAction({
+                                                                "componentId": "${quickEditId}",
+                                                                "actionType": "setValue",
+                                                                "args": {
+                                                                    "value": {
+                                                                        selectedItems
+                                                                    }
+                                                                }
+                                                            });
                                                         `
                                                     },
                                                     {
@@ -5251,7 +5281,8 @@ async function getTableColumns$1(fields, options){
         //增加quickEdit属性，实现快速编辑
         const quickEditSchema = allowEdit ? await getQuickEditSchema(field, options) : allowEdit;
         let className = "";
-        if(/Safari/.test(navigator.userAgent)){
+        const bowserType = getBowserType();
+        if(bowserType === "Safari"){
             className += " whitespace-nowrap ";
         }else {
             if(field.wrap != true){
@@ -5260,6 +5291,18 @@ async function getTableColumns$1(fields, options){
                 className += " break-words ";
             }
         }
+
+        if (typeof field.amis?.className == "object") {
+            className = {
+                [className]: "true",
+                ...field.amis.className
+            };
+        } else if (typeof field.amis?.className == "string") {
+            className = `${className} ${field.amis.className} `;
+        }
+        let fieldAmis = _$1__namespace.clone(field.amis);
+        delete fieldAmis?.className;
+
         let columnItem;
         if((field.is_name || field.name === options.labelFieldName) && options.objectName === 'cms_files'){
             const previewFileScript = `
@@ -5310,7 +5353,7 @@ async function getTableColumns$1(fields, options){
                 toggled: field.toggled,
                 static: true,
                 className,
-            }, field.amis, {name: field.name});
+            }, fieldAmis, {name: field.name});
         }else if(field.type === 'avatar' || field.type === 'image' || field.type === 'file'){
             columnItem = Object.assign({}, {
                 type: "switch",
@@ -5321,7 +5364,7 @@ async function getTableColumns$1(fields, options){
                 static: true,
                 className,
                 ...getAmisFileReadonlySchema(field)
-            }, field.amis, {name: field.name});
+            }, fieldAmis, {name: field.name});
         }
         else if(field.type === 'select'){
             const map = getSelectMap(field.options);
@@ -5336,7 +5379,7 @@ async function getTableColumns$1(fields, options){
                 className,
                 inputClassName: "inline",
                 static: true,
-            }, field.amis, {name: field.name});
+            }, fieldAmis, {name: field.name});
         }
         else {
             const tpl = await getFieldTpl(field, options);
@@ -5363,15 +5406,6 @@ async function getTableColumns$1(fields, options){
             // }
 
             //field上的amis属性里的clssname需要单独判断类型合并
-            if (typeof field.amis?.className == "object") {
-                className = {
-                    [className]: "true",
-                    ...field.amis.className
-                };
-            } else if (typeof field.amis?.className == "string") {
-                className = `${className} ${field.amis.className} `;
-            }
-            delete field.amis?.className;
 
             if(!field.hidden && !field.extra){
                 columnItem = Object.assign({}, {
@@ -5388,7 +5422,7 @@ async function getTableColumns$1(fields, options){
                     static: true,
                     options: field.type === 'html' ? {html: true} : null
                     // toggled: true 
-                }, field.amis, {name: field.name});
+                }, fieldAmis, {name: field.name});
                 
                 if(field.type === 'color'){
                     columnItem.type = 'color';
@@ -11792,14 +11826,7 @@ async function getObjectCRUD(objectSchema, fields, options){
           headers: {
             Authorization: "Bearer ${context.tenantId},${context.authToken}",
           },
-          requestAdaptor: quickSaveApiRequestAdaptor,
-          adaptor: `
-              if(payload.errors){
-                  payload.status = 2;
-                  payload.msg = window.t ? window.t(payload.errors[0].message) : payload.errors[0].message;
-              }
-              return payload;
-          `
+          requestAdaptor: quickSaveApiRequestAdaptor
         },
         // 外层data发生变化的时候, 不会重新渲染rowClassNameExpr, 所以先用css标记tr唯一标识
         // 使用表达式给tr添加初始选中状态
@@ -11816,6 +11843,21 @@ async function getObjectCRUD(objectSchema, fields, options){
       crudModeClassName = `steedos-crud-mode-${body.mode}`;
     }
 
+    body.quickSaveApi.adaptor = `
+      if(payload.errors){
+          payload.status = 2;
+          payload.msg = window.t ? window.t(payload.errors[0].message) : payload.errors[0].message;
+      }
+      debugger;
+      var scope = SteedosUI.getRef(context.scopeId);
+      var scopeParent = scope && scope.parent;
+      var crudScoped = scopeParent.getComponentById('${body.id}');
+      setTimeout(()=>{
+        crudScoped && crudScoped.control.updateAutoFillHeight();
+      }, 500);
+      return payload;
+    `;
+
     if(body.columns && options.formFactor != 'SMALL'){
       //将_display放入crud的columns的倒数第二列中（最后一列会影响固定列），可以通过setvalue修改行内数据域的_display，而不影响上层items的_display,用于批量编辑
       body.columns.splice(body.columns.length -1 , 0, {name: '_display',type: 'static', width: 1, placeholder: "",id: objectSchema.name + "_display_${_index}", tpl: "${''}"});
@@ -15365,7 +15407,7 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
             convertData = {
                 type: getAmisStaticFieldType$1('datetime', readonly),
                 inputFormat: 'YYYY-MM-DD HH:mm',
-                format: 'YYYY-MM-DDTHH:mm:ss.SSSZ',
+                format: 'YYYY-MM-DDTHH:mm:00.000Z',
                 tpl: readonly ? getDateTimeTpl(field) : null,
                 utc: true,
             };
@@ -16137,9 +16179,57 @@ function uuidv4() {
  * @Author: 殷亮辉 yinlianghui@hotoa.com
  * @Date: 2023-11-15 09:50:22
  * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2024-01-24 14:56:03
+ * @LastEditTime: 2024-01-26 17:47:16
  */
 
+/**
+ * 子表组件字段值中每行数据补上字段值为空的的字段值，把值统一设置为空字符串，是为了解决amis amis 3.6/6.0 input-table组件bug:行中字段值为空时会显示为父作用域中的同名变量值，见：https://github.com/baidu/amis/issues/9520
+ * amis #9520修正后此函数及相关代码可以移除
+ * @param {*} value 子表组件字段值，数组
+ * @param {*} fields 子表组件fields属性，数组
+ * @returns 转换后的子表组件字段值
+ */
+function getTableValueWithEmptyValue(value, fields) {
+    return (value || []).map((itemValue) => {
+        //这里不clone的话，会造成在pipeIn函数执行该函数后像pipeOut一样最终输出到表单项中，即库里字段值会被改了
+        const newItemValue = _$1.clone(itemValue);
+        (fields || []).forEach((itemField) => {
+            if(itemField.name && (newItemValue[itemField.name] === undefined || newItemValue[itemField.name] === null)){
+                // 这里newItemValue中不存在 itemField.name 属性，或者值为null时都会有“显示为父作用域中的同名变量值”的问题，所以null和undefined都要重置为空字符串
+                // 实测数字、下拉框、多选lookup等字段类型重置为空字符串都不会有问题，而且实测amis from组件的清空表单字段值功能就是把表单中的各种字段类型设置为空字符串，所以看起来也符合amis规范
+                newItemValue[itemField.name] = "";
+            }
+            if (newItemValue.children) {
+                newItemValue.children = getTableValueWithEmptyValue(newItemValue.children, fields);
+            }
+        });
+        return newItemValue;
+    });
+}
+
+/**
+ * 把子表组件字段值中每行数据中经过上面getTableValueWithEmptyValue函数空字段值移除
+ * amis #9520修正后此函数及相关代码可以移除
+ * @param {*} value 子表组件字段值，数组
+ * @param {*} fields 子表组件fields属性，数组
+ * @returns 转换后的子表组件字段值
+ */
+function getTableValueWithoutEmptyValue(value, fields) {
+    return (value || []).map((itemValue) => {
+        const newItemValue = _$1.clone(itemValue);
+        (fields || []).forEach((itemField) => {
+            if(itemField.name && (newItemValue[itemField.name] === "" || newItemValue[itemField.name] === undefined || newItemValue[itemField.name] === null)){
+                // 这里额外把null和undefined值也删除掉纯粹是没必要输出保存它们
+                delete newItemValue[itemField.name];
+            }
+            if (newItemValue.children) {
+                newItemValue.children = getTableValueWithoutEmptyValue(newItemValue.children, fields);
+            }
+        });
+        return newItemValue;
+    });
+}
+
 function getTablePrimaryKey(props) {
     return props.primaryKey || "_id";
 }
@@ -16218,6 +16308,7 @@ function getTableValueWithoutFieldPrefix(value, fieldPrefix) {
  * 子表组件字段值中每行数据的键值key补上指定前缀
  * @param {*} value 子表组件字段值，数组
  * @param {*} fieldPrefix 字段前缀
+ * @param {*} primaryKey 主键字段名，主键不参与被键值key规则，需要排除，审批王amis表单也是这个规则
  * @returns 转换后的子表组件字段值
  */
 function getTableValuePrependFieldPrefix(value, fieldPrefix, primaryKey) {
@@ -16485,9 +16576,14 @@ function getFormPagination(props, mode) {
                 "onEvent": {
                     "click": {
                         "actions": [
+                            {
+                                "actionType": "validate",
+                                "componentId": formId
+                            },
                             {
                                 "actionType": "custom",
-                                "script": onPageChangeScript
+                                "script": onPageChangeScript,
+                                "expression": "${!!!event.data.validateResult.error}" //触发表单校验结果会存入validateResult，amis 3.2不支持，高版本比如 3.5.3支持
                             }
                         ]
                     }
@@ -16512,9 +16608,14 @@ function getFormPagination(props, mode) {
                 "onEvent": {
                     "click": {
                         "actions": [
+                            {
+                                "actionType": "validate",
+                                "componentId": formId
+                            },
                             {
                                 "actionType": "custom",
-                                "script": onPageChangeScript
+                                "script": onPageChangeScript,
+                                "expression": "${!!!event.data.validateResult.error}" //触发表单校验结果会存入validateResult，amis 3.2不支持，高版本比如 3.5.3支持
                             }
                         ]
                     }
@@ -17006,9 +17107,14 @@ async function getButtonActions(props, mode) {
                     "onEvent": {
                         "click": {
                             "actions": [
+                                {
+                                    "actionType": "validate",
+                                    "componentId": formId
+                                },
                                 {
                                     "actionType": "custom",
-                                    "script": onSaveAndNewItemScript
+                                    "script": onSaveAndNewItemScript,
+                                    "expression": "${!!!event.data.validateResult.error}" //触发表单校验结果会存入validateResult，amis 3.2不支持，高版本比如 3.5.3支持
                                 }
                             ]
                         }
@@ -17021,9 +17127,14 @@ async function getButtonActions(props, mode) {
                     "onEvent": {
                         "click": {
                             "actions": [
+                                {
+                                    "actionType": "validate",
+                                    "componentId": formId
+                                },
                                 {
                                     "actionType": "custom",
-                                    "script": onSaveAndCopyItemScript
+                                    "script": onSaveAndCopyItemScript,
+                                    "expression": "${!!!event.data.validateResult.error}" //触发表单校验结果会存入validateResult，amis 3.2不支持，高版本比如 3.5.3支持
                                 }
                             ]
                         }
@@ -17289,18 +17400,51 @@ async function getButtonView(props) {
 
 async function getButtonDelete(props) {
     return {
-        "type": "button",
-        "label": "",
-        "icon": "fa fa-trash-alt",//不可以用fa-trash-o，因为设计字段布局界面中弹出的设置分组列表中显示不了这个图标
+        "type": "dropdown-button",
         "level": "link",
-        "onEvent": {
-            "click": {
-                "actions": await getButtonActions(props, "delete")
+        "icon": "fa fa-trash-alt",
+        "size": "xs",
+        "hideCaret": true,
+        "closeOnClick": true,
+        "body": [
+            {
+                "type": "wrapper",
+                "size": "md",
+                "className": "w-80",
+                "body": [
+                    {
+                        "tpl": "确定要删除吗？",
+                        "type": "tpl"
+                    },
+                    {
+                        "type": "flex",
+                        "justify": "flex-end",
+                        "className": "mt-3",
+                        "items": [
+                            {
+                                "type": "button",
+                                "label": "取消",
+                                "className": "mr-2"
+                            },
+                            {
+                                "type": "button",
+                                "label": "删除",
+                                "level": "danger",
+                                "onEvent": {
+                                    "click": {
+                                        "actions": await getButtonActions(props, "delete")
+                                    }
+                                }
+                            }
+                        ]
+                    }
+                ]
             }
-        }
-    };
+        ]
+    }
 }
 
+
 const getAmisInputTableSchema = async (props) => {
     if (!props.id) {
         props.id = "steedos_input_table_" + props.name + "_" + Math.random().toString(36).substr(2, 9);
@@ -17373,6 +17517,7 @@ const getAmisInputTableSchema = async (props) => {
             if (fieldPrefix) {
                 value = getTableValueWithoutFieldPrefix(value, fieldPrefix);
             }
+            value = getTableValueWithEmptyValue(value, fields);
             if (primaryKey) {
                 // 这里临时给每行数据补上primaryKey字段值，如果库里不需要保存这里补上的字段值，pipeOut中会识别autoGeneratePrimaryKeyValue属性选择最终移除这里补上的字段值
                 // 这里始终自动生成primaryKey字段值，而不是只在pipeOut输出整个子表字段值时才生成，是因为要支持当数据库里保存的子表字段行数据没有primaryKey字段值时的行嵌套模式（即节点的children属性）功能
@@ -17394,6 +17539,7 @@ const getAmisInputTableSchema = async (props) => {
             if (fieldPrefix) {
                 value = getTableValuePrependFieldPrefix(value, fieldPrefix, primaryKey);
             }
+            value = getTableValueWithoutEmptyValue(value, fields);
             if (props.autoGeneratePrimaryKeyValue === true) {
                 // 如果需要把自动生成的primaryKey值输出保存的库中，则补全所有行中的primaryKey值
                 // 这里如果不全部补全的话，初始从库里返回的字段值中拿到的行没primaryKey值的话就不会自动补上
@@ -17422,6 +17568,10 @@ const getAmisInputTableSchema = async (props) => {
             "width": buttonsForColumnOperations.length > 1 ? "60px" : "20px"
         });
     }
+    // if (showAsInlineEditMode) {
+    //     // 因为要支持不同的列上配置inlineEditMode属性，所有不可以把整个子表组件都设置为inlineEditMode
+    //     inputTableSchema.needConfirm = false;
+    // }
     if (amis) {
         // 支持配置amis属性重写或添加最终生成的input-table中任何属性。
         delete amis.id;//如果steedos-input-table组件配置了amis.id属性，会造成新建编辑行功能不生效
@@ -17462,6 +17612,17 @@ const getAmisInputTableSchema = async (props) => {
             "body": headerToolbar
         });
     }
+    let className = "steedos-input-table";
+
+    if (typeof props.className == "object") {
+        className = {
+            [className]: "true",
+            ...props.className
+        };
+    } else if (typeof props.className == "string") {
+        className = `${className} ${props.className} `;
+    }
+
     let schema = {
         "type": "control",
         "body": {
@@ -17475,7 +17636,7 @@ const getAmisInputTableSchema = async (props) => {
         "labelAlign": props.labelAlign,
         //控制control的mode属性，https://aisuda.bce.baidu.com/amis/zh-CN/components/form/formitem#表单项展示
         "mode": props.mode || null,
-        "className": props.className
+        className
     };
     // console.log("===schema===", schema);
     return schema;
@@ -20374,10 +20535,11 @@ var AmisObjectFieldLookup = function (props) {
 };
 
 var AmisObjectButton = function (props) {
+    var _a;
     // console.log(`AmisObjectButton=====》`, props)
     var objectName = props.objectName, name = props.name, data = props.data, render = props.render, className = props.className, listViewId = props.listViewId;
-    var _a = __read(React.useState(), 2), button = _a[0], setButton = _a[1];
-    var _b = __read(React.useState(), 2), uiSchema = _b[0], setUiSchema = _b[1];
+    var _b = __read(React.useState(), 2), button = _b[0], setButton = _b[1];
+    var _c = __read(React.useState(), 2), uiSchema = _c[0], setUiSchema = _c[1];
     //TODO 处理上下文参数
     var appId = data.appId;
     var formFactor = data.formFactor;
@@ -20446,6 +20608,7 @@ var AmisObjectButton = function (props) {
             }
             if (renderData) {
                 delete renderData.event;
+                (_a = renderData.record) === null || _a === void 0 ? true : delete _a.event;
             }
             schema.data = _$1.defaultsDeep({}, renderData, getDefaultRenderData(), schema.data);
             delete schema.data.event;