@steedos/service-plugin-amis 2.2.36 → 2.2.37

package/main/default/client/amis.render.client.js

@@ -43,8 +43,46 @@
                 }
             });
 
+            const normalizeLink = (to, location = window.location) => {
+                to = to || '';
+              
+                if (to && to[0] === '#') {
+                  to = location.pathname + location.search + to;
+                } else if (to && to[0] === '?') {
+                  to = location.pathname + to;
+                }
+              
+                const idx = to.indexOf('?');
+                const idx2 = to.indexOf('#');
+                let pathname = ~idx
+                  ? to.substring(0, idx)
+                  : ~idx2
+                  ? to.substring(0, idx2)
+                  : to;
+                let search = ~idx ? to.substring(idx, ~idx2 ? idx2 : undefined) : '';
+                let hash = ~idx2 ? to.substring(idx2) : location.hash;
+              
+                if (!pathname) {
+                  pathname = location.pathname;
+                } else if (pathname[0] != '/' && !/^https?\:\/\//.test(pathname)) {
+                  let relativeBase = location.pathname;
+                  const paths = relativeBase.split('/');
+                  paths.pop();
+                  let m;
+                  while ((m = /^\.\.?\//.exec(pathname))) {
+                    if (m[0] === '../') {
+                      paths.pop();
+                    }
+                    pathname = pathname.substring(m[0].length);
+                  }
+                  pathname = paths.concat(pathname).join('/');
+                }
+              
+                return pathname + search + hash;
+              };
+
             const AmisEnv = {
-                getModalContainer: ()=>{
+                getModalContainer: (props)=>{
                     let div = document.querySelector("#amisModalContainer");
                     if(!div){
                         div = document.createElement('div');
@@ -55,24 +93,58 @@
                     }
                     return div;
                 },
+                jumpTo: (to, action) => {
+                if (to === 'goBack') {
+                    return window.history.back();
+                }
+
+                to = normalizeLink(to);
+
+                if (action && action.actionType === 'url') {
+                    action.blank === false ? (window.location.href = to) : window.open(to);
+                    return;
+                }
+
+                // 主要是支持 nav 中的跳转
+                if (action && to && action.target) {
+                    window.open(to, action.target);
+                    return;
+                }
+
+                if (/^https?:\/\//.test(to)) {
+                    window.location.replace(to);
+                } else {
+                    FlowRouter.go(to);
+                }
+                },
                 theme: 'antd',
             };
 
             const AmisRender = function (props) {
-                const env = props.env;
+                let env = props.env;
                 const schema = props.schema;
                 const data = props.data;
                 const name = props.name;
+                if(props.pageType === 'form'){
+                    env = Object.assign({
+                        getModalContainer: ()=>{
+                            return document.querySelector('.amis-scope');
+                        }
+                    }, env);
+                }
                 return (React.createElement("div", { className: "amis-scope" }, AmisSDK.AmisRender(schema, {data, name}, Object.assign({}, AmisEnv, env))));
             };
 
-            Builder.registerComponent(AmisRender, {
-                name: 'Amis',
-                inputs: [
-                    { name: 'schema', type: 'object' },
-                    { name: 'data', type: 'object' },
-                    { name: 'name', type: 'string' }
-                ]
+            //Amis SDK 中已清理了monaco, 所以这里需要提前注册,否则会导致amis code类型报错
+            Builder.initMonaco().then(()=>{
+                Builder.registerComponent(AmisRender, {
+                    name: 'Amis',
+                    inputs: [
+                        { name: 'schema', type: 'object' },
+                        { name: 'data', type: 'object' },
+                        { name: 'name', type: 'string' }
+                    ]
+                });
             });
         });
     });

package/main/default/client/amis.util.client.js

