@steedos/service-plugin-amis 2.6.7-beta.8 → 2.6.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/main/default/pages/listview_form.page.amis.json +7 -1
  2. package/main/default/pages/object_layouts_form.page.amis.json +18 -1
  3. package/main/default/services/amis-design.service.js +4 -5
  4. package/main/default/translations/en.translation.yml +1 -0
  5. package/main/default/translations/zh-CN.translation.yml +1 -0
  6. package/package.json +2 -2
package/main/default/pages/listview_form.page.amis.json CHANGED
@@ -269,9 +269,15 @@
269
269
  "multiple": true,
270
270
  "id": "u:adb91066539e"
271
271
  }
272
+ },
273
+ "shared_to": {
274
+ "amis":{
275
+ "type": "radios",
276
+ "inline": false
277
+ }
272
278
  }
273
279
  },
274
- "initApiAdaptor": "\nvar data;\nif (recordId) {\n data = payload.data || { _filters_type_controller: 'conditions' };\n //数据格式转换\n if (data) {\n data.sort = lodash.map(data.sort, (item) => {\n return item.field_name + \":\" + item.order;\n });\n data.searchable_fields = lodash.map(data.searchable_fields, 'field');\n\n if (data.filters && lodash.isString(data.filters)) {\n try {\n data.filters = JSON.parse(data.filters);\n } catch (e) { }\n }\n\n if (data.filters && lodash.isString(data.filters)) {\n data._filters_type_controller = 'function';\n } else {\n data._filters_type_controller = 'conditions'\n }\n\n if (data._filters_type_controller === 'conditions') {\n data._filters_conditions = window.amisConvert.filtersToConditions(data.filters || []);\n } else {\n data._filters_function = data.filters;\n }\n }\n} else {\n const uiSchema = api.body.uiSchema;\n const defaultData = api.body.defaultData;\n let defaultValues = {};\n _.each(uiSchema && uiSchema.fields, function (field) {\n var value = SteedosUI.getFieldDefaultValue(field, api.body.global);\n if (!_.isNil(value)) {\n defaultValues[field.name] = value;\n }\n });\n if (defaultData && _.isObject(defaultData) && !_.isArray(defaultData)) {\n data = Object.assign({}, defaultValues, defaultData)\n }\n}\nfor (key in data) {\n if (data[key] === null) {\n delete data[key];\n }\n}\npayload.data = data;\ndelete payload.extensions; if (data.is_enable != false) { data.is_enable = true; };\nreturn payload;",
280
+ "initApiAdaptor": "\nvar data;\nif (recordId) {\n data = payload.data || { _filters_type_controller: 'conditions' };\n //数据格式转换\n if (data) {\n data.sort = lodash.map(data.sort, (item) => {\n return item.field_name + \":\" + item.order;\n });\n data.searchable_fields = lodash.map(data.searchable_fields, 'field');\n\n if (data.filters && lodash.isString(data.filters)) {\n try {\n data.filters = JSON.parse(data.filters);\n } catch (e) { }\n }\n\n if (data.filters && lodash.isString(data.filters)) {\n data._filters_type_controller = 'function';\n } else {\n data._filters_type_controller = 'conditions'\n }\n\n if (data._filters_type_controller === 'conditions') {\n data._filters_conditions = window.amisConvert.filtersToConditions(data.filters || []);\n } else {\n data._filters_function = data.filters;\n }\n }\n} else {\n const uiSchema = api.body.uiSchema;\n const contextDefaultData = context && context.data && context.data.defaultData; const defaultData = api.body.defaultData || contextDefaultData;\n let defaultValues = {};\n _.each(uiSchema && uiSchema.fields, function (field) {\n var value = SteedosUI.getFieldDefaultValue(field, api.body.global);\n if (!_.isNil(value)) {\n defaultValues[field.name] = value;\n }\n });\n if (defaultData && _.isObject(defaultData) && !_.isArray(defaultData)) {\n data = Object.assign({}, defaultValues, defaultData); \n }else{data = Object.assign({}, defaultValues) } \n}\nfor (key in data) {\n if (data[key] === null) {\n delete data[key];\n }\n}\npayload.data = data;\ndelete payload.extensions; if (data.is_enable != false) { data.is_enable = true; };\nreturn payload;",
275
281
  "apiRequestAdaptor": "delete formData.created;\ndelete formData.created_by;\ndelete formData.modified;\ndelete formData.modified_by;\ndelete formData._display;\n\n//数据格式转换\nformData.sort = lodash.map(formData.sort, (item) => {\n const arr = item.split(':');\n return { field_name: arr[0], order: arr[1] };\n});\n\nformData.searchable_fields = lodash.map(formData.searchable_fields, (item) => {\n return { field: item };\n});\n\nif (!formData._filters_type_controller) {\n formData._filters_type_controller = 'conditions';\n}\n\nif (formData._filters_type_controller === 'conditions' && formData._filters_conditions) {\n formData.filters = window.amisConvert.conditionsToFilters(formData._filters_conditions);\n // formData.filters = JSON.stringify(window.amisConvert.conditionsToFilters(formData._filters_conditions), null, 4);\n} else {\n formData.filters = formData._filters_function || null;\n}\n\ndelete formData._filters_type_controller;\ndelete formData._filters_conditions;\ndelete formData._filters_function;\n\nquery = `mutation{record: object_listviews__insert(doc: {__saveData}){_id}}`;\nif (formData.recordId) {\n query = `mutation{record: object_listviews__update(id: \"` + formData._id + `\", doc: {__saveData}){_id}}`;\n};\n__saveData = JSON.stringify(JSON.stringify(formData));\n\napi.data = { query: query.replace('{__saveData}', __saveData) };\nreturn api;",
