@steedos/service-plugin-amis 2.3.0-beta.24 → 2.3.0-beta.26

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

@@ -47,7 +47,7 @@
             return true;
           }
 
-        // 加载Amis SDK: 如果直接放到body中会导致meteor 编译后的 cordova.js 加载报错
+        // 加载Amis SDK: 如果直接放到body中会导致 meteor 编译后的 cordova.js 加载报错
         let amisSDKScript = document.createElement("script");
         amisSDKScript.setAttribute("src", Steedos.absoluteUrl('/unpkg.com/amis/sdk/sdk.js'));
         document.getElementsByTagName("head")[0].appendChild(amisSDKScript);
@@ -73,6 +73,8 @@
             waitForThing(window, 'assetsLoaded'),
             waitForThing(window, 'amis'),
         ]).then(()=>{
+            window.React = window.__React;
+            window.ReactDOM = window.__ReactDOM;
             const AmisRenderers = [];
 
             const amisComps = lodash.filter(Builder.registry['meta-components'], function(item){ return item.componentName && item.amis?.render});

package/main/default/client/load.assets.client.js

@@ -0,0 +1,19 @@
+// 解决多个react 问题. 注册组件时, 使用 amis 自带的 react , 运行 steedos 相关组件时, 使用 全局 react
+window.addEventListener('message', function (event) {
+    const { data } = event;
+    if (data.type === 'Builder.loaded') {
+        if(Meteor.settings.public.page && Meteor.settings.public.page.assetUrls){
+            const defaultAssetsUrls = Meteor.settings.public.page.assetUrls.split(',')
+            Promise.all([
+                waitForThing(window, 'amis'),
+            ]).then(()=>{
+                window.__React = window.React;
+                window.__ReactDOM = window.ReactDOM;
+                window.React = amisRequire('react');
+                window.ReactDOM = amisRequire('react-dom');
+                window.ReactDom = window.ReactDOM;
+                Builder.registerRemoteAssets(defaultAssetsUrls);
+            })
+        } 
+    }
+})

package/main/default/pages/apps_form.page.amis.json

@@ -18,7 +18,7 @@
                     "modalName": "${modalName}",
                     "objectName": "${objectName}"
                 },
-                "requestAdaptor": "\nconst formData = api.data.$;\nfor (key in formData){\n    // image、select等字段清空值后保存的空字符串转换为null。\n    if(formData[key] === ''){\n        formData[key] = null;\n    }\n}\nconst objectName = api.data.objectName;\nconst fieldsName = Object.keys(formData);\ndelete formData.created;\ndelete formData.created_by;\ndelete formData.modified;\ndelete formData.modified_by;\ndelete formData._display;\ndelete formData.tabs_options;\ndelete formData.tab_groups_options;\n\n// 新加字段tab_items，值同步回传到老字段tabs中兼容老UI界面\nformData.tabs = [];\nif (formData.tab_items && formData.tab_items.length) { \n    formData.tabs = formData.tab_items.map(function (item) { return item.tab_name; });\n}\n\nlet query = `mutation{record: ${objectName}__insert(doc: {__saveData}){_id}}`;\nif(formData.recordId){\n    query = `mutation{record: ${objectName}__update(id: \"${formData.recordId}\", doc: {__saveData}){_id}}`;\n};\ndelete formData._id;\nlet __saveData = JSON.stringify(JSON.stringify(formData));\n\napi.data = {query: query.replace('{__saveData}', __saveData)};\nreturn api;\n",
+                "requestAdaptor": "\nconst formData = api.data.$;\nfor (key in formData){\n    // image、select等字段清空值后保存的空字符串转换为null。\n    if(formData[key] === ''){\n        formData[key] = null;\n    }\n}\nconst objectName = api.data.objectName;\nconst fieldsName = Object.keys(formData);\ndelete formData.created;\ndelete formData.created_by;\ndelete formData.modified;\ndelete formData.modified_by;\ndelete formData._display;\ndelete formData.tabs_options;\ndelete formData.tab_groups_options;\n\n// 新加字段tab_items，值同步回传到老字段tabs中兼容老UI界面\nformData.tabs = [];\nif (formData.tab_items && formData.tab_items.length) { \n    formData.tabs = formData.tab_items.map(function (item) { return item.tab_name; });\n}\n\n/*\ntab_items存储为：\ntab_items: {\n  test1:{\n    group:\"xxx\"\n  },\n  test3:{\n    group:\"yyy\"\n  }\n}\n而不是：\ntab_items: [\n  {\n    \"index\":1,\n    \"group\":\"xxx\"\n  },\n  {\n    \"index\":2,\n    \"group\":\"yyy\"\n  }\n]\n*/\nif (formData.tab_items) { \n    formData.tab_items = _.keyBy(formData.tab_items, \"tab_name\")\n    let tempIndex = 0;\n    _.each(formData.tab_items, function (n, k) {\n      tempIndex++;\n      n.index = tempIndex;\n      delete n.tab_name;\n    });\n}\n\nlet query = `mutation{record: ${objectName}__insert(doc: {__saveData}){_id}}`;\nif(formData.recordId){\n    query = `mutation{record: ${objectName}__update(id: \"${formData.recordId}\", doc: {__saveData}){_id}}`;\n};\ndelete formData._id;\nlet __saveData = JSON.stringify(JSON.stringify(formData));\n\napi.data = {query: query.replace('{__saveData}', __saveData)};\nreturn api;\n",
                 "responseData": {
                     "recordId": "${record._id}"
                 },
@@ -31,7 +31,7 @@
                 "method": "post",
                 "url": "${context.rootUrl}/graphql",
                 "sendOn": "!!this.recordId",
-                "adaptor": "var data = payload.data.data[0];\nif(data){\n    //初始化接口返回的字段移除字段值为null的字段\n    for (key in data){\n        if(data[key] === null){\n            delete data[key];\n        }\n    }\n};\npayload.data = data;\ndelete payload.extensions;\nreturn payload;\n        ",
+                "adaptor": "var data = payload.data.data[0];\nif(data){\n    //初始化接口返回的字段移除字段值为null的字段\n    for (key in data){\n        if(data[key] === null){\n            delete data[key];\n        }\n    }\n};\nif (data.tab_items && !_.isArray(data.tab_items)) {\n    // 数据库中存储的是对象格式而不是数组，转换为数组用于界面显示\n    let arrTabItems = [];\n    _.each(data.tab_items, function (n, k) {\n        n.tab_name = k;\n        delete n.index;\n        arrTabItems.push(n);\n    });\n    data.tab_items = arrTabItems;\n}\npayload.data = data;\ndelete payload.extensions;\nreturn payload;\n        ",
                 "data": {
                     "query": "{data:apps(filters:[\"_id\", \"=\", \"${recordId}\"]){_id,name,code,icon_slds,visible,description,tabs,tab_items,tab_groups,objects,mobile_objects,is_creator,mobile,sort,url,is_use_ie,is_use_iframe,is_new_window,on_click,auth_name,secret,is_system,from_code_id,instance_state,created,created_by:created_by__expand{_id,name},modified,modified_by:modified_by__expand{_id,name},_display{visible,is_creator,mobile,is_use_ie,is_use_iframe,is_new_window,is_system,instance_state,created,modified}}}"
                 },
@@ -49,7 +49,7 @@
                     "api": {
                         "method": "post",
                         "url": "${context.rootUrl}/graphql",
-                        "adaptor": "let data = payload.data;\ndata.tabs_options = data.options;\ndelete data.options\npayload.data = data;\nreturn payload;\n",
+                        "adaptor": "let data = payload.data;\ndata.tabs_options = [];\nif (data.options && data.options.length) {\n  data.tabs_options = data.options.map(function (option) { \n    option.label = option.label + \"(\" + option.value + \")\";\n    return option;\n  });\n}\ndelete data.options\npayload.data = data;\nreturn payload;\n",
                         "data": {
                             "query": "{options:tabs{_id label:label value:name,type,object,desktop,mobile}}"
                         },
@@ -107,7 +107,7 @@
                                                             "valueField": "symbol",
                                                             "multiple": false,
                                                             "source": "${sldsIconsOptions}",
-                                                            "menuTpl": "<span class=\"flex justify-center items-center mt-0.5\">\n  <span role=\"img\" aria-label=\"smile\" class=\"anticon anticon-smile\">\n    <span class=\"slds-icon_container slds-icon-standard-${symbol|split:_|join:-}\">\n        <svg class=\"slds-icon slds-icon_x-small\" aria-hidden=\"true\">\n          <use xlink:href=\"/unpkg.com/@salesforce-ux/design-system/assets/icons/standard-sprite/svg/symbols.svg#${symbol}\"></use>\n        </svg>\n    </span>\n  </span>\n  <span class=\"pl-1.5\">${symbol}</span>\n</span>"
+                                                            "menuTpl": "<span class=\"flex items-center mt-0.5\">\n  <span role=\"img\" aria-label=\"smile\" class=\"anticon anticon-smile\">\n    <span class=\"slds-icon_container slds-icon-standard-${symbol|split:_|join:-}\">\n        <svg class=\"slds-icon slds-icon_x-small\" aria-hidden=\"true\">\n          <use xlink:href=\"/unpkg.com/@salesforce-ux/design-system/assets/icons/standard-sprite/svg/symbols.svg#${symbol}\"></use>\n        </svg>\n    </span>\n  </span>\n  <span class=\"pl-1.5\">${symbol}</span>\n</span>"
                                                         }
                                                     ],
                                                     "id": "u:420b0162ce2c",
