diff --git a/zero-ambient/src/main/resources/plugin/ambient/oob/module/ui/x.tag.json b/zero-ambient/src/main/resources/plugin/ambient/oob/module/ui/x.tag.json index 3191240872db0bb91a67a86f15a6be3378a84e96..3a92b926babe637f6f2c880590a428d6733df601 100644 --- a/zero-ambient/src/main/resources/plugin/ambient/oob/module/ui/x.tag.json +++ b/zero-ambient/src/main/resources/plugin/ambient/oob/module/ui/x.tag.json @@ -1,5 +1,7 @@ [ - "name,标签名称", + { + "metadata": "name,标签名称" + }, { "metadata": "icon,图标,TAG", "$config": { @@ -9,5 +11,46 @@ ] } }, - "description,描述,TEXT" + { + "title": "是否启用", + "dataIndex": "active", + "sorter": true, + "$render": "LOGICAL", + "$mapping": { + "true": "启用", + "false": "禁用" + }, + "$filter.config.dataType": "BOOLEAN", + "$filter.config.items": [ + "true,启用", + "false,禁用" + ], + "$filter.config.button": { + "yes": "确认", + "reset": "重置" + }, + "$filter.config.width": { + "radio": 110, + "button": 55 + } + }, + { + "metadata": "description,描述,TEXT" + }, + { + "title": "创建人", + "dataIndex": "createdBy", + "$render": "USER", + "$config": { + "uri": "/api/user/:key", + "field": "realname" + }, + "$empty": "(系统)" + }, + { + "title": "创建时间", + "dataIndex": "createdAt", + "$render": "DATE", + "$format": "YYYY-MM-DD" + } ] \ No newline at end of file diff --git a/zero-atom/src/main/resources/workflow/linkage/asset.json b/zero-atom/src/main/resources/workflow/linkage/asset.json index c8137a32bbd0e013fca47b6b8b2f3f3c1bb6cc3d..f373674e5cad9981a19acdd7fb343897274a015a 100644 --- a/zero-atom/src/main/resources/workflow/linkage/asset.json +++ b/zero-atom/src/main/resources/workflow/linkage/asset.json @@ -50,7 +50,7 @@ "placeholder": "资产编号/名称" }, "ajax": { - "uri": "/api/xc/ci.device/search", + "uri": "/api/nm/ci.device/search", "method": "POST", "error": { "message": "资产模块未启用", diff --git a/zero-doc/src/main/resources/plugin/doc/oob/cab/d.paper.xlsx b/zero-doc/src/main/resources/plugin/doc/oob/cab/d.paper.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..a720b1cdc0e396a433f830d63aefbe20de5bb515 Binary files /dev/null and b/zero-doc/src/main/resources/plugin/doc/oob/cab/d.paper.xlsx differ diff --git a/zero-doc/src/main/resources/plugin/doc/oob/initialize.json b/zero-doc/src/main/resources/plugin/doc/oob/initialize.json index 3cbec822631c76713298e4031ba6eabe397d2dff..47fa3a635dd84f5ce5bc81bc1cb051f89cc919da 100644 --- a/zero-doc/src/main/resources/plugin/doc/oob/initialize.json +++ b/zero-doc/src/main/resources/plugin/doc/oob/initialize.json @@ -1,6 +1,8 @@ [ "plugin/doc/oob/cab/d.doc.xlsx", + "plugin/doc/oob/cab/d.paper.xlsx", "plugin/doc/oob/data/doc.directory.tree.xlsx", "plugin/doc/oob/data/doc.directory.xlsx", - "plugin/doc/oob/role/ADMIN.SUPER/falcon.d.doc.xlsx" + "plugin/doc/oob/role/ADMIN.SUPER/falcon.d.doc.xlsx", + "plugin/doc/oob/role/ADMIN.SUPER/falcon.d.paper.xlsx" ] \ No newline at end of file diff --git a/zero-doc/src/main/resources/plugin/doc/oob/module.json b/zero-doc/src/main/resources/plugin/doc/oob/module.json index 0da1b5cb6ca7369abf1354153874925d0f5f34c0..c886a48e344342bb899a08801531fa0c699f80ca 100644 --- a/zero-doc/src/main/resources/plugin/doc/oob/module.json +++ b/zero-doc/src/main/resources/plugin/doc/oob/module.json @@ -1,3 +1,4 @@ [ - "d.doc" + "d.doc", + "d.paper" ] \ No newline at end of file diff --git a/zero-doc/src/main/resources/plugin/doc/oob/module/crud/d.paper.json b/zero-doc/src/main/resources/plugin/doc/oob/module/crud/d.paper.json new file mode 100644 index 0000000000000000000000000000000000000000..84c2cda8755c1d0144c057327db573c41c36059f --- /dev/null +++ b/zero-doc/src/main/resources/plugin/doc/oob/module/crud/d.paper.json @@ -0,0 +1,12 @@ +{ + "name": "paper", + "daoCls": "cn.vertxup.doc.domain.tables.daos.DPaperDao", + "field": { + "unique": [ + [ + "code", + "sigma" + ] + ] + } +} \ No newline at end of file diff --git a/zero-doc/src/main/resources/plugin/doc/oob/module/ui/d.paper.json b/zero-doc/src/main/resources/plugin/doc/oob/module/ui/d.paper.json new file mode 100644 index 0000000000000000000000000000000000000000..628585ad71ac148f8d763ed0545392afa95a4f72 --- /dev/null +++ b/zero-doc/src/main/resources/plugin/doc/oob/module/ui/d.paper.json @@ -0,0 +1,63 @@ +[ + { + "title": "名称", + "dataIndex": "name", + "sorter": true, + "$filter.type": "SEARCH", + "$filter.config": { + "placeholder": "输入名称", + "button": { + "search": "搜索", + "reset": "重置" + } + } + }, + { + "title": "编号", + "dataIndex": "code", + "sorter": true, + "$filter.type": "SEARCH", + "$filter.config": { + "placeholder": "输入编号", + "button": { + "search": "搜索", + "reset": "重置" + } + } + }, + { + "title": "类型", + "dataIndex": "type" + }, + { + "metadata": "status,状态,MAPPING", + "$mapping": { + "DRAFT": "草稿", + "PENDING": "待审批", + "RELEASE": "已发布", + "ARCHIVE": "已归档", + "RUNNING": "活动中", + "STOPPED": "已结束" + } + }, + { + "title": "版本", + "dataIndex": "version" + }, + { + "title": "更新人", + "dataIndex": "updatedBy", + "$render": "USER", + "$config": { + "uri": "/api/user/:key", + "field": "realname" + }, + "$empty": "(系统)" + }, + { + "title": "更新时间", + "dataIndex": "updatedAt", + "$render": "DATE", + "$format": "YYYY-MM-DD HH:mm" + } +] \ No newline at end of file diff --git a/zero-doc/src/main/resources/plugin/doc/oob/role/ADMIN.SUPER/falcon.d.paper.xlsx b/zero-doc/src/main/resources/plugin/doc/oob/role/ADMIN.SUPER/falcon.d.paper.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..633a84e981dd9281c4a46e2a50c2c7699705b442 Binary files /dev/null and b/zero-doc/src/main/resources/plugin/doc/oob/role/ADMIN.SUPER/falcon.d.paper.xlsx differ diff --git a/zero-doc/src/main/resources/plugin/ke/rule.form/d.paper.json b/zero-doc/src/main/resources/plugin/ke/rule.form/d.paper.json new file mode 100644 index 0000000000000000000000000000000000000000..c276d707faf787a924ecf6e020727be4fe79c758 --- /dev/null +++ b/zero-doc/src/main/resources/plugin/ke/rule.form/d.paper.json @@ -0,0 +1,8 @@ +{ + "phase": "AFTER", + "data": { + "type": "RECORD", + "viewId": "`${viewId}`", + "identifier": "d.paper" + } +} \ No newline at end of file