276
282
  "id": "u:ce9e3fcc411a"
277
283
  }
package/main/default/pages/object_layouts_form.page.amis.json CHANGED
@@ -238,6 +238,7 @@
238
238
  "editable": true,
239
239
  "showIndex": true,
240
240
  "removable": true,
241
+ "inlineEditMode": true,
241
242
  "fields": [
242
243
  {
243
244
  "name": "group_name",
@@ -249,6 +250,22 @@
249
250
  "type": "text",
250
251
  "name": "visible_on",
251
252
  "label": "${'object_layouts.object_layouts_form.visible_on' | t}"
253
+ },
254
+ {
255
+ "type": "boolean",
256
+ "name": "collapsed",
257
+ "label": "${'object_layouts.object_layouts_form.collapsed' | t}"
258
+ }
259
+ ],
260
+ "columns": [
261
+ {
262
+ "name": "group_name",
263
+ "inlineEditMode": false
264
+ },
265
+ "visible_on",
266
+ {
267
+ "name": "collapsed",
268
+ "width": 50
252
269
  }
253
270
  ],
254
271
  "id": "u:e9f43ef94d08"
@@ -328,7 +345,7 @@
328
345
  "actions": [
329
346
  {
330
347
  "actionType": "custom",
331
- "script": "const mixingGroupsFromFields = function (input, formData) { const groupsOptions = input.field_groups_options; const groups = formData.field_groups || []; const object_field_groups = formData.object_field_groups || []; const groupsForMixing = groupsOptions.map(function (item) { return { group_name: item } }); const mixedGroups = lodash.unionBy(groups, groupsForMixing, object_field_groups, \"group_name\"); return { field_groups: mixedGroups }};const eventData = event.data;doAction({ actionType: 'setValue', componentId: \"object-layout-form\", args: { value: mixingGroupsFromFields(eventData, context.props.data) }});"
348
+ "script": "const mixingGroupsFromFields = function (input, formData) { const groupsOptions = input.field_groups_options; const groups = formData.field_groups || []; const object_field_groups = formData.object_field_groups || []; const groupsForMixing = groupsOptions.map(function (item) { return { group_name: item } }); const mixedGroups = lodash.unionBy(groups, object_field_groups, groupsForMixing, \"group_name\"); return { field_groups: mixedGroups }};const eventData = event.data;doAction({ actionType: 'setValue', componentId: \"object-layout-form\", args: { value: mixingGroupsFromFields(eventData, context.props.data) }});"
332
349
  }
333
350
  ]