@@ -262,7 +262,7 @@
                                                                         "actions": [
                                                                             {
                                                                                 "actionType": "custom",
-                                                                                "script": "const tabGroupKey = \"group\";\nconst getTabsSortFun = function (groupNames) {\n  return function (m, n) {\n    var tempM = !!m[tabGroupKey] ? 1 : 0;\n    var tempN = !!n[tabGroupKey] ? 1 : 0;\n    if (!m[tabGroupKey] || !n[tabGroupKey]) {\n      // 没有配置group属性的字段排在前面\n      return tempM - tempN;\n    }\n    // 字段所属分组不在groupNames时排在前面，其他字段按其所属分组在groupNames中的排序先后顺序排序，所属分组相同的字段排在一起。\n    return groupNames.indexOf(m[tabGroupKey]) - groupNames.indexOf(n[tabGroupKey]);\n  };\n}\n\nconst clearTabs = function (input) {\n  return {\n    tab_items: []\n  }\n}\n\n// 字段列表每一列数据变量时立即同步值到表单中\nconst quickEidtSaveForTab = function (input, prop_name) {\n  const currentPropValue = input.value;\n  const rowValue = input.__super;\n  const formValue = input.__super.__super.__super;\n  const tab_name = rowValue.tab_name;\n  rowValue[prop_name] = currentPropValue;\n  delete rowValue.index;\n  let newTabs = formValue.tab_items.map(function (item) {\n    if (item.tab_name == tab_name) {\n      return Object.assign({}, item, rowValue);\n    }\n    else {\n      return item;\n    }\n  });\n  const tabGroups = input.__super.__super.tab_groups;\n  const groupNames = lodash.compact(lodash.map(tabGroups, \"group_name\"));\n  if (groupNames && groupNames.length) {\n    // tabs重新按分组排序\n    newTabs.sort(getTabsSortFun(groupNames));\n  }\n  return {\n    tab_items: newTabs\n  }\n}\n\nconst eventData = event.data;\ndoAction({\n  actionType: 'setValue',\n  componentId: \"apps-form\",\n  args: {\n    value: clearTabs()\n  }\n});\n\nconst newTabTtemsProp = quickEidtSaveForTab(eventData, \"group\");\n\nsetTimeout(function () { \n  // 不加延时会显示异常\n  doAction({\n    actionType: 'setValue',\n    componentId: \"apps-form\",\n    args: {\n      value: newTabTtemsProp\n    }\n  });\n},300);"
+                                                                                "script": "const tabGroupKey = \"group\";\nconst getTabsSortFun = function (groupNames) {\n  return function (m, n) {\n    var tempM = !!m[tabGroupKey] ? 1 : 0;\n    var tempN = !!n[tabGroupKey] ? 1 : 0;\n    if (!m[tabGroupKey] || !n[tabGroupKey]) {\n      // 没有配置group属性的字段排在前面\n      return tempM - tempN;\n    }\n    // 字段所属分组不在groupNames时排在前面，其他字段按其所属分组在groupNames中的排序先后顺序排序，所属分组相同的字段排在一起。\n    return groupNames.indexOf(m[tabGroupKey]) - groupNames.indexOf(n[tabGroupKey]);\n  };\n}\n\nconst clearTabs = function (input) {\n  return {\n    tab_items: []\n  }\n}\n\n// 字段列表每一列数据变量时立即同步值到表单中\nconst quickEidtSaveForTab = function (input, prop_name) {\n  const currentPropValue = input.value;\n  const rowValue = input.__super;\n  const formValue = input.__super.__super.__super;\n  const tab_name = rowValue.tab_name;\n  rowValue[prop_name] = currentPropValue;\n  delete rowValue.index;\n  let newTabs = formValue.tab_items.map(function (item) {\n    if (item.tab_name == tab_name) {\n      return Object.assign({}, item, rowValue);\n    }\n    else {\n      return item;\n    }\n  });\n  const tabGroups = input.__super.__super.tab_groups;\n  const groupNames = _.compact(_.map(tabGroups, \"group_name\"));\n  if (groupNames && groupNames.length) {\n    // tabs重新按分组排序\n    newTabs.sort(getTabsSortFun(groupNames));\n  }\n  return {\n    tab_items: newTabs\n  }\n}\n\nconst eventData = event.data;\ndoAction({\n  actionType: 'setValue',\n  componentId: \"apps-form\",\n  args: {\n    value: clearTabs()\n  }\n});\n\nconst newTabTtemsProp = quickEidtSaveForTab(eventData, \"group\");\n\nsetTimeout(function () { \n  // 不加延时会显示异常\n  doAction({\n    actionType: 'setValue',\n    componentId: \"apps-form\",\n    args: {\n      value: newTabTtemsProp\n    }\n  });\n},300);"
                                                                             }
                                                                         ]
                                                                     }
