@steedos-widgets/amis-lib 3.6.2-beta.12 → 3.6.2-beta.13

package/dist/index.esm.js

@@ -2972,15 +2972,8 @@ async function getTableApi(mainObject, fields, options){
                 }
             });
         };
-        let isTreeOptionsComputed = false;
-        if(records.length === 1 && records[0].children){
-            isTreeOptionsComputed = true;
-        }
-        if(!isTreeOptionsComputed){
-            // 如果api接口设置在缓存，缓存期间并不会重新请求接口，payload.data.rows是上次计算后的结果
-            payload.data.rows = getTreeOptions(records,{"valueField":"_id"});
-            assignIndexToTreeRecords(payload.data.rows, '');
-        }
+        payload.data.rows = getTreeOptions(records,{"valueField":"_id"});
+        assignIndexToTreeRecords(payload.data.rows, '');
     }
 
 
@@ -4876,9 +4869,16 @@ const getSchema$2 = (uiSchema) => {
                       "form": {
                         debug: false,
                         resetAfterSubmit: false,
+                        data: {
+                          editFormInited: true,
+                        },
                         initApi: {
+                          method: 'GET',
                           url: '/api/v1/queue_import_history/${recordId}?fields=["state"]',
                           sendOn: 'this.recordId',
+                          data: null,
+                          requestAdaptor: "return api;",
+                          adaptor: "return payload;",
                           responseData: {
                             importState: "${state}"
                           }
@@ -9000,7 +9000,7 @@ const getRecordPermissions = async (objectName, recordId)=>{
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-07-05 15:55:39
  * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2024-01-15 10:34:46
+ * @LastEditTime: 2024-01-24 10:18:17
  * @Description:
  */
 
@@ -9099,7 +9099,9 @@ async function getRecordDetailRelatedListSchema(objectName, recordId, relatedObj
                     const foreign_key_value = arr[2] ? arr[1]+'.'+arr[2] : arr[1];
                     mainRelated[arr[0]] = foreign_key_value;
                 }
-            }else {
+            }
+            // 防止related_lists中没有相关子表，但是details中有相关子表的情况
+            if(!mainRelated[relatedObjectName]){
                 const details = union(mainObjectUiSchema.details,mainObjectUiSchema.lookup_details) || [];
                 for (const detail of details) {
                     const arr = detail.split(".");
@@ -10726,6 +10728,7 @@ function getLookupSapceUserTreeSchema(isMobile){
           }
         },
         "label": "",
+        "mode": "normal",
         "name": "organizations",
         "multiple": false,
         "joinValues": false,
@@ -12953,10 +12956,10 @@ function uuidv4() {
  * @Author: 殷亮辉 yinlianghui@hotoa.com
  * @Date: 2023-11-15 09:50:22
  * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2024-01-22 15:59:32
+ * @LastEditTime: 2024-01-24 14:56:03
  */
 
-function getTablePrimaryKey(props){
+function getTablePrimaryKey(props) {
     return props.primaryKey || "_id";
 }
 
@@ -12966,22 +12969,22 @@ function getTablePrimaryKey(props){
  * @param {*} primaryKey 主键字段名，一般为_id
  * @returns 转换后的子表组件字段值
  */
-function getTableValueWithPrimaryKeyValue(value, primaryKey){
-    if(!primaryKey){
+function getTableValueWithPrimaryKeyValue(value, primaryKey) {
+    if (!primaryKey) {
         return value;
     }
-    return (value || []).map((itemValue)=>{
+    return (value || []).map((itemValue) => {
         //这里不clone的话，会造成在pipeIn函数执行该函数后像pipeOut一样最终输出到表单项中，即库里把primaryKey字段值保存了
         const newItemValue = clone(itemValue);
-        if(newItemValue[primaryKey]){
-            if(newItemValue.children){
+        if (newItemValue[primaryKey]) {
+            if (newItemValue.children) {
                 newItemValue.children = getTableValueWithPrimaryKeyValue(newItemValue.children, primaryKey);
             }
             return newItemValue;
         }
         else {
             newItemValue[primaryKey] = uuidv4();
-            if(newItemValue.children){
+            if (newItemValue.children) {
                 newItemValue.children = getTableValueWithPrimaryKeyValue(newItemValue.children, primaryKey);
             }
             return newItemValue;
@@ -12995,14 +12998,14 @@ function getTableValueWithPrimaryKeyValue(value, primaryKey){
  * @param {*} primaryKey 主键字段名，一般为_id
  * @returns 转换后的子表组件字段值
  */
-function getTableValueWithoutPrimaryKeyValue(value, primaryKey){
-    if(!primaryKey){
+function getTableValueWithoutPrimaryKeyValue(value, primaryKey) {
+    if (!primaryKey) {
         return value;
     }
-    return (value || []).map((itemValue)=>{
+    return (value || []).map((itemValue) => {
         //这里clone只是为了保险，不是必须的，每次修改子表数据是否都会生成新的primaryKey字段值是由pipeOut中识别autoGeneratePrimaryKeyValue决定的，跟这里没关系
         const newItemValue = clone(itemValue);
-        if(newItemValue.children){
+        if (newItemValue.children) {
             newItemValue.children = getTableValueWithoutPrimaryKeyValue(newItemValue.children, primaryKey);
         }
         delete newItemValue[primaryKey];
@@ -13016,12 +13019,12 @@ function getTableValueWithoutPrimaryKeyValue(value, primaryKey){
  * @param {*} fieldPrefix 字段前缀
  * @returns 转换后的子表组件字段值
  */
-function getTableValueWithoutFieldPrefix(value, fieldPrefix){
+function getTableValueWithoutFieldPrefix(value, fieldPrefix) {
     let convertedValue = [];
-    (value || []).forEach((itemValue)=>{
+    (value || []).forEach((itemValue) => {
         var newItemValue = {};
-        for(let n in itemValue){
-            if(itemValue.hasOwnProperty(n)){
+        for (let n in itemValue) {
+            if (itemValue.hasOwnProperty(n)) {
                 newItemValue[n.replace(new RegExp(`^${fieldPrefix}`), "")] = itemValue[n];
             }
         }
@@ -13036,16 +13039,16 @@ function getTableValueWithoutFieldPrefix(value, fieldPrefix){
  * @param {*} fieldPrefix 字段前缀
  * @returns 转换后的子表组件字段值
  */
-function getTableValuePrependFieldPrefix(value, fieldPrefix, primaryKey){
+function getTableValuePrependFieldPrefix(value, fieldPrefix, primaryKey) {
     let convertedValue = [];
-    (value || []).forEach((itemValue)=>{
+    (value || []).forEach((itemValue) => {
         var newItemValue = {};
-        for(let n in itemValue){
-            if(itemValue.hasOwnProperty(n) && typeof itemValue[n] !== undefined && n !== primaryKey){
+        for (let n in itemValue) {
+            if (itemValue.hasOwnProperty(n) && typeof itemValue[n] !== undefined && n !== primaryKey) {
                 newItemValue[`${fieldPrefix}${n}`] = itemValue[n];
             }
         }
-        if(primaryKey && itemValue[primaryKey]){
+        if (primaryKey && itemValue[primaryKey]) {
             newItemValue[primaryKey] = itemValue[primaryKey];
         }
         convertedValue.push(newItemValue);
@@ -13059,7 +13062,7 @@ function getTableValuePrependFieldPrefix(value, fieldPrefix, primaryKey){
  * @param {*} fieldPrefix 字段前缀
  * @returns 转换后的子表组件字段值
  */
-function getTableFieldsWithoutFieldPrefix(fields, fieldPrefix){
+function getTableFieldsWithoutFieldPrefix(fields, fieldPrefix) {
     return (fields || []).map((item) => {
         const newItem = clone(item);//这里不clone的话，会造成子表组件重新render，从而审批王那边点开子表行编辑窗口时报错
         newItem.name = newItem.name.replace(new RegExp(`^${fieldPrefix}`), "");
@@ -13097,6 +13100,7 @@ function getInputTableCell(field, showAsInlineEditMode) {
             name: field.name,
             quickEdit: {
                 "type": "steedos-field",
+                "mode": "inline",
                 "config": Object.assign({}, field, {
                     label: false
                 })
@@ -13176,7 +13180,9 @@ async function getInputTableColumns(props) {
                 }
             }
             if (field) {
-                let tableCell = getInputTableCell(field, showAsInlineEditMode);
+                let mode = typeof extendColumnProps.inlineEditMode === "boolean" ?
+                    extendColumnProps.inlineEditMode : showAsInlineEditMode;
+                let tableCell = getInputTableCell(field, mode);
                 return Object.assign({}, tableCell, extendColumnProps);
             }
             else {
@@ -13199,7 +13205,7 @@ async function getInputTableColumns(props) {
  */
 function getFormPagination(props, mode) {
     let showPagination = true;
-    if(mode === "new" && !!!props.editable){
+    if (mode === "new" && !!!props.editable) {
         //不允许编辑只允许新建时不应该让用户操作翻页
         showPagination = false;
     }
@@ -13639,7 +13645,7 @@ async function getButtonActions(props, mode) {
     let formPaginationId = getComponentId("form_pagination", props.id);
     let parentFormData = "${__super.__super.__super.__super || {}}";
     let amisVersion = getComparableAmisVersion();
-    if(amisVersion < 3.6){
+    if (amisVersion < 3.6) {
         parentFormData = "${__super.__super || {}}";
     }
     if (mode == "new" || mode == "edit") {
@@ -13803,13 +13809,13 @@ async function getButtonActions(props, mode) {
         `;
         let dialogButtons = [
             {
-            "type": "button",
-            "label": "完成",
-            "actionType": "confirm",
-            "level": "primary"
+                "type": "button",
+                "label": "完成",
+                "actionType": "confirm",
+                "level": "primary"
             }
         ];
-        if(props.addable){
+        if (props.addable) {
             // 有新增行权限时额外添加新增和复制按钮
             dialogButtons = [
                 {
@@ -13882,7 +13888,7 @@ async function getButtonActions(props, mode) {
                     // 在节点嵌套情况下，当前节点正好是带children属性的节点的话，这里弹出的dialog映射到的会是children数组，这是amis目前的规则，
                     // 所以这里加判断有children时，用__super.__super让映射到正确的作用域层，如果不加，则__tableItems取到的会是children数组，而不是整个子表组件的值
                     "__tableItems": `\${((children ? __super.__super.${props.name} : __super.${props.name}) || [])|json|toJson}`
-        },
+                },
                 "actions": dialogButtons,
                 "onEvent": {
                     "confirm": {
@@ -14120,7 +14126,7 @@ const getAmisInputTableSchema = async (props) => {
     }
     let primaryKey = getTablePrimaryKey(props);
     let showOperation = props.showOperation;
-    if(showOperation !== false){
+    if (showOperation !== false) {
         showOperation = true;
     }
     let fieldPrefix = props.fieldPrefix;
@@ -14132,7 +14138,7 @@ const getAmisInputTableSchema = async (props) => {
     let buttonsForColumnOperations = [];
     let inlineEditMode = props.inlineEditMode;
     let showAsInlineEditMode = inlineEditMode && props.editable;
-    if(showOperation){
+    if (showOperation) {
         if (props.editable) {
             let showEditButton = true;
             if (showAsInlineEditMode) {
@@ -14183,31 +14189,31 @@ const getAmisInputTableSchema = async (props) => {
         "showFooterAddBtn": false,
         "className": props.tableClassName,
         "pipeIn": (value, data) => {
-            if(fieldPrefix){
+            if (fieldPrefix) {
                 value = getTableValueWithoutFieldPrefix(value, fieldPrefix);
             }
-            if(primaryKey){
+            if (primaryKey) {
                 // 这里临时给每行数据补上primaryKey字段值，如果库里不需要保存这里补上的字段值，pipeOut中会识别autoGeneratePrimaryKeyValue属性选择最终移除这里补上的字段值
                 // 这里始终自动生成primaryKey字段值，而不是只在pipeOut输出整个子表字段值时才生成，是因为要支持当数据库里保存的子表字段行数据没有primaryKey字段值时的行嵌套模式（即节点的children属性）功能
                 // 这里要注意，流程详细设置界面的字段设置功能中的子表组件中，数据库里保存的子表字段行数据是有primaryKey字段值的，它不依赖这里自动生成行primaryKey值功能
                 value = getTableValueWithPrimaryKeyValue(value, primaryKey);
             }
-            if(amis.pipeIn){
-                if(typeof amis.pipeIn === 'function'){
+            if (amis.pipeIn) {
+                if (typeof amis.pipeIn === 'function') {
                     return amis.pipeIn(value, data);
                 }
             }
             return value;
         },
         "pipeOut": (value, data) => {
-            value = (value || []).map(function(item){
+            value = (value || []).map(function (item) {
                 delete item.__fix_rerender_after_children_modified_tag;
                 return item;
             });
-            if(fieldPrefix){
+            if (fieldPrefix) {
                 value = getTableValuePrependFieldPrefix(value, fieldPrefix, primaryKey);
             }
-            if(props.autoGeneratePrimaryKeyValue === true){
+            if (props.autoGeneratePrimaryKeyValue === true) {
                 // 如果需要把自动生成的primaryKey值输出保存的库中，则补全所有行中的primaryKey值
                 // 这里如果不全部补全的话，初始从库里返回的字段值中拿到的行没primaryKey值的话就不会自动补上
                 value = getTableValueWithPrimaryKeyValue(value, primaryKey);
@@ -14219,8 +14225,8 @@ const getAmisInputTableSchema = async (props) => {
                 // 只有autoGeneratePrimaryKey配置为true时，每行的primaryKey字段值才会始终保持不变
                 value = getTableValueWithoutPrimaryKeyValue(value, primaryKey);
             }
-            if(amis.pipeOut){
-                if(typeof amis.pipeOut === 'function'){
+            if (amis.pipeOut) {
+                if (typeof amis.pipeOut === 'function') {
                     return amis.pipeOut(value, data);
                 }
             }
@@ -14235,9 +14241,6 @@ const getAmisInputTableSchema = async (props) => {
             "width": buttonsForColumnOperations.length > 1 ? "60px" : "20px"
         });
     }
-    if (showAsInlineEditMode) {
-        inputTableSchema.needConfirm = false;
-    }
     if (amis) {
         // 支持配置amis属性重写或添加最终生成的input-table中任何属性。
         delete amis.id;//如果steedos-input-table组件配置了amis.id属性，会造成新建编辑行功能不生效
@@ -14279,19 +14282,19 @@ const getAmisInputTableSchema = async (props) => {
         });
     }
     let schema = {
-        "type": "service",
-        "body": [
-            {
-                "type": "control",
-                "body": schemaBody,
-                "label": props.label,
-                "labelClassName": props.label ? props.labelClassName : "none",
-                "labelRemark": props.labelRemark,
-                "labelAlign": props.labelAlign
-            }
-        ],
-        "className": props.className,
-        "id": serviceId
+        "type": "control",
+        "body": {
+            "type": "service",
+            "body": schemaBody,
+            "id": serviceId
+        },
+        "label": props.label,
+        "labelClassName": props.label ? props.labelClassName : "none",
+        "labelRemark": props.labelRemark,
+        "labelAlign": props.labelAlign,
+        //控制control的mode属性，https://aisuda.bce.baidu.com/amis/zh-CN/components/form/formitem#表单项展示
+        "mode": props.mode || null,
+        "className": props.className
     };
     // console.log("===schema===", schema);
     return schema;