Merge remote-tracking branch 'origin/master'

app_web/src/locale/lanres/entities/sys-open-access/sys-open-access_en_US.ts

@@ -41,6 +41,7 @@ export default {
 			region_id: "RegionId", 
 			disabled: "是否禁用", 
 			lic: "授权", 
+			image: "图片", 
 			accessid: "开放平台接入标识", 
 		},
 		uiactions: {

app_web/src/locale/lanres/entities/sys-open-access/sys-open-access_zh_CN.ts

@@ -40,6 +40,7 @@ export default {
 			region_id: "RegionId", 
 			disabled: "是否禁用", 
 			lic: "授权", 
+			image: "图片", 
 			accessid: "开放平台接入标识", 
 		},
 		uiactions: {

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

@@ -123,11 +123,28 @@
 		:show-ocrview="true"
 		:show-preview="true"
 		:show-edit="true"
-		:show-drag="true"
+		:show-drag="false"
 		:persistence="false"
 		@formitemvaluechange="onFormItemValueChange"></ibiz-file-upload>
 </app-form-item>
 
+</i-col>
+<i-col v-show="detailsModel.image.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-item name='image' :itemRules="this.rules().image" class='' :caption="$t('entities.sysopenaccess.main_form.details.image')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.lic.error" :isEmptyCaption="false" labelPos="LEFT">
+	<ibiz-image-upload
+		:data="data"
+		formItemName="image"
+		:value="data.image"
+		:formState="formState"
+		folder="sysopenaccess"
+		ownertype="image"
+		:ownerid="data.srfkey"
+		:show-ocrview="true"
+		:show-preview="true"
+		:persistence="false"
+		@formitemvaluechange="onFormItemValueChange"></ibiz-image-upload>
+</app-form-item>
+
 </i-col>
     
     </row>
@@ -481,6 +498,7 @@ export default class MainBase extends Vue implements ControlInterface {
         region_id: null,
         disabled: null,
         lic: null,
+        image: null,
         accessid: null,
         sysopenaccess:null,
     };
@@ -615,6 +633,12 @@ export default class MainBase extends Vue implements ControlInterface {
             { required: false, type: 'string', message: '授权 值不能为空', trigger: 'change' },
             { required: false, type: 'string', message: '授权 值不能为空', trigger: 'blur' },
         ],
+        image: [
+            { type: 'string', message: '图片 值必须为字符串类型', trigger: 'change' },
+            { type: 'string', message: '图片 值必须为字符串类型', trigger: 'blur' },
+            { required: false, type: 'string', message: '图片 值不能为空', trigger: 'change' },
+            { required: false, type: 'string', message: '图片 值不能为空', trigger: 'blur' },
+        ],
         accessid: [
             { type: 'string', message: '开放平台接入标识 值必须为字符串类型', trigger: 'change' },
             { type: 'string', message: '开放平台接入标识 值必须为字符串类型', trigger: 'blur' },
@@ -742,6 +766,8 @@ export default class MainBase extends Vue implements ControlInterface {
         disabled: new FormItemModel({ caption: '是否禁用', detailType: 'FORMITEM', name: 'disabled', visible: true, isShowCaption: true, form: this, isControlledContent: false , disabled: false, enableCond: 3 })
 , 
         lic: new FormItemModel({ caption: '授权', detailType: 'FORMITEM', name: 'lic', visible: true, isShowCaption: true, form: this, isControlledContent: false , disabled: false, enableCond: 3 })
+, 
+        image: new FormItemModel({ caption: '图片', detailType: 'FORMITEM', name: 'image', visible: true, isShowCaption: true, form: this, isControlledContent: false , disabled: false, enableCond: 3 })
 , 
         accessid: new FormItemModel({ caption: '开放平台接入标识', detailType: 'FORMITEM', name: 'accessid', visible: true, isShowCaption: true, form: this, isControlledContent: false , disabled: false, enableCond: 3 })
 , 
@@ -927,6 +953,18 @@ export default class MainBase extends Vue implements ControlInterface {
         this.formDataChange({ name: 'lic', newVal: newVal, oldVal: oldVal });
     }
 
+    /**
+     * 监控表单属性 image 值
+     *
+     * @param {*} newVal
+     * @param {*} oldVal
+     * @memberof MainBase
+     */
+    @Watch('data.image')
+    onImageChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'image', newVal: newVal, oldVal: oldVal });
+    }
+
     /**
      * 监控表单属性 accessid 值
      *
@@ -1011,6 +1049,7 @@ export default class MainBase extends Vue implements ControlInterface {
 
 
 
+
     }
 
     /**

app_web/src/widgets/sys-open-access/main-form/main-form-model.ts

@@ -89,6 +89,10 @@ export default class MainModel {
         name: 'lic',
         dataType:'FORMITEM',
       },
+      {
+        name: 'image',
+        dataType:'FORMITEM',
+      },
       {
         name: 'accessid',
         prop: 'id',