Merge branch 'release/10.0' of ssh://cloud.finedevelop.com:7999/~alan/decision-webui-dcm into release/10.0

src/modules/crud/decision.api.ts

@@ -96,7 +96,7 @@ export class DecisionApi implements Api {
     private sendEditStatusEvent(name: string, type: string): Promise<SocketResult> {
         return new Promise(resolve => {
             if (Dec && Dec.socket.connected) {
-                Dec.socket.emit(type, BI.encode(name), (re: any) => {
+                Dec.socketEmit(type, BI.encode(name), (re: any) => {
                     resolve(re);
                 });
             } else {

src/modules/pages/maintain/forms/components/form.jdbc.ts

@@ -742,7 +742,7 @@ export class FormJdbc extends BI.Widget {
                 driver: this.form.driver.getValue(),
                 url: this.form.url.getValue(),
                 user: this.form.user.getValue(),
-                password: this.oldPassword === this.form.password.getValue() ? this.oldPassword : BI.encode(this.form.password.getValue()),
+                password: this.oldPassword === this.form.password.getValue() ? this.oldPassword : BI.Providers.getProvider('dec.provider.cipher').getCipher(this.form.password.getValue()),
                 queryType: '',
                 newCharsetName: originalCharsetName ? 'gbk' : '', // 后台要求，originalCharsetName不为空时，newCharsetName为gbk
                 originalCharsetName,