@next-bricks/presentational-bricks 1.247.2 → 1.247.5

package/dist/stories.json

@@ -14661,25 +14661,15 @@
                     "action": "console.info"
                   }
                 }
-              }
-            ]
-          }
-        }
-      },
-      {
-        "brick": "div",
-        "slots": {
-          "": {
-            "type": "bricks",
-            "bricks": [
+              },
               {
                 "brick": "basic-bricks.general-button",
                 "properties": {
-                  "buttonName": "Delete"
+                  "buttonName": "Info"
                 },
                 "events": {
                   "general.button.click": {
-                    "target": "presentational-bricks\\.modal-confirm#deleteModal",
+                    "target": "presentational-bricks\\.modal-confirm#infoModal",
                     "method": "open"
                   }
                 }
@@ -14687,15 +14677,14 @@
               {
                 "brick": "presentational-bricks.modal-confirm",
                 "properties": {
-                  "id": "deleteModal",
+                  "id": "infoModal",
+                  "type": "info",
                   "dataSource": {
                     "name": "测试程序包",
                     "version": "1.0.0"
                   },
-                  "modalTitle": "删除提示确认框",
-                  "content": "请确认后在下方输入<strong>pipeline</strong>来解锁确定按钮",
-                  "isDelete": true,
-                  "expect": "pipeline"
+                  "modalTitle": "info",
+                  "content": "#{name}更新中"
                 },
                 "events": {
                   "confirm.ok": {
@@ -14705,25 +14694,15 @@
                     "action": "console.info"
                   }
                 }
-              }
-            ]
-          }
-        }
-      },
-      {
-        "brick": "div",
-        "slots": {
-          "": {
-            "type": "bricks",
-            "bricks": [
+              },
               {
                 "brick": "basic-bricks.general-button",
                 "properties": {
-                  "buttonName": "Info"
+                  "buttonName": "Delete"
                 },
                 "events": {
                   "general.button.click": {
-                    "target": "presentational-bricks\\.modal-confirm#infoModal",
+                    "target": "presentational-bricks\\.modal-confirm#deleteModal",
                     "method": "open"
                   }
                 }
@@ -14731,14 +14710,15 @@
               {
                 "brick": "presentational-bricks.modal-confirm",
                 "properties": {
-                  "id": "infoModal",
-                  "type": "info",
+                  "id": "deleteModal",
                   "dataSource": {
                     "name": "测试程序包",
                     "version": "1.0.0"
                   },
-                  "modalTitle": "info",
-                  "content": "#{name}更新中"
+                  "modalTitle": "删除提示确认框",
+                  "content": "请确认后在下方输入<strong>pipeline</strong>来解锁确定按钮",
+                  "isDelete": true,
+                  "expect": "pipeline"
                 },
                 "events": {
                   "confirm.ok": {
@@ -14748,17 +14728,7 @@
                     "action": "console.info"
                   }
                 }
-              }
-            ]
-          }
-        }
-      },
-      {
-        "brick": "div",
-        "slots": {
-          "": {
-            "type": "bricks",
-            "bricks": [
+              },
               {
                 "brick": "basic-bricks.general-button",
                 "properties": {
@@ -14791,17 +14761,7 @@
                     "action": "console.info"
                   }
                 }
-              }
-            ]
-          }
-        }
-      },
-      {
-        "brick": "div",
-        "slots": {
-          "": {
-            "type": "bricks",
-            "bricks": [
+              },
               {
                 "brick": "basic-bricks.general-button",
                 "properties": {
@@ -14834,9 +14794,42 @@
                     "action": "console.info"
                   }
                 }
+              },
+              {
+                "brick": "basic-bricks.general-button",
+                "properties": {
+                  "buttonName": "Warning"
+                },
+                "events": {
+                  "general.button.click": {
+                    "target": "presentational-bricks\\.modal-confirm#warningModal",
+                    "method": "open"
+                  }
+                }
+              },
+              {
+                "brick": "presentational-bricks.modal-confirm",
+                "properties": {
+                  "id": "warningModal",
+                  "type": "warning",
+                  "modalTitle": "warning",
+                  "content": "补丁更新警告"
+                },
+                "events": {
+                  "confirm.ok": {
+                    "action": "console.info"
+                  },
+                  "confirm.cancel": {
+                    "action": "console.info"
+                  }
+                }
               }
             ]
           }