334
351
  }
package/main/default/services/amis-design.service.js CHANGED
@@ -140,7 +140,7 @@ module.exports = {
140
140
  }
141
141
 
142
142
  const objectListViews = objectql.getSteedosSchema().metadataDriver.find(dbListViews, {
143
- filters: [['object_name', '=', object.name], ['shared', '=', true] ],
143
+ filters: [['object_name', '=', object.name], [['shared', '=', true], 'or',['shared_to', '=', "space"]]],
144
144
  fields: "_id, name, label"
145
145
  }, spaceId);
146
146
 
@@ -175,8 +175,7 @@ module.exports = {
175
175
  };
176
176
 
177
177
  const objects = objectql.getSteedosSchema().metadataDriver.find(allObjects, query, spaceId);
178
-
179
- const dbListViews = await objectql.getObject('object_listviews').directFind({filters: [['shared', '!=', false]]})
178
+ const dbListViews = await objectql.getObject('object_listviews').directFind({filters: [['shared', '=', true], 'or',['shared_to', '=', "space"]]})
180
179
 
181
180
  _.each(objects, (object)=>{
182
181
  if(object && object.name){
@@ -205,7 +204,7 @@ module.exports = {
205
204
  }
206
205
 
207
206
  const objectListViews = objectql.getSteedosSchema().metadataDriver.find(dbListViews, {
208
- filters: [['object_name', '=', object.name], ['shared', '=', true] ],
207
+ filters: [['object_name', '=', object.name], [['shared', '=', true], 'or',['shared_to', '=', "space"]]],
209
208
  fields: "_id, name, label"
210
209
  }, spaceId);
211
210
 
@@ -345,7 +344,7 @@ module.exports = {
345
344
  }
346
345
 
347
346
  const objectListViews = objectql.getSteedosSchema().metadataDriver.find(dbListViews, {
348
- filters: [['object_name', '=', object.name], ['shared', '=', true] ],
347
+ filters: [['object_name', '=', object.name], [['shared', '=', true], 'or',['shared_to', '=', "space"]]],
349
348
  fields: "_id, name, label"
350
349
  }, spaceId);
351
350
 
package/main/default/translations/en.translation.yml CHANGED
@@ -14,6 +14,7 @@ CustomLabels:
14
14
  grouping_set: Set Grouping
15
15
  group_name: Name
16
16
  visible_on: VisibleOn
17
+ collapsed: Default Folded
17
18
  related_list_name: Related List Name
18
19
  related_list_label: Displayed Title
19
20
  related_list_label_remark: Default to object name
package/main/default/translations/zh-CN.translation.yml CHANGED
@@ -14,6 +14,7 @@ CustomLabels:
14
14
  grouping_set: 设置分组
15
15
  group_name: 名称
16
16
  visible_on: 显示条件
17
+ collapsed: 默认折叠
17
18
  related_list_name: 子表名称
18
19
  related_list_label: 显示标题
19
20
  related_list_label_remark: 默认为对象名称
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@steedos/service-plugin-amis",
3
- "version": "2.6.7-beta.8",
3
+ "version": "2.6.7",
4
4
  "main": "package.service.js",
5
5
  "scripts": {
6
6
  "build": "yarn build:tailwind-base && yarn build:tailwind",
@@ -13,7 +13,7 @@
13
13
  "publishConfig": {
14
14
  "access": "public"
15
15
  },
16
- "gitHead": "3134b434a236a923da7ed02d4c82db02656fe82c",
16
+ "gitHead": "7852282dc4524d9669457debd787bcd6c8614a3d",
17
17
  "devDependencies": {
18
18
  "tailwindcss": "3.2.4"
19
19
  }