Merge remote-tracking branch 'origin/master'

app_web/src/widgets/sys-open-access/main-form/main-form-base.vue

@@ -62,21 +62,16 @@
 
 </i-col>
 <i-col v-show="detailsModel.redirect_uri.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-item name='lic' :itemRules="this.rules().lic" class='' :caption="$t('entities.sysopenaccess.main_form.details.lic')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.lic.error" :isEmptyCaption="false" labelPos="LEFT">
-	<ibiz-file-upload
-		:data="data"
-		formItemName="redirect_uri"
-		:value="data.redirect_uri"
-		:formState="formState"
-		folder='sysopenaccess'
-		ownertype='redirect_uri'
-		:ownerid="data.srfkey"
-		:show-ocrview=true
-		:show-preview=true
-		:show-edit=true
-		:show-drag=true
-		:persistence=true
-		@formitemvaluechange="onFormItemValueChange"></ibiz-file-upload>
+    <app-form-item name='redirect_uri' :itemRules="this.rules().redirect_uri" class='' :caption="$t('entities.sysopenaccess.main_form.details.redirect_uri')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.redirect_uri.error" :isEmptyCaption="false" labelPos="LEFT">
+    <input-box 
+    v-model="data.redirect_uri"  
+    @enter="onEnter($event)"  
+     unit=""  
+    :disabled="detailsModel.redirect_uri.disabled" 
+    type='text' 
+    style="">
+</input-box>
+
 </app-form-item>
 
 </i-col>
@@ -117,8 +112,20 @@
 </i-col>
 <i-col v-show="detailsModel.lic.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='lic' :itemRules="this.rules().lic" class='' :caption="$t('entities.sysopenaccess.main_form.details.lic')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.lic.error" :isEmptyCaption="false" labelPos="LEFT">
-    <app-file-upload :formState="formState" :ignorefieldvaluechange="ignorefieldvaluechange" @formitemvaluechange="onFormItemValueChange" :data="JSON.stringify(this.data)" name='lic' :value="data.lic" :disabled="detailsModel.lic.disabled" :uploadparams='{}' :exportparams='{}'  style="overflow: auto;"></app-file-upload>
-
+	<ibiz-file-upload
+		:data="data"
+		formItemName="lic"
+		:value="data.lic"
+		:formState="formState"
+		folder='sysopenaccess'
+		ownertype='lic'
+		:ownerid="data.srfkey"
+		:show-ocrview=true
+		:show-preview=true
+		:show-edit=true
+		:show-drag=true
+		:persistence=true
+		@formitemvaluechange="onFormItemValueChange"></ibiz-file-upload>
 </app-form-item>
 
 </i-col>

ibzuaa-dependencies/pom.xml

@@ -86,6 +86,7 @@
         <!-- 阿里seata分布式事务 -->
         <alibaba-seata.version>1.3.0</alibaba-seata.version>
 
+        <oracle.version>11.2.0.3</oracle.version>
 
     </properties>
 
@@ -330,6 +331,12 @@
             <version>${eureka-client.version}</version>
         </dependency>
 
+        <!--  Oracle驱动包 -->
+        <dependency>
+            <groupId>com.oracle</groupId>
+            <artifactId>ojdbc6</artifactId>
+            <version>${oracle.version}</version>
+        </dependency>
         <!--  MySQL驱动包 -->
         <dependency>
             <groupId>mysql</groupId>