+        },
+        "description": {
+          "title": "基本",
+          "message": "各种类型的确认对话框"
         }
       },
       {
@@ -14848,7 +14841,7 @@
               {
                 "brick": "basic-bricks.general-button",
                 "properties": {
-                  "buttonName": "Warning"
+                  "buttonName": "Template Demo"
                 },
                 "events": {
                   "general.button.click": {
@@ -14863,11 +14856,12 @@
                   "id": "warningModal",
                   "type": "warning",
                   "dataSource": {
-                    "name": "测试程序包",
+                    "name": "春节热更新",
                     "version": "1.0.0"
                   },
                   "modalTitle": "warning",
-                  "content": "#{name}更新警告"
+                  "content": "正在更新补丁 <strong>#{name}</strong>",
+                  "extraContent": "版本号 <strong>#{version}</strong>"
                 },
                 "events": {
                   "confirm.ok": {
@@ -14880,6 +14874,10 @@
               }
             ]
           }
+        },
+        "description": {
+          "title": "使用模板语言",
+          "message": "通过dataSource配合模板语言，实现内容的动态渲染"
         }
       },
       {
@@ -14888,57 +14886,6 @@
           "": {
             "type": "bricks",
             "bricks": [
-              {
-                "brick": "presentational-bricks.brick-utils",
-                "bg": true
-              },
-              {
-                "brick": "providers-of-cmdb.instance-api-delete-instance",
-                "injectDeep": true,
-                "bg": true,
-                "properties": {
-                  "args": [
-                    "HOST",
-                    "1"
-                  ]
-                },
-                "events": {
-                  "response.success": [
-                    {
-                      "target": "presentational-bricks\\.modal-confirm#instance-delete-modal",
-                      "properties": {
-                        "confirmLoading": false,
-                        "cancelButtonProps": {
-                          "disabled": false
-                        }
-                      }
-                    },
-                    {
-                      "target": "presentational-bricks\\.modal-confirm#confirmLoadingModal",
-                      "method": "close"
-                    }
-                  ],
-                  "response.error": [
-                    {
-                      "target": "presentational-bricks\\.modal-confirm#instance-delete-modal",
-                      "properties": {
-                        "confirmLoading": false,
-                        "cancelButtonProps": {
-                          "disabled": false
-                        }
-                      }
-                    },
-                    {
-                      "target": "presentational-bricks\\.modal-confirm#confirmLoadingModal",
-                      "method": "close"
-                    },
-                    {
-                      "target": "presentational-bricks\\.brick-utils",
-                      "method": "handleHttpError"
-                    }
-                  ]
-                }
-              },
               {
                 "brick": "basic-bricks.general-button",
                 "properties": {
@@ -14966,16 +14913,29 @@
                 "events": {
                   "confirm.ok": [
                     {
-                      "target": "providers-of-cmdb\\.instance-api-delete-instance",
-                      "method": "execute"
+                      "action": "message.info",
+                      "args": [
+                        "requesting some api..."
+                      ]
                     },
                     {
                       "target": "presentational-bricks\\.modal-confirm#confirmLoadingModal",
                       "properties": {
-                        "confirmLoading": true,
-                        "cancelButtonProps": {
-                          "disabled": true
-                        }
+                        "confirmLoading": true
+                      }
+                    }
+                  ],
+                  "confirm.cancel": [
+                    {
+                      "action": "message.warn",
+                      "args": [
+                        "cancel requesting api..."
+                      ]
+                    },
+                    {
+                      "target": "presentational-bricks\\.modal-confirm#confirmLoadingModal",
+                      "properties": {
+                        "confirmLoading": false
                       }
                     }
                   ]
@@ -14983,6 +14943,10 @@
               }
             ]
           }
+        },
+        "description": {
+          "title": "Loading状态",
+          "message": "在发起后台请求并且请求较慢的情况下可以设置 loading 状态优化用户体验"
         }
       },
       {
@@ -14996,24 +14960,18 @@
                 "properties": {
                   "id": "delete-confirm",
                   "modalTitle": "工作空间删除确认",
-                  "extraContent": "有关联的不能删除",
-                  "isDelete": true
+                  "extraContent": "Tips: 有关联的不能删除",
+                  "okType": "danger"
                 }
               },
               {
                 "brick": "basic-bricks.general-custom-buttons",
                 "properties": {
                   "dataSource": {
-                    "title": "role",
-                    "count": 1
+                    "title": "MyWorkspace",
+                    "relatedCount": 1
                   },
                   "customButtons": [
-                    {
-                      "isDropdown": true,
-                      "text": "另存为",
-                      "icon": "file-add",
-                      "eventName": "instance.saveAs"
-                    },
                     {
                       "isDropdown": true,
                       "text": "删除工作区间",
@@ -15026,19 +14984,16 @@
                 "events": {
                   "workload.delete": [
                     {
-                      "action": "console.log",
-                      "args": [
-                        "${event.detail.count|boolean}"
-                      ]
+                      "action": "console.log"
                     },
                     {
                       "target": "#delete-confirm",
                       "method": "openWithArgs",
                       "args": [
                         {
-                          "content": "确认要删除工作空间<strong>${event.detail.title}</strong>吗？",
+                          "content": "<% `确认要删除工作空间<strong>${EVENT.detail.title}</strong>吗?` %>",
                           "okButtonProps": {
-                            "disabled": "${event.detail.count|boolean}"
+                            "disabled": "<% EVENT.detail.relatedCount %>"
                           }
                         }
                       ]
@@ -15048,6 +15003,10 @@
               }
             ]
           }
+        },
+        "description": {
+          "title": "设置按钮的高级属性",
+          "message": "通过设置okButtonProps和cancelButtonProps来改变按钮样式，例如设置禁用"
         }
       }
     ],
@@ -15057,6 +15016,24 @@
       "name": "presentational-bricks.modal-confirm",
       "dockind": "brick",
       "description": "用于提示和二次确认的场景",
+      "groupI18N": {
+        "basic": {
+          "en": "Basic",
+          "zh": "常用"
+        },
+        "buttonAndInteract": {
+          "en": "Button/Interact",
+          "zh": "按钮及交互"
+        },
+        "ui": {
+          "en": "UI",
+          "zh": "外观"
+        },
+        "other": {
+          "en": "其他",
+          "zh": "other"
+        }
+      },
       "editor": "shared-editors.general-confirm--editor",
       "author": "jo",
       "slots": null,
@@ -15081,71 +15058,63 @@
           "type": "string",
           "required": "false",
           "default": "-",
-          "description": "模态框标题，代替之前 title 属性, 支持模板(即通过 #{xxx} 方式获取数据源字段的上值，由于框架目前提供了 transform 机制也可以达到此需求，推荐使用框架提供的能力)"
+          "description": "模态框标题，代替之前 title 属性, 支持模板(即通过 #{xxx} 方式获取数据源字段的上值，由于框架目前提供了 transform 机制也可以达到此需求，推荐使用框架提供的能力)",
+          "group": "basic"
         },
         {
           "name": "content",
           "type": "string",
           "required": "false",
           "default": "-",
-          "description": "模态框内容，支持模板和 HTML（自动消毒）"
+          "description": "模态框内容，支持模板和 HTML（自动消毒）",
+          "group": "basic"
         },
         {
           "name": "extraContent",
           "type": "string",
           "required": "false",
           "default": "-",
-          "description": "模态框的额外内容，支持模板和 HTML（自动消毒）"
+          "description": "模态框的额外内容，支持模板和 HTML（自动消毒）",
+          "group": "basic"
         },
         {
-          "name": "isDelete",
-          "type": "boolean",
+          "name": "dataSource",
+          "type": "Record<string, any>",
           "required": "false",
           "default": "-",
-          "description": "是否是删除模式的模态框（确定按钮的文本为删除，并红色高亮显示）"
+          "description": "解析模板时的数据源，配合content、extraContent使用"
         },
         {
-          "name": "closeWhenOk",
-          "type": "boolean",
+          "name": "contentBrick",
+          "type": "{useBrick: UseBrickConf}",
           "required": "false",
-          "default": "true",
-          "description": "点击确定按钮是否关闭模态框"
+          "default": "false",
+          "description": "panelBrick"
         },
         {
           "name": "type",
           "type": "\"info\" | \"success\" | \"error\" | \"warning\" | \"confirm\"",
           "required": "false",
           "default": "confirm",
-          "description": "对话框类型"
+          "description": "对话框类型",
+          "group": "ui"
         },
         {
           "name": "expect",
           "type": "string",
           "required": "false",
           "default": "-",
-          "description": "支持模板，若设置，需输入该文本方可删除"
-        },
-        {
-          "name": "confirmLoading",
-          "type": "boolean",
-          "required": "false",
-          "default": "false",
-          "description": "确定按钮是否为 loading 状态，在发起后台请求并且请求较慢的情况下可以设置 loading 状态优化用户体验"
-        },
-        {
-          "name": "dataSource",
-          "type": "Record<string, any>",
-          "required": "false",
-          "default": "-",
-          "description": "解析模板时的数据源"
+          "description": "支持模板，若设置，需输入该文本方可删除",
+          "group": "ui"
         },
         {
-          "name": "visible",
+          "name": "isDelete",
           "type": "boolean",
           "required": "false",
           "default": "-",
-          "description": "模态框是否可见",
-          "group": "advanced"
+          "description": "`已废弃` (可以用`okType`属性代替) 删除模式的模态框：确定按钮的文本为删除，并红色高亮显示",
+          "deprecated": true,
+          "group": "ui"
         },
         {
           "name": "okText",
@@ -15153,7 +15122,7 @@
           "required": "false",
           "default": "-",
           "description": "确定按钮文字",
-          "group": "advanced"
+          "group": "buttonAndInteract"
         },
         {
           "name": "okType",
@@ -15161,15 +15130,31 @@
           "required": "false",
           "default": "-",
           "description": "确定按钮类型",
-          "group": "advanced"
+          "group": "buttonAndInteract"
         },
         {
           "name": "okButtonProps",
           "type": "ButtonProps",
           "required": "false",
           "default": "-",
-          "description": "确定按钮属性，同 ant design 的 Modal 的 [okButtonProps](https://ant.design/components/modal-cn/#API)",
-          "group": "advanced"
+          "description": "确定按钮属性，同 ant design 的 Modal 的 [okButtonProps](https://ant.design/components/modal-cn#API)",
+          "group": "buttonAndInteract"
+        },
+        {
+          "name": "closeWhenOk",
+          "type": "boolean",
+          "required": "false",
+          "default": "true",
+          "description": "点击确定按钮是否关闭模态框",
+          "group": "buttonAndInteract"
+        },
+        {
+          "name": "confirmLoading",
+          "type": "boolean",
+          "required": "false",
+          "default": "false",
+          "description": "确定按钮是否为 loading 状态，在发起后台请求并且请求较慢的情况下可以设置 loading 状态优化用户体验",
+          "group": "buttonAndInteract"
         },
         {
           "name": "cancelText",
@@ -15177,31 +15162,33 @@
           "required": "false",
           "default": "-",
           "description": "取消按钮文字",
-          "group": "advanced"
+          "group": "buttonAndInteract"
         },
         {
           "name": "cancelButtonProps",
           "type": "ButtonProps",
           "required": "false",
           "default": "-",
-          "description": "取消按钮属性，同 ant design 的 Modal 的 [cancelButtonProps](https://ant.design/components/modal-cn/#API)",
-          "group": "advanced"
+          "description": "取消按钮属性，同 ant design 的 Modal 的 [cancelButtonProps](https://ant.design/components/modal-cn#API)",
+          "group": "buttonAndInteract"
         },
         {
-          "name": "contentBrick",
-          "type": "{useBrick: UseBrickConf}",
+          "name": "visible",
+          "type": "boolean",
           "required": "false",
-          "default": "false",
-          "description": "panelBrick"
+          "default": "-",
+          "description": "`已废弃` 模态框是否可见，请使用 `open` 和 `close` 方法打开和关闭模态框",
+          "deprecated": true,
+          "group": "other"
         },
         {
           "name": "title",
           "type": "string",
           "required": "false",
           "default": "-",
-          "description": "[已废弃]请使用 modalTitle 代替",
+          "description": "`已废弃` 请使用 modalTitle 代替",
           "deprecated": true,
-          "group": "advanced"
+          "group": "other"
         }
       ],
       "events": [
@@ -15212,8 +15199,8 @@
         },
         {
           "type": "confirm.ok",
-          "detail": "-",
-          "description": "点击确定按钮的事件，事件的 detail 为传入的 dataSource"
+          "detail": "`Record<string, any>`",
+          "description": "点击确定按钮的事件，事件的 detail 为构件的 dataSource 属性的当前值"
         }
       ],
       "methods": [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next-bricks/presentational-bricks",
-  "version": "1.247.2",
+  "version": "1.247.5",
   "description": "> TODO: description",
   "homepage": "https://github.com/easyops-cn/next-basics/tree/master/bricks/presentational-bricks",
   "license": "GPL-3.0",
@@ -46,7 +46,7 @@
     "html-to-react": "^1.4.7",
     "immutability-helper": "^3.1.1",
     "marked": "^2.1.3",
-    "prismjs": "^1.25.0",
+    "prismjs": "^1.28.0",
     "react-avatar-editor": "^11.1.0",
     "regexpu-core": "^4.7.1"
   },
@@ -55,5 +55,5 @@
     "@next-dll/ace": "*",
     "@next-dll/react-dnd": "*"
   },
-  "gitHead": "77827e88044adc541963a1ae3b6edb5a71ac0d51"
+  "gitHead": "4fef8ac22ce0205c24eea555416b932989d45214"
 }