@@ -343,7 +343,7 @@
                                                                         "actions": [
                                                                             {
                                                                                 "actionType": "custom",
-                                                                                "script": "const tabGroupKey = \"group\";\nconst getTabsSortFun = function (groupNames) {\n  return function (m, n) {\n    var tempM = !!m[tabGroupKey] ? 1 : 0;\n    var tempN = !!n[tabGroupKey] ? 1 : 0;\n    if (!m[tabGroupKey] || !n[tabGroupKey]) {\n      // 没有配置group属性的字段排在前面\n      return tempM - tempN;\n    }\n    // 字段所属分组不在groupNames时排在前面，其他字段按其所属分组在groupNames中的排序先后顺序排序，所属分组相同的字段排在一起。\n    return groupNames.indexOf(m[tabGroupKey]) - groupNames.indexOf(n[tabGroupKey]);\n  };\n}\n\nconst clearTabs = function (input) { \n  return {\n    tab_items: []\n  }\n}\n\nconst convertDataForTabs = function (input) { \n  let pickedTabs = input.picked_tabs || [];\n  const superTabs = _.keyBy(input.__super.tab_items, 'tab_name');\n  if (typeof pickedTabs === \"string\") {\n    pickedTabs = pickedTabs.split(\",\");\n  }\n  const tabOptions = lodash.keyBy(input.__super.__super.__super.__super.__super.tabs_options, \"value\");\n  const convertedTabs = pickedTabs.map(function (tab_name) {\n    const superTab = superTabs[tab_name];\n    if (superTab) {\n      return superTab;\n    }\n    else {\n      const tabOption = tabOptions[tab_name];\n      return {\n        tab_name: tab_name,\n        group: tabOption.group\n      }\n    }\n  });\n  const tabGroups = input.__super.__super.__super.__super.__super.tab_groups;\n  const groupNames = lodash.compact(lodash.map(tabGroups, \"group_name\"));\n  // tabs重新按分组排序\n  if (groupNames && groupNames.length) { \n    convertedTabs.sort(getTabsSortFun(groupNames));\n  }\n  return {\n    tab_items: convertedTabs\n  }\n}\n\nconst eventData = event.data;\ndoAction({\n  actionType: 'setValue',\n  componentId: \"apps-form\",\n  args: {\n    value: clearTabs()\n  }\n});\n\ndoAction({\n  actionType: 'setValue',\n  componentId: \"apps-form\",\n  args: {\n    value: convertDataForTabs(eventData)\n  }\n});\n\n"
+                                                                                "script": "const tabGroupKey = \"group\";\nconst getTabsSortFun = function (groupNames) {\n  return function (m, n) {\n    var tempM = !!m[tabGroupKey] ? 1 : 0;\n    var tempN = !!n[tabGroupKey] ? 1 : 0;\n    if (!m[tabGroupKey] || !n[tabGroupKey]) {\n      // 没有配置group属性的字段排在前面\n      return tempM - tempN;\n    }\n    // 字段所属分组不在groupNames时排在前面，其他字段按其所属分组在groupNames中的排序先后顺序排序，所属分组相同的字段排在一起。\n    return groupNames.indexOf(m[tabGroupKey]) - groupNames.indexOf(n[tabGroupKey]);\n  };\n}\n\nconst clearTabs = function (input) { \n  return {\n    tab_items: []\n  }\n}\n\nconst convertDataForTabs = function (input) { \n  let pickedTabs = input.picked_tabs || [];\n  const superTabs = _.keyBy(input.__super.tab_items, 'tab_name');\n  if (typeof pickedTabs === \"string\") {\n    pickedTabs = pickedTabs.split(\",\");\n  }\n  const tabOptions = _.keyBy(input.__super.__super.__super.__super.__super.tabs_options, \"value\");\n  const convertedTabs = pickedTabs.map(function (tab_name) {\n    const superTab = superTabs[tab_name];\n    if (superTab) {\n      return superTab;\n    }\n    else {\n      const tabOption = tabOptions[tab_name];\n      return {\n        tab_name: tab_name,\n        group: tabOption.group\n      }\n    }\n  });\n  const tabGroups = input.__super.__super.__super.__super.__super.tab_groups;\n  const groupNames = _.compact(_.map(tabGroups, \"group_name\"));\n  // tabs重新按分组排序\n  if (groupNames && groupNames.length) { \n    convertedTabs.sort(getTabsSortFun(groupNames));\n  }\n  return {\n    tab_items: convertedTabs\n  }\n}\n\nconst eventData = event.data;\ndoAction({\n  actionType: 'setValue',\n  componentId: \"apps-form\",\n  args: {\n    value: clearTabs()\n  }\n});\n\ndoAction({\n  actionType: 'setValue',\n  componentId: \"apps-form\",\n  args: {\n    value: convertDataForTabs(eventData)\n  }\n});\n\n"
                                                                             }
                                                                         ]
                                                                     }