@@ -0,0 +1,156 @@
+/*
+ * @Author: baozhoutao@steedos.com
+ * @Date: 2022-05-20 17:42:20
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2022-06-01 15:44:44
+ * @Description: 提供辅助函数
+ */
+(function(){
+    // # 日期类型: date, datetime  支持操作符: "=", "<>", "<", ">", "<=", ">="
+	// # 文本类型: text, textarea, html  支持操作符: "=", "<>", "contains", "notcontains", "startswith"
+	// # 选择类型: lookup, master_detail, select 支持操作符: "=", "<>"
+	// # 数值类型: currency, number  支持操作符: "=", "<>", "<", ">", "<=", ">="
+	// # 布尔类型: boolean  支持操作符: "=", "<>"
+	// # 数组类型: checkbox, [text]  支持操作符: "=", "<>"
+
+    const DATE_DATETIME_BETWEEN_VALUES = ['last_year', 'this_year', 'next_year', 'last_quarter', 'this_quarter', 'next_quarter', 'last_month', 'this_month', 'next_month', 'last_week', 'this_week', 'next_week', 'yestday', 'today', 'tomorrow', 'last_7_days', 'last_30_days', 'last_60_days', 'last_90_days', 'last_120_days', 'next_7_days', 'next_30_days', 'next_60_days', 'next_90_days', 'next_120_days'];
+
+    /**
+     * 
+     */
+
+    const opMaps = {
+        equal: '=',
+        not_equal: '!=',
+        less: '<', 
+        less_or_equal: '<=', 
+        greater: '>', 
+        greater_or_equal: '>=',
+        between: 'between',
+        not_between: 'not_between', // TODO 不支持待@steedos/filters 增强
+        is_empty:  'is_empty', // TODO  不支持待@steedos/filters 增强
+        is_not_empty: 'is_not_empty',  // TODO 不支持待@steedos/filters 增强
+        select_equals: '=', 
+        select_not_equals: '!=', 
+        select_any_in: 'in',
+        select_not_any_in: '<>',
+        like: 'contains',
+        not_like: 'notcontains',
+        starts_with: 'startswith',
+        ends_with: 'endswith'
+    }
+
+    const isGroup = (item)=>{
+        return _.has(item, 'conjunction');
+    }
+
+    const conditionGroupToFilters = (group)=>{
+        const filters = [];
+        const {conjunction, children} = group;
+        if(conjunction && children){
+            children.forEach((item)=>{
+                if(filters.length > 0){
+                    filters.push(conjunction);
+                }
+                if(isGroup(item)){
+                    const filter = conditionGroupToFilters(item);
+                    if(filter && filter.length > 0){
+                        filters.push(filter) 
+                    }
+                }else{
+                    const filter = conditionItemToFilters(item);
+                    if(filter){
+                        filters.push(filter) 
+                    }
+                }
+            })
+        }
+        return filters;
+    };
+
+    const conditionItemToFilters = (item)=>{
+        const { left , op, right } = item;
+        if(left && left.type === 'field'){
+            if(op){
+                if(op.startsWith('between:')){
+                    const array = op.split(':');
+                    return [left.field, array[0], array[1]];
+                }else{
+                    if(right != null){
+                        return [left.field, opMaps[op], right]
+                    }
+                }
+            }
+        }
+    };
+
+    // const conditionChildrenToFilters = (children)=>{
+
+    // }
+    const filterToConditionItem = (filter)=>{
+        if(filter.length === 3){
+            const op =lodash.findKey(opMaps, (value)=>{ return value === filter[1]});
+            if(op === 'between' && lodash.includes(DATE_DATETIME_BETWEEN_VALUES, filter[2])){
+                return {
+                    left:{
+                        type: 'field',
+                        field: filter[0]
+                    },
+                    op: `${op}:${filter[2]}`
+                }
+            }else{
+                return {
+                    left:{
+                        type: 'field',
+                        field: filter[0]
+                    },
+                    op: op, 
+                    right: filter[2]
+                }
+            }
+        }else{
+            console.warn(`无效的filter:${JSON.stringify(filter)}`)
+        }
+    }
+
+    const filterObjectToArray = (filter)=>{
+        if(!lodash.isArray(filter) && lodash.isObject(filter)){
+            return [filter.field, filter.operation, filter.value];
+        };
+        return filter;
+    }
+
+    const filtersToConditionGroup = (filters)=>{
+        filters = filterObjectToArray(filters);
+        
+        const conditions = {
+            conjunction: 'and',
+            children: []
+        };
+        if(!filters || filters.length ==0){
+            return conditions
+        }
+        filters.forEach((filter)=>{
+            filter = filterObjectToArray(filter);
+            if(filter === 'or' || filter === 'and'){
+                conditions.conjunction = filter;
+            }else{
+                if(filter.length === 3 && filter.indexOf("and") == -1 && filter.indexOf("or") == -1){
+                    conditions.children.push(filterToConditionItem(filter));
+                }else{
+                    conditions.children.push(filtersToConditionGroup(filter));
+                }
+            }
+        });
+        return conditions;
+    }
+
+    window.amisConvert = {
+        conditionsToFilters: (conditions)=>{
+            return conditionGroupToFilters(conditions);
+        },
+        filtersToConditions: (filters)=>{
+            return filtersToConditionGroup(filters);
+        }
+    }
+})()

package/main/default/client/creator.function.client.js

