cloud-web-corejs 1.0.54-dev.158 → 1.0.54-dev.159

package/package.json

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

package/src/components/xform/form-render/container-item/data-table-mixin.js

@@ -109,7 +109,7 @@ modules = {
       tableConfig: {},
       showTableFormDialogContent: true,
       widgetMap: {},
-      rowWidgetList:[]
+      rowWidgetList: []
     };
   },
   watch: {
@@ -208,7 +208,7 @@ modules = {
       let widget = this.getRowWidget(rowParam, fieldWidget);
       let field = widget.category == 'container' ? 'widget' : 'field'
       let option = {
-        [field]:widget
+        [field]: widget
       }
       return option
     },
@@ -436,13 +436,13 @@ modules = {
         }
         col = addColumProperty(col, t);
 
-        if(col.params.widget){
+        if (col.params.widget) {
           rowWidgetList.push(col.params.widget)
         }
-        if(col.params.editWidget){
+        if (col.params.editWidget) {
           rowWidgetList.push(col.params.editWidget)
         }
-        if(col.params.widgetList && col.params.widgetList.length){
+        if (col.params.widgetList && col.params.widgetList.length) {
           col.params.widgetList.forEach((item) => {
             rowWidgetList.push(item)
           })
@@ -1196,6 +1196,12 @@ modules = {
 
       let ajaxConfig = customParam?.config || {};
 
+      let requestData = {
+        ...reqData,
+        ...otherParam
+      };
+      requestData = extendDeeply(requestData, accessParam);
+
       return this.formHttp({
         // url: prefix + "/form_ins/getPage",
         scriptCode: scriptCode,
@@ -1203,11 +1209,7 @@ modules = {
           formCode: formCode,
           formVersion: reportTemplate.formVersion,
           taBm: this.fieldKeyName,
-          data: {
-            ...reqData,
-            ...otherParam,
-            ...accessParam,
-          },
+          data: requestData,
         },
         ...defaultOption,
         ...ajaxConfig,
@@ -2113,11 +2115,11 @@ modules = {
       newFieldSchema.id = fieldWidget.type + generateId()
       return newFieldSchema
     },*/
-    clearRowWidgets(){
+    clearRowWidgets() {
       // this.widgetMap = {};
     },
     deleteRowWidgets(row) {
-      this.rowWidgetList.forEach(widget=>{
+      this.rowWidgetList.forEach(widget => {
         let key = this.getRowRefKey(row, widget.options.name);
         delete this.widgetMap[key];
       })

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

@@ -62,7 +62,7 @@ modules = {
         let reportTemplate = that.getFormRef ? that.getFormRef().reportTemplate : that.reportTemplate;
         if (formCode && formCode !== reportTemplate.formCode) {
           that.$http({
-            aes: true,
+            // aes: true,
             url: USER_PREFIX + `/formTemplate/getByFormCode`,
             method: `post`,
             data: {
@@ -101,7 +101,7 @@ modules = {
             let url = `/${reportTemplate.serviceName}/bd_api/${reportTemplate.formCode}/${scriptCode}`;
             // let url = BD_PREFIX + `/formScript/exeScript`;
             return this.$http({
-              aes: true,
+              // aes: true,
               url: url,
               method: `post`,
               loadingTarget: document.body,