fanruan
/
plugin-repository-s3
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

Pull request #85: REPORT-87924 fix:cherry pick11.0改动 

Merge in PG/plugin-repository-s3 from ~FREDDY/plugin-repository-s3:release/10.0 to release/10.0

* commit 'eac1c7f9fcabb35dc46ae234fb5141978123dd3a':
  REPORT-87924 fix:增加输入限制
  REPORT-87924 feat:适配S3插件前台改动
release/10.0
Freddy-李飞宇 2 years ago
parent
ce965a1dd1 eac1c7f9fc
commit
e1b8a79786
7 changed files with 106 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/main/resources/com/fanruan/fs/s3/repository/locale/s3.properties
  2. 4
      src/main/resources/com/fanruan/fs/s3/repository/locale/s3_en_US.properties
  3. 4
      src/main/resources/com/fanruan/fs/s3/repository/locale/s3_ja_JP.properties
  4. 4
      src/main/resources/com/fanruan/fs/s3/repository/locale/s3_ko_KR.properties
  5. 4
      src/main/resources/com/fanruan/fs/s3/repository/locale/s3_zh_CN.properties
  6. 4
      src/main/resources/com/fanruan/fs/s3/repository/locale/s3_zh_TW.properties
  7. 89
      src/main/resources/com/fanruan/fs/s3/repository/web/js/bundle.js

4
src/main/resources/com/fanruan/fs/s3/repository/locale/s3.properties
Unescape View File

@ -4,4 +4,6 @@ Plugin-S3_Region=Region
Plugin-S3_Access_Key_Id=AccessKeyId
Plugin-S3_Access_Key_Secret=AccessKeySecret
Plugin-S3_Bucket=Bucket
Dec-Error_Start_With_Slash_Or_End_Without_Slash=The path cannot start with "/", but must end with "/"
Dec-Error_Start_With_Slash_Or_End_Without_Slash=The path cannot start with "/", but must end with "/"
Plugin-S3_Other_Config=
Plugin-S3_EnablePathStyleAccess_Error_Tip=

4
src/main/resources/com/fanruan/fs/s3/repository/locale/s3_en_US.properties
Unescape View File

@ -4,4 +4,6 @@ Plugin-S3_Access_Key_Secret=AccessKeySecret
Plugin-S3_Bucket=Bucket
Plugin-S3_End_Point=Endpoint
Plugin-S3_Input=Please input
Plugin-S3_Region=Region
Plugin-S3_Region=Region
Plugin-S3_Other_Config=
Plugin-S3_EnablePathStyleAccess_Error_Tip=

4
src/main/resources/com/fanruan/fs/s3/repository/locale/s3_ja_JP.properties
Unescape View File

@ -4,4 +4,6 @@ Plugin-S3_Access_Key_Secret=AccessKeySecret
Plugin-S3_Bucket=Bucket
Plugin-S3_End_Point=Endpoint
Plugin-S3_Input=\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044\u3002
Plugin-S3_Region=Region
Plugin-S3_Region=Region
Plugin-S3_Other_Config=
Plugin-S3_EnablePathStyleAccess_Error_Tip=

4
src/main/resources/com/fanruan/fs/s3/repository/locale/s3_ko_KR.properties
Unescape View File

@ -4,4 +4,6 @@ Plugin-S3_Access_Key_Secret=
Plugin-S3_Bucket=
Plugin-S3_End_Point=
Plugin-S3_Input=
Plugin-S3_Region=
Plugin-S3_Region=
Plugin-S3_Other_Config=
Plugin-S3_EnablePathStyleAccess_Error_Tip=

4
src/main/resources/com/fanruan/fs/s3/repository/locale/s3_zh_CN.properties
Unescape View File

@ -4,4 +4,6 @@ Plugin-S3_Access_Key_Secret=AccessKeySecret
Plugin-S3_Bucket=Bucket
Plugin-S3_End_Point=Endpoint
Plugin-S3_Input=\u8BF7\u8F93\u5165
Plugin-S3_Region=Region
Plugin-S3_Region=Region
Plugin-S3_Other_Config=\u66f4\u591a\u8bbe\u7f6e
Plugin-S3_EnablePathStyleAccess_Error_Tip=\u8bf7\u8f93\u5165true\u6216false

4
src/main/resources/com/fanruan/fs/s3/repository/locale/s3_zh_TW.properties
Unescape View File

