@steedos-widgets/amis-object 1.2.35 → 1.2.36

package/dist/amis-object.cjs.js

@@ -3568,8 +3568,8 @@ function getContrastColor(bgColor) {
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-05-23 09:53:08
- * @LastEditors: liaodaxue
- * @LastEditTime: 2023-07-28 16:26:31
+ * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+ * @LastEditTime: 2023-08-03 18:07:54
  * @Description: 
  */
 
@@ -3651,7 +3651,11 @@ function getNameTplUrl(field, ctx){
 
 function getNameTpl(field, ctx){
     const href = getNameTplUrl(field, ctx);
-    return `<a href="${href}">\${${field.name}}</a>`
+    let linkTarget = "";
+    if(ctx && ctx.isLookup){
+        linkTarget = "target='_blank'";
+    }
+    return `<a href="${href}" ${linkTarget}>\${${field.name}}</a>`
 }
 
 function getRelatedFieldTpl(field, ctx){
@@ -3664,6 +3668,11 @@ function getRelatedFieldTpl(field, ctx){
         }
     }
 
+    let linkTarget = "";
+    if(ctx && ctx.isLookup){
+        linkTarget = "target='_blank'";
+    }
+
     const onlyDisplayLabel = ctx.onlyDisplayLabel;
 
     let fieldDataStrTpl = `data._display.${field.name}`;
@@ -3679,7 +3688,7 @@ function getRelatedFieldTpl(field, ctx){
                 const href = Router$1.getObjectDetailPath({
                     formFactor: ctx.formFactor, appId: "<%=data.appId%>", objectName: `<%=item.objectName%>`, recordId: `<%=item.value%>`, _templateType: "JavaScript"
                 });
-                labelTpl = `<a href="${href}"><%=item.label%></a>`;
+                labelTpl = `<a href="${href}" ${linkTarget}><%=item.label%></a>`;
             }
             tpl = `
             <% if (${fieldDataStrTpl} && ${fieldDataStrTpl}.length) { %><% ${fieldDataStrTpl}.forEach(function(item,index) { %> <% if(index>0 && index<${fieldDataStrTpl}.length){ %> , <% } %> ${labelTpl}  <% }); %><% } %>
@@ -3697,7 +3706,7 @@ function getRelatedFieldTpl(field, ctx){
                 const href = Router$1.getObjectDetailPath({
                     formFactor: ctx.formFactor, appId: "${appId}", objectName: `${objectNameTpl}`, recordId: `${recordIdTpl}`
                 });
-                labelTpl = `<a href="${href}">${labelTpl}</a>`;
+                labelTpl = `<a href="${href}" ${linkTarget}>${labelTpl}</a>`;
             }
             tpl = labelTpl;
         }
@@ -3709,7 +3718,7 @@ function getRelatedFieldTpl(field, ctx){
             const href = Router$1.getObjectDetailPath({
                 formFactor: ctx.formFactor, appId: "<%=data.appId%>", objectName: `<%=item.objectName%>`, recordId: `<%=item.value%>`, _templateType: "JavaScript"
             });
-            labelTpl = `<a href="${href}"><%=item.label%></a>`;
+            labelTpl = `<a href="${href}" ${linkTarget}><%=item.label%></a>`;
         }
         tpl = `
         <% if (${fieldDataStrTpl} && ${fieldDataStrTpl}.length) { %><% ${fieldDataStrTpl}.forEach(function(item) { %> ${labelTpl}  <% }); %><% } %>
@@ -6420,12 +6429,6 @@ async function getObjectFieldsFilterFormSchema(ctx) {
             if (
               field && window.isFieldTypeSearchable(field.type)
             ) {
-              delete field.defaultValue;
-              delete field.required;
-              delete field.is_wide;
-              delete field.readonly;
-              delete field.hidden;
-              delete field.omit;
               var ctx = ${JSON.stringify(ctx)};
               const amisField = window.getFieldSearchable(field, fields, ctx);
               return amisField;
@@ -6580,9 +6583,7 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
       setData({ showFieldsFilter: false });
     }
     else{
-      console.log("===listViewPropsStoreKey=data==", data);
       const listViewPropsStoreKey = location.pathname + "/crud/" + (data.listViewId || "");
-      console.log("===listViewPropsStoreKey=122==", listViewPropsStoreKey);
       let localListViewProps = sessionStorage.getItem(listViewPropsStoreKey);
       if(localListViewProps){
         localListViewProps = JSON.parse(localListViewProps);
@@ -8905,6 +8906,10 @@ async function lookupToAmisPicker(field, readonly, ctx){
         return ;
     }
     const refObjectConfig = await getUISchema(referenceTo.objectName);
+
+    ctx.idFieldName = refObjectConfig.idFieldName;
+    ctx.objectName = refObjectConfig.name;
+
     const tableFields = [];
     let i = 0;
     const searchableFields = [];
@@ -9272,7 +9277,6 @@ async function lookupToAmisPicker(field, readonly, ctx){
     if(readonly){
         data.tpl = await getLookupTpl(field, ctx);
     }
-
     return data;
 }
 
@@ -10602,6 +10606,24 @@ async function getFieldSearchable(perField, permissionFields, ctx){
         _field.multiple = true;
         _field.is_wide = false;
         _field.defaultValue = undefined;
+        _field.required = false;
+        _field.hidden = false;
+        _field.omit = false;
+
+        if(_field.amis){
+            delete _field.amis.static;
+            delete _field.amis.staticOn;
+            delete _field.amis.disabled;
+            delete _field.amis.disabledOn;
+            delete _field.amis.required;
+            delete _field.amis.requiredOn;
+            delete _field.amis.visible;
+            delete _field.amis.visibleOn;
+            delete _field.amis.hidden;
+            delete _field.amis.hiddenOn;
+            delete _field.amis.autoFill;
+        }
+
         const amisField = await convertSFieldToAmisField(_field, false, Object.assign({}, ctx, {fieldNamePrefix: fieldNamePrefix, required: false, showSystemFields: true, inFilterForm: true}));
         if(amisField){
             return amisField;
@@ -10879,6 +10901,7 @@ async function getTableColumns$1(fields, options){
         if(field.wrap != true){
             className += " whitespace-nowrap";
         }
+        let columnItem;
         if((field.is_name || field.name === options.labelFieldName) && options.objectName === 'cms_files'){
             const previewFileScript = `
                 var data = event.data;
@@ -10886,12 +10909,11 @@ async function getTableColumns$1(fields, options){
                 var file_id = data._id;
                 SteedosUI.previewFile && SteedosUI.previewFile({file_name, file_id});
             `;
-            columns.push({
+            columnItem = {
                 "type": "button",
                 "label": `<%=data.versions ? data.name : "${field.label}"%>`,
                 className,
                 "level": "link",
-                "quickEdit": quickEditSchema,
                 "onEvent": {
                   "click": {
                     "actions": [
@@ -10917,9 +10939,9 @@ async function getTableColumns$1(fields, options){
                     ]
                   }
                 }
-            });
+            };
         }else if(field.type === 'toggle'){
-            columns.push(Object.assign({}, {
+            columnItem = Object.assign({}, {
                 type: "switch",
                 name: field.name,
                 label: field.label,
@@ -10927,24 +10949,22 @@ async function getTableColumns$1(fields, options){
                 toggled: field.toggled,
                 static: true,
                 className,
-                quickEdit: quickEditSchema
-            }, field.amis, {name: field.name}));
+            }, field.amis, {name: field.name});
         }else if(field.type === 'avatar' || field.type === 'image' || field.type === 'file'){
-            columns.push(Object.assign({}, {
+            columnItem = Object.assign({}, {
                 type: "switch",
                 name: field.name,
                 label: field.label,
                 width: getFieldWidth(field.width),
                 toggled: field.toggled,
-                quickEdit: quickEditSchema,
                 static: true,
                 className,
                 ...getAmisFileReadonlySchema(field)
-            }, field.amis, {name: field.name}));
+            }, field.amis, {name: field.name});
         }
         else if(field.type === 'select'){
             const map = getSelectMap(field.options);
-            columns.push(Object.assign({}, {
+            columnItem = Object.assign({}, {
                 type: "mapping",
                 name: field.name,
                 label: field.label,
@@ -10954,8 +10974,7 @@ async function getTableColumns$1(fields, options){
                 toggled: field.toggled,
                 className,
                 static: true,
-                quickEdit: quickEditSchema
-            }, field.amis, {name: field.name}));
+            }, field.amis, {name: field.name});
         }
         else {
             const tpl = await getFieldTpl(field, options);
@@ -10975,7 +10994,7 @@ async function getTableColumns$1(fields, options){
                 className += 'min-w-56';
             }
             if(!field.hidden && !field.extra){
-                columns.push(Object.assign({}, {
+                columnItem = Object.assign({}, {
                     name: field.name,
                     label: field.label,
                     sortable: field.sortable,
@@ -10986,13 +11005,18 @@ async function getTableColumns$1(fields, options){
                     toggled: field.toggled,
                     className,
                     static: true,
-                    quickEdit: quickEditSchema,
                     options: field.type === 'html' ? {html: true} : null
                     // toggled: true 
-                }, field.amis, {name: field.name}));
+                }, field.amis, {name: field.name});
             }
         }
-
+        if(columnItem){
+            if(quickEditSchema){
+                columnItem.quickEdit = quickEditSchema;
+                columnItem.quickEditEnabledOn = "${is_system !== true}";
+            }
+            columns.push(columnItem);
+        }
     }
     // columns.push(getOperation(fields));
     if(!___default__namespace.some(columns, { name: options.labelFieldName })){
@@ -11298,6 +11322,7 @@ async function getTableOperation(ctx){
 }
 
 async function getTableSchema$1(fields, options){
+    let isLookup = options && options.isLookup;
     if(!options){
         options = {};
     }
@@ -11307,7 +11332,9 @@ async function getTableSchema$1(fields, options){
     }
     else {
         columns = await getTableColumns$1(fields, options);
-        columns.push(await getTableOperation(options));
+        if(!isLookup){
+            columns.push(await getTableOperation(options));
+        }
     }
     return {
         mode: "table",
@@ -19279,14 +19306,16 @@ 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-07-31 10:22:56
+ * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+ * @LastEditTime: 2023-08-03 13:32:08
  * @Description:
  */
 var getSelectFlowSchema = function (id, props) {
     var label = props.label, data = props.data, name = props.name, required = props.required, _a = props.action, action = _a === void 0 ? "query" : _a, _b = props.distributeInstanceId, distributeInstanceId = _b === void 0 ? "" : _b, _c = props.distributeStepId, distributeStepId = _c === void 0 ? "" : _c, _d = props.mode, mode = _d === void 0 ? "input-tree" : _d, className = props.className, onEvent = props.onEvent, _e = props.multiple, multiple = _e === void 0 ? false : _e, delimiter = props.delimiter, joinValues = props.joinValues, extractValue = props.extractValue, searchable = props.searchable, _f = props.showIcon, showIcon = _f === void 0 ? true : _f, _g = props.showRadio, showRadio = _g === void 0 ? false : _g, showOutline = props.showOutline, initiallyOpen = props.initiallyOpen, unfoldedLevel = props.unfoldedLevel, treeContainerClassName = props.treeContainerClassName, _h = props.amis, amis = _h === void 0 ? {} : _h;
     // console.log(`=====onEvent`, onEvent)
-    return __assign$2({ type: mode, id: id, label: label, name: name, options: [], multiple: multiple, delimiter: delimiter, joinValues: joinValues, extractValue: extractValue, searchable: searchable, showOutline: showOutline, initiallyOpen: initiallyOpen, unfoldedLevel: unfoldedLevel, className: "overflow-y-auto " + className, required: required, treeContainerClassName: treeContainerClassName, heightAuto: true, menuTpl: mode === 'input-tree' ? {
+    return __assign$2({ type: mode, id: id, label: label, name: name, options: [], multiple: multiple, delimiter: delimiter, joinValues: joinValues, extractValue: extractValue, searchable: searchable, showOutline: showOutline, initiallyOpen: initiallyOpen, unfoldedLevel: unfoldedLevel, 
+        // className: `overflow-y-auto ` + className,
+        className: className, required: required, treeContainerClassName: treeContainerClassName, heightAuto: true, menuTpl: mode === 'input-tree' ? {
             type: "tpl",
             tpl: "<div class='flex'><span>${label}</span><span class='rounded p-1 text-xs text-center w-14 ${value == 'startFlows' ? '' : 'hidden'}'><button class='antd-Button antd-Button--link m-none p-none'>设置</button></span></div>",
             onEvent: {