@@ -386,7 +386,7 @@
                                                                         "actions": [
                                                                             {
                                                                                 "actionType": "custom",
-                                                                                "script": "const tabGroupKey = \"group\";\nconst getTabsSortFun = function (groupNames) {\n  return function (m, n) {\n    var tempM = !!m[tabGroupKey] ? 1 : 0;\n    var tempN = !!n[tabGroupKey] ? 1 : 0;\n    if (!m[tabGroupKey] || !n[tabGroupKey]) {\n      // 没有配置group属性的字段排在前面\n      return tempM - tempN;\n    }\n    // 字段所属分组不在groupNames时排在前面，其他字段按其所属分组在groupNames中的排序先后顺序排序，所属分组相同的字段排在一起。\n    return groupNames.indexOf(m[tabGroupKey]) - groupNames.indexOf(n[tabGroupKey]);\n  };\n}\n\nconst clearTabs = function (input) {\n  return {\n    tab_items: []\n  }\n}\n\n// 把”设置分组“弹出窗口中设置的分组转为主表单groups字段值格式\n// 同时根据新的groups排序重新设置tabs属性的字段先后次序\n// 因为直接设置tabs值有bug，即新值老值会串，所以需要先执行上面的clearTabs清除原来的值\nconst convertDataForGroups = function(input) {\n  const settingGroups = input.setting_groups || [];\n  const convertedGroups = lodash.uniqBy(settingGroups.map(function (item) {\n    return {\n      group_name: item.group_name\n    }\n  }), \"group_name\");\n\n  const groupNames = lodash.compact(lodash.map(convertedGroups, \"group_name\"));\n  const tab_items = input.__super.__super.items;\n  // tabs重新按分组排序\n  tab_items.sort(getTabsSortFun(groupNames));\n\n  return {\n    tab_groups: convertedGroups,\n    tab_items: tab_items\n  }\n};\n\nconst eventData = event.data;\ndoAction({\n  actionType: 'setValue',\n  componentId: \"apps-form\",\n  args: {\n    value: clearTabs()\n  }\n});\n\ndoAction({\n  actionType: 'setValue',\n  componentId: \"apps-form\",\n  args: {\n    value: convertDataForGroups(eventData)\n  }\n});\n\n"
+                                                                                "script": "const tabGroupKey = \"group\";\nconst getTabsSortFun = function (groupNames) {\n  return function (m, n) {\n    var tempM = !!m[tabGroupKey] ? 1 : 0;\n    var tempN = !!n[tabGroupKey] ? 1 : 0;\n    if (!m[tabGroupKey] || !n[tabGroupKey]) {\n      // 没有配置group属性的字段排在前面\n      return tempM - tempN;\n    }\n    // 字段所属分组不在groupNames时排在前面，其他字段按其所属分组在groupNames中的排序先后顺序排序，所属分组相同的字段排在一起。\n    return groupNames.indexOf(m[tabGroupKey]) - groupNames.indexOf(n[tabGroupKey]);\n  };\n}\n\nconst clearTabs = function (input) {\n  return {\n    tab_items: []\n  }\n}\n\n// 把”设置分组“弹出窗口中设置的分组转为主表单groups字段值格式\n// 同时根据新的groups排序重新设置tabs属性的字段先后次序\n// 因为直接设置tabs值有bug，即新值老值会串，所以需要先执行上面的clearTabs清除原来的值\nconst convertDataForGroups = function(input) {\n  const settingGroups = input.setting_groups || [];\n  const convertedGroups = _.uniqBy(settingGroups.map(function (item) {\n    return {\n      group_name: item.group_name\n    }\n  }), \"group_name\");\n\n  const groupNames = _.compact(_.map(convertedGroups, \"group_name\"));\n  const tab_items = input.__super.__super.items;\n  // tabs重新按分组排序\n  tab_items.sort(getTabsSortFun(groupNames));\n\n  return {\n    tab_groups: convertedGroups,\n    tab_items: tab_items\n  }\n};\n\nconst eventData = event.data;\ndoAction({\n  actionType: 'setValue',\n  componentId: \"apps-form\",\n  args: {\n    value: clearTabs()\n  }\n});\n\ndoAction({\n  actionType: 'setValue',\n  componentId: \"apps-form\",\n  args: {\n    value: convertDataForGroups(eventData)\n  }\n});\n\n"
                                                                             }
                                                                         ]
                                                                     }
@@ -494,7 +494,8 @@
                             "className": "",
                             "contentClassName": ""
                         }
-                    ]
+                    ],
+                    "messages": {}
                 }
             ],
             "panelClassName": "m-0 -mt-3",
@@ -538,7 +539,10 @@
     "data": {
         "objectName": "apps",
         "context": {
-            "rootUrl": "http://127.0.0.1:5800"
+            "rootUrl": "http://127.0.0.1:5800",
+            "tenantId": "hKdnwE55WcnWveYxS",
+            "userId": "62ede4f62161e377e35de58c",
+            "authToken": "dd5788a359e3435f46d35fdafc2ea9f82aef1e4e653f9813da81bb403916f1e9801902331c75dcc8cbd5c0"
         }
     },
     "id": "u:953fda4052b6",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-plugin-amis",
-  "version": "2.3.0-beta.24",
+  "version": "2.3.0-beta.26",
   "main": "package.service.js",
   "scripts": {
     "build": "node .scripts/build.tailwind.js"
@@ -10,5 +10,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f0923dfdf986929079b63dfe8adc0d446bb38f6a"
+  "gitHead": "38a77106857327c34de3145a9ea9aeeb47957b2c"
 }