@ -4,4 +4,6 @@ Plugin-S3_Access_Key_Secret=AccessKeySecret
Plugin-S3_Bucket=Bucket
Plugin-S3_End_Point=Endpoint
Plugin-S3_Input=\u8ACB\u8F38\u5165
Plugin-S3_Region=Region
Plugin-S3_Region=Region
Plugin-S3_Other_Config=
Plugin-S3_EnablePathStyleAccess_Error_Tip=

89
src/main/resources/com/fanruan/fs/s3/repository/web/js/bundle.js
Unescape View File

@ -137,11 +137,77 @@ BI.config("dec.constant.intelligence.cluster.file.server", function (items) {
ref: function (_ref) {
self.filePathRow = _ref;
},
}],
}, {
type: "bi.vertical_adapt",
items: [{
type: "bi.icon_change_button",
iconCls: this.model.isOpen ? "expander-down-font" : "expander-right-font",
ref: (_ref) => {
this.OtherConfigButton = _ref;
},
handler: () => {
this.store.setIsOpen(!this.model.isOpen);
this.OtherConfigButton.setIcon(this.model.isOpen ? "expander-down-font" : "expander-right-font");
}
}, {
type: "bi.text_button",
text: BI.i18nText('Plugin-S3_Other_Config'),
handler: () => {
this.store.setIsOpen(!this.model.isOpen);
this.OtherConfigButton.setIcon(this.model.isOpen ? "expander-down-font" : "expander-right-font");
}
}]
}, {
type: 'bi.vertical',
invisible: () => !this.model.isOpen,
items: [{
type: "dec.label.editor.item",
textWidth: LABEL_WIDTH,
editorWidth: EDITOR_WIDTH,
watermark: BI.i18nText("Plugin-S3_Input"),
text: "PathStyleAccess",
value: this.model.enablePathStyleAccess,
ref: function (_ref) {
self.enablePathStyleAccessRow = _ref;
},
el: {
disabled: !o.editable,
},
listeners: [{
eventName: BI.Editor.EVENT_CHANGE,
action: function () {
self.store.setEnablePathStyleAccess(this.getValue());
}
}]
}, {
type: "dec.label.editor.item",
textWidth: LABEL_WIDTH,
editorWidth: EDITOR_WIDTH,
watermark: BI.i18nText("Plugin-S3_Input"),
text: "SignerOverride",
value: this.model.signerOverride,
el: {
disabled: !o.editable,
},
tgap: 15,
listeners: [{
eventName: BI.Editor.EVENT_CHANGE,
action: function () {
self.store.setSignerOverride(this.getValue());
}
}]
}],
}
]
};
},
getValue: function () {
var enablePathStyleAccess = false;
if (this.model.enablePathStyleAccess === 'true') {
enablePathStyleAccess = true;
}
return {
endPoint: this.model.endPoint,
region: this.model.region,
@ -149,6 +215,8 @@ BI.config("dec.constant.intelligence.cluster.file.server", function (items) {
password: this.passwordRow.getCipher(),
bucket: this.model.bucket,
workRoot: this.filePathRow.getValue(),
enablePathStyleAccess,
signerOverride: this.model.signerOverride,
};
},
@ -167,6 +235,10 @@ BI.config("dec.constant.intelligence.cluster.file.server", function (items) {
this.filePathRow.showError(BI.i18nText("Dec-Error_Null"));
valid = false;
}
if (!(this.model.enablePathStyleAccess === 'false' || this.model.enablePathStyleAccess === 'true')) {
this.enablePathStyleAccessRow.showError(BI.i18nText("Plugin-S3_EnablePathStyleAccess_Error_Tip"));
valid = false;
}
return valid;
},
@ -189,6 +261,9 @@ BI.config("dec.constant.intelligence.cluster.file.server", function (items) {
password: val.password,
bucket: val.bucket,
workRoot: val.workRoot,
isOpen: false,
enablePathStyleAccess: 'false',
signerOverride: "",
};
},
@ -218,6 +293,18 @@ BI.config("dec.constant.intelligence.cluster.file.server", function (items) {
setBucket: function (v) {
this.model.bucket = v;
},
setEnablePathStyleAccess: function (v) {
this.model.enablePathStyleAccess = v;
},
setSignerOverride: function (v) {
this.model.signerOverride = v;
},
setIsOpen: function (v) {
this.model.isOpen = v;
},
},
});
BI.model("dec.model.intelligence.cluster.file.s3", Model);

Write Preview
Loading…
Cancel
Save