diff --git a/src/resources/assets/languages/page/en.json b/src/resources/assets/languages/page/en.json index 0febd3630eb77c8881bda5475102f1444240a852..e42cf6092b7240fa61bf5ff053db32909f5213dc 100644 --- a/src/resources/assets/languages/page/en.json +++ b/src/resources/assets/languages/page/en.json @@ -954,5 +954,8 @@ "you": "you", "commercialcomponent": "This component is exclusively available in the commercial version", "commercialcomponenttip": "This component is exclusively for commercial use and requires additional payment to purchase in order to use.", - "highriskcode": "High risk code" -} \ No newline at end of file + "highriskcode": "High risk code", + "importoverdescrition": "The following associated objects already exist in the system. If you want to overwrite them, please check the objects you want to overwrite and click the [Import] button below to complete the import.", + "uploadurlmustrequired": "The upload address cannot be empty", + "existiscoverimport": "{type}【{target}】 already exists. Do you want to continue importing and overwrite it" +} diff --git a/src/resources/assets/languages/page/zh.json b/src/resources/assets/languages/page/zh.json index 5a997c7fda901fa9abc1df0eb864af28a3b82c38..ddfce79adb61a7d45ff4846e358f1c0d09b91bba 100644 --- a/src/resources/assets/languages/page/zh.json +++ b/src/resources/assets/languages/page/zh.json @@ -956,5 +956,8 @@ "you": "您", "commercialcomponent": "该组件是商业版专供", "commercialcomponenttip": "该组件是商业版专供,需要额外付费购买才能使用。", - "highriskcode": "高危代码" -} \ No newline at end of file + "highriskcode": "高危代码", + "importoverdescrition": "以下关联的对象,在系统中已经存在,如需覆盖,请勾选需要覆盖的对象后,点击下方[导入]按钮,完成导入。", + "uploadurlmustrequired": "上传地址不能为空", + "existiscoverimport": "{type}【{target}】已存在,是否继续导入并覆盖" +} diff --git a/src/resources/components/ComplexUploadDialog/README.md b/src/resources/components/ComplexUploadDialog/README.md new file mode 100644 index 0000000000000000000000000000000000000000..b483991a63e49872f38049859db7fa1377609c9c --- /dev/null +++ b/src/resources/components/ComplexUploadDialog/README.md @@ -0,0 +1,29 @@ +## 上传组件,二次弹窗 + +使用说明描述: +点击选择上传组件,上传数据成功之后,根据后端返回的数据 + +1. 已存在弹出二次确定覆盖弹窗,确定覆盖后,保存数据。 +2. 不存在覆盖,把数据列出来,用户自己选择需要保存的数据,点击确定按钮保存数据 + +### 使用方法 + +```vue + + + +``` diff --git a/src/resources/components/ComplexUploadDialog/complexUploadDialog.vue b/src/resources/components/ComplexUploadDialog/complexUploadDialog.vue new file mode 100644 index 0000000000000000000000000000000000000000..30079f4b957d5eab6ffc4c26729ff1ea65ccb8d6 --- /dev/null +++ b/src/resources/components/ComplexUploadDialog/complexUploadDialog.vue @@ -0,0 +1,358 @@ + + + diff --git a/src/views/pages/process/flow/flow-overview.vue b/src/views/pages/process/flow/flow-overview.vue index f8868b3e4a13e85b3105ec71f32d25421967f9f7..5957d72a31a180007278b17f87ae04a77b3f9dcb 100644 --- a/src/views/pages/process/flow/flow-overview.vue +++ b/src/views/pages/process/flow/flow-overview.vue @@ -8,13 +8,12 @@