cloud-web-corejs 1.0.54-dev.152 → 1.0.54-dev.153

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.152",
+  "version": "1.0.54-dev.153",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

package/src/components/xform/form-designer/form-widget/dialog/formDialog.vue

@@ -10,7 +10,7 @@
       <v-form-render :form-json.sync="formJson" :form-data="formData" :option-data="optionData" ref="vFormRef"
                      :reportTemplate.sync="formTemplate" :conditionParam.sync="conditionParam"
                      :formInsData.sync="formInsData" v-if="showRender" visible-key="showRender" :parent-target="_self"
-                     @reload="reload"  v-bind="formConfig" :param="dialogParam"
+                     @reload="reload" v-bind="formConfig" :param="dialogParam"
                      class="data-table_height"/>
     </div>
     <span slot="footer" class="dialog-footer" v-if="option.showFooter!==false" v-bind="option.footerConfig">
@@ -38,6 +38,7 @@ export default {
   },
   mixins: [],
   inject: ["getFormConfig"],
+
   mounted() {
 
   },
@@ -59,7 +60,8 @@ export default {
       conditionParam: null,
       formInsData: null,
       $grid: null,
-      currentLayoutType: null
+      currentLayoutType: null,
+      dataId:null
     };
   },
   computed: {
@@ -104,6 +106,10 @@ export default {
     }
   },
   created() {
+    /*let dataId = this.option?.formConfig?.dataId??null
+    delete this.option?.formConfig?.dataId
+    this.dataId = dataId;*/
+
     let currentFormConfig = this.getFormConfig();
     this.currentLayoutType = currentFormConfig.layoutType
 
@@ -111,7 +117,9 @@ export default {
     this.getReportTemplate();
   },
   methods: {
-    reload(){
+    reload(e,option){
+      let updateParam = option?.updateParam || {};
+      Object.assign(this.formConfig,updateParam)
       this.showRender = false;
       this.getReportTemplate();
     },

package/src/components/xform/form-designer/form-widget/field-widget/import-button-widget.vue

@@ -5,7 +5,7 @@
     :parent-widget="parentWidget" :parent-list="parentList"
     :index-of-parent-list="indexOfParentList">
     <el-button type="primary" class="button-sty" size="mini" icon="el-icon-download" @click="importHandle"
-               :disabled="field.options.disabled">{{$t1('导入')}}
+               :disabled="field.options.disabled">{{ $t1('导入') }}
     </el-button>
   </static-content-wrapper>
 
@@ -67,8 +67,10 @@ export default {
       // let importCodes = this.field.options.importCodes;
       this.getFormRef().openImportDialog({
         importOption: this.field.options,
-        callback: () => {
+        importSaveDisabled: !!this.field.options.importSaveDisabled,
+        callback: (resultData, file, done) => {
           // this.getWidgetRef(tableTarget).searchEvent();
+          this.handleCustomEvent(this.field.options.onConfirmImport, ['resultData', 'file', 'done'], [resultData, file, done])
         }
       });
     }

package/src/components/xform/form-designer/setting-panel/property-editor/field-import-button/import-button-editor.vue

@@ -38,6 +38,18 @@
         <i class="el-icon-edit"></i>
       </a>
     </el-form-item>
+
+<!--    <el-form-item label="不执行导入后台保存">
+      <el-switch v-model="optionModel.importSaveDisabled"></el-switch>
+    </el-form-item>
+    <el-form-item label="确认回调" label-width="150px">
+      <a href="javascript:void(0);" class="a-link link-oneLind"
+         @click="editEventHandler('onConfirmImport', onConfirmImportParams)">
+        <span>{{ optionModel.onConfirmImport }}</span>
+        <i class="el-icon-edit"></i>
+      </a>
+    </el-form-item>-->
+
     <bdAttachSettingDialog v-if="showBdAttachSettingDialog" :visiable.sync="showBdAttachSettingDialog" :multi="false"
                            @confirm="confirmBdAttachSettingDialog"></bdAttachSettingDialog>
   </div>
@@ -62,7 +74,8 @@ export default {
     return {
       eventParams: [],
       showBdAttachSettingDialog: false,
-      onBeforeImportParams: ["dataId", "formCode", 'file', 'resultData', 'done']
+      onBeforeImportParams: ["dataId", "formCode", 'file', 'resultData', 'done'],
+      onConfirmImportParams: ["dataId", "formCode", 'resultData', 'file', 'done']
     };
   },
   methods: {

package/src/components/xform/form-designer/widget-panel/widgetsConfig.js

@@ -2810,6 +2810,9 @@ export const advancedFields = [
       onBeforeImport: '',
       enabledImportPreHandle: false,
 
+      importSaveDisabled:false,
+      onConfirmImport:'',
+
       showRuleFlag: 1,
       showRuleEnabled: 1,
       showRules: []

package/src/components/xform/mixins/scriptHttp.js

@@ -9,6 +9,16 @@ modules = {
         ...opts
       });
     },*/
+    handleDecryptData(obj){
+      let toDo = (data)=>{
+        if(Array.isArray(data)){
+          data.forEach(item=>{
+            item = toDo(item)
+          })
+        }
+      }
+      toDo(obj);
+    },
     formHttp(opts) {
       let data = opts.data;
       let scriptCode = opts.scriptCode;
@@ -16,7 +26,7 @@ modules = {
       let isLoading =  opts.isLoading ?? false;
       let success = opts.success;
       let fail = opts.fail;
-      let error = opts.fail;
+      let error = opts.error;
       delete opts.data
       delete opts.scriptCode
       delete opts.formCode
@@ -81,6 +91,12 @@ modules = {
                 ...reqData
               },
               success: res => {
+                if(res.objx){
+                  if(res.objx){
+                    let objx = res.objx;
+
+                  }
+                }
                 if (opts.successMsg) {
                   this.$message({
                     message: res.content,