@steedos-widgets/amis-lib 1.2.9 → 1.2.11

package/dist/index.cjs.js

@@ -409,11 +409,28 @@ const Router = {
 
 };
 
+/*
+ * @Author: baozhoutao@steedos.com
+ * @Date: 2022-07-20 16:29:22
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2023-05-18 15:22:51
+ * @Description: 
+ */
+
+function getContrastColor(bgColor) {
+  var backgroundColor = (bgColor.charAt(0) === '#') ? bgColor.substring(1, 7) : bgColor;
+  var r = parseInt(backgroundColor.substr(0, 2), 16);
+  var g = parseInt(backgroundColor.substr(2, 2), 16);
+  var b = parseInt(backgroundColor.substr(4, 2), 16);
+  var brightness = (r * 299 + g * 587 + b * 114) / 1000;
+  return brightness < 128 ? "#ffffff" : "#000000";
+}
+
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-05-23 09:53:08
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2023-04-10 11:22:54
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2023-05-22 15:13:18
  * @Description: 
  */
 
@@ -466,6 +483,22 @@ async function getRefObjectNameFieldName(field){
 function getSelectTpl(field){
     return `<div>\${_display.${field.name}}</div>`
 }
+function getSelectMap(selectOptions){
+    let map = {};
+    _$1.forEach(selectOptions,(option)=>{
+        const optionValue = option.value + '';
+        const optionColor = option.color + '';
+        if(optionColor){
+            const background = optionColor.charAt(0) === '#' ? optionColor : '#'+optionColor;
+            const color = getContrastColor(background);
+            const optionColorStyle = 'background:'+background+';color:'+color;
+            map[optionValue] = `<span class="rounded-xl px-2 py-1" style='${optionColorStyle}'>${option.label}</span>`;
+        }else {
+            map[optionValue] = option.label;
+        }
+    });
+    return map;
+}
 
 function getNameTplUrl(field, ctx){
     if(ctx.objectName === 'cms_files'){
@@ -1862,9 +1895,10 @@ const getSchema$1 = (uiSchema) => {
                                   {
                                     name: "template_url",
                                     label: "导入模板",
-                                    type: "tpl",
-                                    // type: "markdown",
-                                    // html: true,
+                                    type: "markdown",
+                                    options: {
+                                      html: true
+                                    },
                                     className: "whitespace-nowrap",
                                   },
                                   null,
@@ -2711,6 +2745,7 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
   if (!ctx) {
     ctx = {};
   }
+  const btnSearchId = "btn_filter_form_search_" + new Date().getTime();
   const filterFormSchema = await getObjectFieldsFilterFormSchema(ctx);
   const onSearchScript = `
     const scope = event.context.scoped;
@@ -2727,7 +2762,7 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
     // // 这会造成handleFilterSubmit时把移除掉的搜索项字段之前的值加到过滤条件中
     // for(var k in filterFormValues){
     //   if(filterFormValues[k] === "" && !filterFormValues.hasOwnProperty(k)){
-    //     removedValues[k] = "";
+    //     removedValues[k] = null;
     //   }
     // }
     // listView.handleFilterSubmit(Object.assign({}, removedValues, filterFormValues));
@@ -2766,7 +2801,7 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
     const removedValues = {};
     for(var k in filterFormValues){
       if(/^__searchable__/.test(k)){
-        removedValues[k] = "";
+        removedValues[k] = null;
       }
     }
     if(!event.data.isLookup){
@@ -2777,7 +2812,7 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
       if(localListViewProps){
         localListViewProps = JSON.parse(localListViewProps);
         for(var k in localListViewProps){
-          removedValues[k] = "";
+          removedValues[k] = null;
         }
       }
     }
@@ -2935,7 +2970,7 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
     });
     const removedValues = {};
     removedKeys.forEach(function(key){
-      removedValues[key] = "";
+      removedValues[key] = null;
     });
     filterForm.setValues(removedValues);//这里使用filterInnerForm也可以
 
@@ -2948,10 +2983,14 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
     let localListViewProps = sessionStorage.getItem(listViewPropsStoreKey);
     if(localListViewProps){
       localListViewProps = JSON.parse(localListViewProps);
-      // const removedValues = {};
-      removedKeys.forEach(function(key){
-        delete localListViewProps[key];
-        // removedValues[key] = "";
+      _.each(localListViewProps, function(n,k){
+        // __searchable__开头的不在searchableFields范围则清除其值
+        let isRemoved = !!removedFields.find(function(fieldName){
+          return new RegExp("__searchable__\.*" + fieldName + "$").test(k);
+        });
+        if(isRemoved){
+          delete localListViewProps[k];
+        }
       });
       sessionStorage.setItem(listViewPropsStoreKey, JSON.stringify(localListViewProps));
     }
@@ -2985,9 +3024,10 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
             "body": [
               {
                 "type": "button",
+                "id": btnSearchId,
                 "label": "搜索",
                 "icon": "fa fa-search",
-                "visibleOn": "this.filterFormSearchableFields && this.filterFormSearchableFields.length",
+                // "visibleOn": "this.filterFormSearchableFields && this.filterFormSearchableFields.length",
                 "onEvent": {
                   "click": {
                     "actions": [
@@ -3003,7 +3043,7 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
                 "type": "button",
                 "label": "取消",
                 "name": "btn_filter_form_cancel",
-                "visibleOn": "this.filterFormSearchableFields && this.filterFormSearchableFields.length",
+                // "visibleOn": "this.filterFormSearchableFields && this.filterFormSearchableFields.length",
                 "onEvent": {
                   "click": {
                     "actions": [
@@ -3118,6 +3158,10 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
                                       "actionType": "custom",
                                       "script": onSearchableFieldsChangeScript
                                     },
+                                    {
+                                      "actionType": "click",
+                                      "componentId": btnSearchId
+                                    },
                                     {
                                       "componentId": "",
                                       "args": {},
@@ -3425,8 +3469,8 @@ async function getObjectRecordDetailHeader(objectSchema, recordId, options) {
                 },
                 "body":[{
                   "type": "button",
-                  "visibleOn": "${window:innerWidth > 768 && window:historyPaths.length > 1}",
-                  "className":"flex mr-2",
+                  "visibleOn": "${window:innerWidth > 768 && (window:historyPaths.length > 1 || window:historyPaths[0].params.record_id) && display !== 'split'}",
+                  "className":"flex mr-4",
                   "onEvent": {
                       "click": {
                           "actions": [
@@ -3443,7 +3487,7 @@ async function getObjectRecordDetailHeader(objectSchema, recordId, options) {
                           "category": "utility",
                           "name": "back",
                           "colorVariant": "default",
-                          "className": "slds-button_icon slds-global-header__icon"
+                          "className": "slds-button_icon slds-global-header__icon w-4"
                       }
                   ]
                 }]
@@ -3472,7 +3516,7 @@ async function getObjectRecordDetailHeader(objectSchema, recordId, options) {
                   // "tpl": "${(record && uiSchema && record[uiSchema.NAME_FIELD_KEY]) || name}",
                   "inline": false,
                   "wrapperComponent": "",
-                  "className": "leading-5 text-xl font-bold"
+                  "className": "record-detail-header-name leading-5 text-xl font-bold"
                 }
               ],
               "columnClassName": "p-l-xs"
@@ -3481,6 +3525,7 @@ async function getObjectRecordDetailHeader(objectSchema, recordId, options) {
           "className": "flex justify-between"
         }
       ],
+      "columnClassName": "flex-initial",
       "md": "auto",
     });
   }
@@ -3501,7 +3546,7 @@ async function getObjectRecordDetailHeader(objectSchema, recordId, options) {
         {
           "type": "grid",
           "columns": gridBody,
-          "className": "flex justify-between"
+          "className": "flex justify-between flex-nowrap"
         }
       ],
       "hiddenOn": "${recordLoaded != true}"
@@ -3718,12 +3763,13 @@ const getNewListviewButtonSchema = ()=>{
                   "type": "dialog",
                   "title": "新建 列表视图",
                   "data": {
-                    "&": "$$",
+                    //"&":"$$",2.7、2.9、3.0在此处失效
                     "all": "${uiSchema.list_views.all}",
                     "list_view": "${uiSchema.list_views[listName]}",
                     "appId": "${appId}",
                     "global": "${global}",
                     "targetObjectName": "${objectName}",
+                    "context": "${context}"
                   },
                   "body": [
                     {
@@ -3867,12 +3913,13 @@ const getCopyListviewButtonSchema = ()=>{
                   "type": "dialog",
                   "title": "复制 列表视图",
                   "data": {
-                    "&": "$$",
+                    //"&":"$$",2.7、2.9、3.0在此处失效
                     "listName": "${listName}",
                     "targetObjectName": "${objectName}",
                     "list_view": "${uiSchema.list_views[listName]}",
                     "appId": "${appId}",
-                    "global": "${global}"
+                    "global": "${global}",
+                    "context": "${context}"
                   },
                   "body": [
                     {
@@ -4014,7 +4061,8 @@ const getRenameListviewButtonSchema = ()=>{
                   "data": {
                     "targetObjectName": "${objectName}",
                     "recordId": "${uiSchema.list_views[listName]._id}",
-                    "appId": "${appId}"
+                    "appId": "${appId}",
+                    "context": "${context}"
                   },
                   "body": [
                     {
@@ -4071,6 +4119,7 @@ const getSetListviewShareButtonSchema = ()=>{
                   "title": "共享设置",
                   "data": {
                     "recordId": "${uiSchema.list_views[listName]._id}",
+                    "context": "${context}"
                   },
                   "body": [
                     {
@@ -4116,7 +4165,8 @@ const getSetListviewFiltersButtonSchema = ()=>{
                     "targetObjectName": "${objectName}",
                     "recordId": "${uiSchema.list_views[listName]._id}",
                     "listName": "${listName}",
-                    "appId": "${appId}"
+                    "appId": "${appId}",
+                    "context": "${context}"
                   },
                   "body": [
                     {
@@ -4260,11 +4310,12 @@ const getSetListviewColumnsButtonSchema = ()=>{
                   "type": "dialog",
                   "title": "显示的列",
                   "data": {
-                    "&": "$$",
+                    //"&":"$$",2.7、2.9、3.0在此处失效
                     "targetObjectName": "${objectName}",
                     "recordId": "${uiSchema.list_views[listName]._id}",
                     "listName": "${listName}",
-                    "appId": "${appId}"
+                    "appId": "${appId}",
+                    "context": "${context}"
                   },
                   "body": [
                     {
@@ -4411,13 +4462,14 @@ const getSetListviewSortButtonSchema = ()=>{
               {
                 "dialog": {
                   "type": "dialog",
-                  "title": "弹框标题",
+                  "title": "默认排序规则",
                   "data": {
-                    "&": "$$",
+                    //"&":"$$",2.7、2.9、3.0在此处失效
                     "targetObjectName": "${objectName}",
                     "recordId": "${uiSchema.list_views[listName]._id}",
                     "listName": "${listName}",
-                    "appId": "${appId}"
+                    "appId": "${appId}",
+                    "context": "${context}"
                   },
                   "body": [
                     {
@@ -5107,24 +5159,13 @@ function getLookupSapceUserTreeSchema(){
                 "actionType": "custom",
                 "script": `
                 const scope = event.context.scoped;
-                //TODO: 将form中的value一同加入筛选内
-                // var filterForm = scope.parent.parent.getComponents().find(function(n){
-                //     return n.props.type === "form";
-                //   });
-                // var filterFormValues = filterForm.getValues();
-                filterFormValues={
+                var filterFormValues={
                     "__searchable__organizations_parents":event.data.value.value
                 }
                 var listView = scope.parent.getComponents().find(function(n){
                   return n.props.type === "crud";
                 });
-                const removedValues = {};
-                // for(var k in filterFormValues){
-                    //   if(filterFormValues[k] === "" && !filterFormValues.hasOwnProperty(k)){
-                    //     removedValues[k] = "";
-                    //   }
-                    // }
-                listView.handleFilterSubmit(Object.assign({}, removedValues, filterFormValues));
+                listView.handleFilterSubmit(Object.assign({}, filterFormValues));
               `
               }
             ]
@@ -5238,7 +5279,7 @@ async function lookupToAmisPicker(field, readonly, ctx){
 
     const source = await getApi$1(refObjectConfig, null, fields, {expand: true, alias: 'rows', queryOptions: `filters: {__filters}, top: {__top}, skip: {__skip}, sort: "{__sort}"`});
     
-    if(source.url){
+    if(source.url && !ctx.inFilterForm){
         const depend_on = [];
         const sendOn = [];
         ___namespace.each(field.depend_on, (fName)=>{
@@ -5302,9 +5343,10 @@ async function lookupToAmisPicker(field, readonly, ctx){
             filters.push(fieldFilters);
         }
         
+        const inFilterForm = ${ctx.inFilterForm};
         const filtersFunction = ${field.filtersFunction || field._filtersFunction};
 
-        if(filtersFunction){
+        if(filtersFunction && !inFilterForm){
             const _filters = filtersFunction(filters, api.data.$self.__super.__super);
             if(_filters && _filters.length > 0){
                 filters.push(_filters);
@@ -5524,7 +5566,8 @@ async function lookupToAmisSelect(field, readonly, ctx){
         sort = getListViewSort(listView);
     }
 
-    if(apiInfo.url){
+    // 列表视图搜索栏中，即inFilterForm=true时，不需要执行depend_on
+    if(apiInfo.url && !ctx.inFilterForm){
         const depend_on = [];
         const sendOn = [];
         ___namespace.each(field.depend_on, (fName)=>{
@@ -5561,9 +5604,10 @@ async function lookupToAmisSelect(field, readonly, ctx){
             filters.push(fieldFilters);
         }
 
+        const inFilterForm = ${ctx.inFilterForm};
         const filtersFunction = ${field.filtersFunction || field._filtersFunction};
 
-        if(filtersFunction){
+        if(filtersFunction && !inFilterForm){
             const _filters = filtersFunction(filters, api.data.$);
             if(_filters && _filters.length > 0){
                 filters.push(_filters);
@@ -5589,7 +5633,14 @@ async function lookupToAmisSelect(field, readonly, ctx){
     referenceTo ? referenceTo.valueField.name : '';
     if(field.optionsFunction || field._optionsFunction){
         apiInfo.adaptor = `
-        payload.data.options = eval(${field.optionsFunction || field._optionsFunction})(api.data.$);
+        var options = eval(${field.optionsFunction || field._optionsFunction})(api.data.$);
+        if(api.data.$term){
+            options = _.filter(options, function(o) {
+                var label = o.label;
+                return label.toLowerCase().indexOf(api.data.$term.toLowerCase()) > -1;
+            });
+        }
+        payload.data.options = options;
         return payload;
         `;
     }
@@ -5725,7 +5776,7 @@ async function getIdsPickerSchema(field, readonly, ctx){
     source.data.$term = "$term";
     source.data.$self = "$$";
 
-    if(idsDependOn && source.url){
+    if(idsDependOn && source.url && !ctx.inFilterForm){
         source.sendOn = `\${${idsDependOn} && ${idsDependOn}.length}`;
         source.url = `${source.url}&depend_on_${idsDependOn}=\${${idsDependOn}|join}`;
     }
@@ -6011,23 +6062,6 @@ const getAmisFileSchema = (steedosField, readonly)=>{
     return readonly ? getAmisFileReadonlySchema(steedosField) : getAmisFileEditSchema(steedosField);
 };
 
-/*
- * @Author: baozhoutao@steedos.com
- * @Date: 2022-07-20 16:29:22
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2023-05-11 11:19:54
- * @Description: 
- */
-
-function getContrastColor(bgColor) {
-  var backgroundColor = (bgColor.charAt(0) === '#') ? bgColor.substring(1, 7) : bgColor;
-  var r = parseInt(backgroundColor.substr(0, 2), 16);
-  var g = parseInt(backgroundColor.substr(2, 2), 16);
-  var b = parseInt(backgroundColor.substr(4, 2), 16);
-  var brightness = (r * 299 + g * 587 + b * 114) / 1000;
-  return brightness >= 128 ? "#000000" : "#ffffff";
-}
-
 const OMIT_FIELDS = ['created', 'created_by', 'modified', 'modified_by'];
 // const Lookup = require('./lookup');
 
@@ -6218,19 +6252,7 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
             // break;
         case 'select':
             if(readonly){
-                const selectOptions = field.options;
-                let map = {};
-                ___namespace.forEach(selectOptions,(option)=>{
-                    const optionValue = option.value + '';
-                    if(option.color){
-                        const background = '#'+option.color;
-                        const color = getContrastColor(background);
-                        const optionColorStyle = 'background:'+background+';color:'+color;
-                        map[optionValue] = `<span class="rounded-xl px-2 py-1" style='${optionColorStyle}'>${option.label}</span>`;
-                    }else {
-                        map[optionValue] = option.label;
-                    }
-                });
+                const map = getSelectMap(field.options);
                 convertData = {
                     type: "static-mapping",
                     name: field.name,
@@ -6596,7 +6618,7 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
             convertData.className = fieldTypeClassName;
         }
 
-        if(field.visible_on){
+        if(field.visible_on && !ctx.inFilterForm){
             // convertData.visibleOn = `\$${field.visible_on.substring(1, field.visible_on.length -1).replace(/formData./g, '')}`;
             if(field.visible_on.startsWith("{{")){
                 convertData.visibleOn = `${field.visible_on.substring(2, field.visible_on.length -2).replace(/formData./g, 'data.')}`;
@@ -6689,7 +6711,7 @@ async function getFieldSearchable(perField, permissionFields, ctx){
         _field.multiple = true;
         _field.is_wide = false;
         _field.defaultValue = undefined;
-        const amisField = await convertSFieldToAmisField(_field, false, Object.assign({}, ctx, {fieldNamePrefix: fieldNamePrefix, required: false, showSystemFields: true}));
+        const amisField = await convertSFieldToAmisField(_field, false, Object.assign({}, ctx, {fieldNamePrefix: fieldNamePrefix, required: false, showSystemFields: true, inFilterForm: true}));
         if(amisField){
             return amisField;
         }
@@ -6929,7 +6951,8 @@ async function getEditFormInitApi(object, recordId, fields, options){
     data.global = "${global}";
     data.context = "${context}";
     data.defaultData = "${defaultData}";
-
+    data._master = "${_master}";
+    
     return {
         method: "post",
         url: getApi$2() + '&objectName=${objectName}' ,
@@ -6995,7 +7018,7 @@ async function getEditFormInitApi(object, recordId, fields, options){
                             formInitialValuesFun = new Function("return " + formInitialValuesFun)();
                         }
                         if(typeof formInitialValuesFun === "function"){
-                            initialValues = formInitialValuesFun.apply({doc: defaultValues || {} , global: api.body.global})
+                            initialValues = formInitialValuesFun.apply({doc: defaultValues || {} , global: api.body.global, master: api.body._master })
                         }
                     }
                     catch(ex){
@@ -7651,19 +7674,7 @@ async function getTableColumns(fields, options){
             }, field.amis, {name: field.name}));
         }
         else if(field.type === 'select'){
-            const selectOptions = field.options;
-            let map = {};
-            _$1.forEach(selectOptions,(option)=>{
-                const optionValue = option.value + '';
-                if(option.color){
-                    const background = '#'+option.color;
-                    const color = getContrastColor(background);
-                    const optionColorStyle = 'background:'+background+';color:'+color;
-                    map[optionValue] = `<span class="rounded-xl px-2 py-1" style='${optionColorStyle}'>${option.label}</span>`;
-                }else {
-                    map[optionValue] = option.label;
-                }
-            });
+            const map = getSelectMap(field.options);
             columns.push(Object.assign({}, {
                 type: "mapping",
                 name: field.name,
@@ -7702,7 +7713,7 @@ async function getTableColumns(fields, options){
                     tpl: tpl,
                     toggled: field.toggled,
                     className,
-                    html: field.type === 'html' ? true : null
+                    options: field.type === 'html' ? {html: true} : null
                     // toggled: true 
                 }, field.amis, {name: field.name}));
             }
@@ -8216,11 +8227,10 @@ async function getTableApi(mainObject, fields, options){
         if(api.data.$self._isRelated){
             const self = api.data.$self;
             const relatedKey = self.relatedKey;
-            const recordId = self.recordId;
             const refField = self.uiSchema.fields[relatedKey];
             const masterRecord = self._master.record;
             const masterObjectName = self._master.objectName;
-            let relatedValue = recordId;
+            let relatedValue = self._master.recordId;
             if(refField.reference_to_field && refField.reference_to_field != '_id'){
                 relatedValue = masterRecord[refField.reference_to_field]
             }