@@ -0,0 +1,153 @@
+/*
+ * @Author: baozhoutao@steedos.com
+ * @Date: 2022-05-20 17:42:20
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2022-06-01 18:26:42
+ * @Description: 提供辅助函数
+ */
+(function(){
+    const filtersAmisSchema = {
+        "type": "page",
+        "title": "过滤器",
+        "name": "steedos-filters",
+        "body": [
+          {
+            "type": "form",
+            "title": "过滤器",
+            "body": [
+              {
+                "label": "",
+                "type": "condition-builder",
+                "name": "filters",
+                "description": "",
+                "id": "filters",
+                "source": {
+                  "method": "get",
+                  "url": "${context.rootUrl}/service/api/amis-metadata-listviews/getFilterFields?objectName=${objectName}",
+                  "dataType": "json"
+                },
+                "disabled": false
+              }
+            ],
+            "id": "filtersForm",
+            "wrapWithPanel": false
+          }
+        ],
+        "regions": [
+          "body"
+        ],
+        "data": {
+          "recordId": "",
+          "initialValues": {
+          },
+          "appId": "builder",
+          "title": ""
+        }
+      };
+    
+    //使用原creator逻辑
+    const canSaveFilters = function() {
+        var current_filter_items, current_filter_logic, current_filter_scope, is_filter_list_disabled, list_view_obj, original_filter_items, original_filter_logic, original_filter_scope;
+        list_view_obj = Creator.Collections.object_listviews.findOne(Session.get("list_view_id"));
+        is_filter_list_disabled = !list_view_obj || list_view_obj.owner !== Meteor.userId();
+        if (is_filter_list_disabled) {
+          return false;
+        }
+        if (list_view_obj) {
+          original_filter_scope = list_view_obj.filter_scope;
+          original_filter_items = list_view_obj.filters;
+          original_filter_logic = list_view_obj.filter_logic;
+          current_filter_logic = Session.get("filter_logic");
+          current_filter_scope = Session.get("filter_scope");
+          current_filter_items = Session.get("filter_items");
+          if (original_filter_scope === current_filter_scope && JSON.stringify(original_filter_items) === JSON.stringify(current_filter_items)) {
+            if ((!current_filter_logic && !original_filter_logic) || (current_filter_logic === original_filter_logic)) {
+              return false;
+            } else {
+              return true;
+            }
+          } else {
+            return true;
+          }
+        }
+      }
+
+    Creator.showListFilter = (objectName, listView, data, props)=>{
+        const pageName = `${objectName}-list-filter`;
+        const canSave = canSaveFilters();
+        return Steedos.Page.render(SteedosUI.Drawer, {
+            name: pageName,
+            render_engine: 'amis',
+            schema: filtersAmisSchema,
+            object_name: Session.get("object_name"),
+            type: 'page'
+        }, Object.assign({drawerName: pageName}, data, {
+            objectName: Session.get("object_name"), // TODO 应该传入变量
+            filters: window.amisConvert.filtersToConditions(Session.get("filter_items")),
+            title: "过滤器"
+        }), {
+            props: {
+                mask: false,
+                width: 550,
+                style: null,
+                extra: React.createElement(
+                    SteedosUI.components.Space, 
+                    {}, 
+                    [
+                        React.createElement(SteedosUI.components.Button, {
+                            onClick: function(){
+                                SteedosUI.getRef(pageName)?.close();
+                            }
+                        } ,'取消'), 
+                        React.createElement(SteedosUI.components.Button, {
+                            onClick: canSave ? function(){
+
+                                const formValues = window.amisScopes[pageName].getComponentById("filtersForm").getValues()
+                                const filters = window.amisConvert.conditionsToFilters(formValues.filters);
+                                Session.set("filter_items", filters);
+
+                                //使用原creator逻辑
+                                var filter_items, filter_scope, format_logic, list_view_id;
+                                list_view_id = Session.get("list_view_id");
+                                filter_items = Session.get("filter_items");
+                                filter_scope = Session.get("filter_scope");
+                                filter_items = _.map(filter_items, function(obj) {
+                                if (_.isEmpty(obj)) {
+                                    return false;
+                                } else {
+                                    return obj;
+                                }
+                                });
+                                filter_items = _.compact(filter_items);
+                                format_logic = null;
+                                if (Creator.validateFilters(filter_items, format_logic)) {
+                                Session.set("list_view_visible", false);
+                                filter_items.forEach(function(item) {
+                                    delete item.start_value;
+                                    return delete item.end_value;
+                                });
+                                return Meteor.call("update_filters", list_view_id, filter_items, filter_scope, format_logic, function(error, result) {
+                                    Session.set("list_view_visible", true);
+                                    if (error) {
+                                        return console.log("error", error);
+                                    } else if (result) {
+                                        SteedosUI.getRef(pageName)?.close();
+                                        return Session.set("filter_items", filter_items);
+                                    }
+                                });
+                                }
+                            } : function(){
+                                const formValues = window.amisScopes[pageName].getComponentById("filtersForm").getValues()
+                                const filters = window.amisConvert.conditionsToFilters(formValues.filters);
+                                Session.set("filter_items", filters);
+                                SteedosUI.getRef(pageName)?.close();
+                            },
+                            type: 'primary'
+                        } , canSave ? '保存': '应用')
+                    ]
+                )
+            }
+        });
+    }
+
+})()