@steedos-widgets/amis-lib 1.2.6 → 1.2.8

package/dist/index.umd.js

@@ -2622,7 +2622,7 @@
           return Promise.all(filterFormSearchableFields.map(function (item) {
             const field = _.clone(fields[item]);
             if (
-              !_.includes(
+              field && !_.includes(
                 [
                   "grid",
                   "avatar",
@@ -2669,7 +2669,7 @@
     var filterForm = scope.parent.parent.getComponents().find(function(n){
       return n.props.type === "form";
     });
-    filterForm.handleFormSubmit(event)
+    filterForm.handleFormSubmit(event);
     // var filterFormValues = filterForm.getValues();
     // var listView = scope.parent.parent.parent.getComponents().find(function(n){
     //   return n.props.type === "crud";
@@ -2683,8 +2683,30 @@
     //   }
     // }
     // listView.handleFilterSubmit(Object.assign({}, removedValues, filterFormValues));
+
+    let isMobile = Steedos.isMobile();
+    if(isMobile){
+      // 手机端点击搜索的时候自动收起搜索栏
+      let resizeWindow = function(){
+        //触发amis crud 高度重算
+        setTimeout(()=>{
+          window.dispatchEvent(new Event("resize"))
+        }, 500);
+      }
+      const filterService = filterForm.context.getComponents().find(function(n){
+        return n.props.type === "service";
+      });
+      filterService.setData({showFieldsFilter: false});
+      resizeWindow();
+      // 使用filterForm.getValues()的话，并不能拿到本地存储中的过滤条件，所以需要从event.data中取。
+      let filterFormValues = event.data;
+      let isFieldsFilterEmpty = SteedosUI.isFilterFormValuesEmpty(filterFormValues);
+      let crud = SteedosUI.getClosestAmisComponentByType(scope, "crud");
+      let crudService = crud && SteedosUI.getClosestAmisComponentByType(crud.context, "service");
+      crudService && crudService.setData({isFieldsFilterEmpty, showFieldsFilter: false});
+    }
   `;
-    const onResetScript = `
+    const onCancelScript = `
     const scope = event.context.scoped;
     var filterForm = scope.parent.parent.getComponents().find(function(n){
       return n.props.type === "form";
@@ -2712,7 +2734,21 @@
       }
     }
     listView.handleFilterSubmit(removedValues);
-  `;
+    const filterService = filterForm.context.getComponents().find(function(n){
+      return n.props.type === "service";
+    });
+    filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsFilter});
+    //触发amis crud 高度重算
+    setTimeout(()=>{
+      window.dispatchEvent(new Event("resize"))
+    }, 100);
+    let isMobile = Steedos.isMobile();
+    if(isMobile){
+      // 手机端移除搜索按钮上的红点
+      let crudService = scope.getComponentById("service_listview_" + event.data.objectName);
+      crudService && crudService.setData({isFieldsFilterEmpty: true, showFieldsFilter: false});
+    }
+    `;
     const dataProviderInited = `
     const objectName = data.objectName;
     const isLookup = data.isLookup;
@@ -2766,7 +2802,15 @@
           });
           // 有过滤条件时自动展开搜索栏
           if(!_.isEmpty(omitedEmptyFormValue)){
-            setData({ showFieldsFilter: true });
+            let isMobile = Steedos.isMobile();
+            if(isMobile){
+              // 手机端不展开，只显示搜索按钮上的红点
+              let crudService = SteedosUI.getRef(data.$scopeId).getComponentById("service_listview_" + data.objectName)
+              crudService && crudService.setData({isFieldsFilterEmpty: false});
+            }
+            else{
+              setData({ showFieldsFilter: true });
+            }
           }
         }
       }
@@ -2908,14 +2952,15 @@
                 },
                 {
                   "type": "button",
-                  "label": "重置",
+                  "label": "取消",
+                  "name": "btn_filter_form_cancel",
                   "visibleOn": "this.filterFormSearchableFields && this.filterFormSearchableFields.length",
                   "onEvent": {
                     "click": {
                       "actions": [
                         {
                           "actionType": "custom",
-                          "script": onResetScript
+                          "script": onCancelScript
                         }
                       ]
                     }
@@ -3519,11 +3564,36 @@ const filterForm = scope.getComponents().find(function(n){
 const filterService = filterForm.context.getComponents().find(function(n){
   return n.props.type === "service";
 });
-filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsFilter});
-//触发amis crud 高度重算
-setTimeout(()=>{
-  window.dispatchEvent(new Event("resize"))
-}, 100)
+// filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsFilter});
+let resizeWindow = function(){
+  //触发amis crud 高度重算
+  setTimeout(()=>{
+    window.dispatchEvent(new Event("resize"))
+  }, 500);
+}
+let isMobile = Steedos.isMobile();
+if(filterService.props.data.showFieldsFilter){
+  if(isMobile){
+    // 手机上只能通过取消按钮来关闭搜索栏
+    return;
+  }
+  let buttonCancel = SteedosUI.getClosestAmisComponentByType(filterForm.context, "button", { 
+    direction: "down", 
+    name: "btn_filter_form_cancel" 
+  });
+  buttonCancel.props.dispatchEvent('click', {}).then(function(){
+    resizeWindow();
+  });
+}
+else{
+  filterService.setData({showFieldsFilter: true});
+  resizeWindow();
+  if(isMobile){
+    // 手机端在显示搜索栏时隐藏刷新按钮
+    let crudService = scope.getComponentById("service_listview_" + event.data.objectName);
+    crudService && crudService.setData({showFieldsFilter: true});
+  }
+}
 `;
 
   function getExportApiRequestAdaptorScript(){
@@ -3608,6 +3678,7 @@ setTimeout(()=>{
           "className": "bg-white p-2 rounded border-gray-300 text-gray-500",
           "label": "",
           "icon": "fa fa-sync",
+          "visibleOn": "${!showFieldsFilter}",
           "onEvent": {
             "click": {
               "actions": [
@@ -3623,6 +3694,15 @@ setTimeout(()=>{
           "label": "",
           "icon": "fa fa-search",
           "type": "button",
+          "badge": {
+            "offsetx": [
+              -2,
+              2
+            ],
+            "size":8,
+            "animation": true,
+            "visibleOn": "${isFieldsFilterEmpty == false}"
+          },
           "align": "right",
           "className": "bg-white p-2 rounded border-gray-300 text-gray-500",
           "onEvent": {
@@ -4262,8 +4342,8 @@ setTimeout(()=>{
     }
     else {
       return [
+        "switch-per-page",
         "statistics",
-        // "switch-per-page",
         "pagination"
       ]
     }
@@ -5455,6 +5535,23 @@ setTimeout(()=>{
       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');
 
@@ -5608,6 +5705,8 @@ setTimeout(()=>{
   }
 
   async function convertSFieldToAmisField(field, readonly, ctx) {
+      // console.log('convertSFieldToAmisField====>', field, readonly, ctx)
+      const isMobile = window.innerWidth <= 768;
       // 创建人和修改人、创建时间和修改时间不显示
       if(___namespace.includes(OMIT_FIELDS, field.name) && ctx.showSystemFields != true){
           return;
@@ -5642,20 +5741,42 @@ setTimeout(()=>{
               // }
               // break;
           case 'select':
-              convertData = {
-                  type: getAmisStaticFieldType('select', readonly),
-                  joinValues: false,
-                  options: getSelectFieldOptions(field),
-                  extractValue: true,
-                  clearable: true,
-                  labelField: 'label',
-                  valueField: 'value',
-                  tpl: readonly ? getSelectTpl(field) : null
-              };
-              if(field.multiple){
-                  convertData.multiple = true;
-                  convertData.extractValue = true;
+              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;
+                      }
+                  });
+                  convertData = {
+                      type: "static-mapping",
+                      name: field.name,
+                      label: field.label,
+                      map: map
+                  };
+              }else {
+                  convertData = {
+                      type: getAmisStaticFieldType('select', readonly),
+                      joinValues: false,
+                      options: getSelectFieldOptions(field),
+                      extractValue: true,
+                      clearable: true,
+                      labelField: 'label',
+                      valueField: 'value'
+                  };
+                  if(field.multiple){
+                      convertData.multiple = true;
+                      convertData.extractValue = true;
+                  }
               }
+
               break;
           case 'boolean':
               convertData = {
@@ -5675,7 +5796,26 @@ setTimeout(()=>{
               };
               break;
           case 'date':
-              convertData = {
+              convertData = isMobile && !readonly ? {
+                  type: "native-date",
+                  pipeIn: (value, data) => {
+                      if (value) {
+                          value = moment(value).utc().format('YYYY-MM-DD');
+                          return value;
+                      } else {
+                          return "";
+                      }
+
+                  },
+                  pipeOut: (value, oldValue, data) => {
+                      if (value) {
+                          value = moment(value).format('YYYY-MM-DDT00:00:00.000[Z]');
+                          return value;
+                      } else {
+                          return "";
+                      }
+                  }
+              } : {
                   type: getAmisStaticFieldType('date', readonly),
                   inputFormat: "YYYY-MM-DD",
                   format:'YYYY-MM-DDT00:00:00.000[Z]',
@@ -5694,12 +5834,48 @@ setTimeout(()=>{
               };
               break;
           case 'datetime':
-              convertData = {
+              convertData = isMobile && !readonly ? {
+                  type: "combo",
+                  pipeIn: (value, data) => {
+                      let revalue = {};
+                      if (value && value != "Invalid date") {
+                          value = moment(value).format('YYYY-MM-DD HH:mm:ss');
+                          revalue[field.name + "-native-date"] = value.split(' ')[0];
+                          revalue[field.name + "-native-time"] = value.split(' ')[1];
+                      } else {
+                          revalue[field.name + "-native-date"] = "";
+                          revalue[field.name + "-native-time"] = "";
+                      }
+                      return revalue;
+                  },
+                  pipeOut: (value, oldValue, data) => {
+                      let revalue = "";
+                      if (value[field.name + "-native-date"] && value[field.name + "-native-time"]) {
+                          revalue = value[field.name + "-native-date"] + " " + value[field.name + "-native-time"];
+                          revalue = moment(revalue).utc().format('YYYY-MM-DDTHH:mm:ss.SSS[Z]');
+                      }
+                      return revalue;
+                  },
+                  items: [
+                      {
+                          type: "native-date",
+                          name: field.name + "-native-date",
+                          className: "steedos-native-date",
+                          value: ""
+                      },
+                      {
+                          type: "native-time",
+                          name: field.name + "-native-time",
+                          className: "steedos-native-time",
+                          value: ""
+                      }
+                  ]
+              } : {
                   type: getAmisStaticFieldType('datetime', readonly),
                   inputFormat: 'YYYY-MM-DD HH:mm',
-                  format:'YYYY-MM-DDTHH:mm:ss.SSSZ',
+                  format: 'YYYY-MM-DDTHH:mm:ss.SSSZ',
                   tpl: readonly ? getDateTimeTpl(field) : null,
-                  utc: true
+                  utc: true,
               };
               break;
           case 'input-time-range':
@@ -5714,7 +5890,26 @@ setTimeout(()=>{
               };
               break;
           case 'time':
-              convertData = {
+              convertData = isMobile && !readonly ? {
+                  type: "native-time",
+                  pipeIn: (value, data) => {
+                      if (value) {
+                          value = moment(value).utc().format('HH:mm');
+                          return value;
+                      } else {
+                          return "";
+                      }
+
+                  },
+                  pipeOut: (value, oldValue, data) => {
+                      if (value) {
+                          value = moment('1970-01-01 ' + value).format('1970-01-01THH:mm:00.000[Z]');
+                          return value;
+                      } else {
+                          return "";
+                      }
+                  }
+              } : {
                   type: getAmisStaticFieldType('time', readonly),
                   inputFormat: 'HH:mm',
                   timeFormat:'HH:mm',
@@ -5918,6 +6113,13 @@ setTimeout(()=>{
               convertData.quickEdit = false;
           }
 
+          let fieldTypeClassName = ' steedos-' + convertData.type + (readonly ? '-readonly' : '-edit');
+          if (convertData.className) {
+              convertData.className = convertData.className + fieldTypeClassName;
+          } else {
+              convertData.className = fieldTypeClassName;
+          }
+
           if(field.visible_on){
               // convertData.visibleOn = `\$${field.visible_on.substring(1, field.visible_on.length -1).replace(/formData./g, '')}`;
               if(field.visible_on.startsWith("{{")){
@@ -6602,6 +6804,7 @@ setTimeout(()=>{
           hiddenOn: options.tableHiddenOn,
           autoFillHeight: options.isRelated ? false : true,
           className: `flex-auto ${crudClassName || ""}`,
+          bodyClassName: "bg-white",
           crudClassName: crudClassName,
         }, 
           bodyProps,
@@ -6947,7 +7150,31 @@ setTimeout(()=>{
                   ...getAmisFileReadonlySchema(field)
               }, 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;
+                  }
+              });
+              columns.push(Object.assign({}, {
+                  type: "mapping",
+                  name: field.name,
+                  label: field.label,
+                  map: map,
+                  sortable: field.sortable,
+                  width: field.width,
+                  toggled: field.toggled,
+                  className:"whitespace-nowrap",
+              }, field.amis, {name: field.name}));
+          }
           else {
               const tpl = await getFieldTpl(field, options);