cloud-web-corejs 1.0.54-dev.221 → 1.0.54-dev.223

package/src/components/xform/form-designer/setting-panel/property-editor/container-detail-pane/detail-pane-editor.vue

@@ -1,8 +1,8 @@
 <template>
   <div>
-<!--    <el-form-item :label="i18nt('绑定数据列表key')">
-      <el-input v-model="optionModel.tableRef"></el-input>
-    </el-form-item>-->
+    <el-form-item :label="i18nt('内容默认收起')">
+      <el-switch v-model="optionModel.defaultCollapse"></el-switch>
+    </el-form-item>
   </div>
 </template>
 

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

@@ -441,6 +441,7 @@ export const containers = [
       customClass: "",
       tableRef: "",
       detailPaneContainer: true,
+      defaultCollapse:false,
       onCreated: "",
       onMounted: "",
     }

package/src/components/xform/form-render/container-item/detail-pane-item.vue

@@ -1,11 +1,12 @@
 <template>
-  <baseTabPane :label="getI18nLabel(widget.options.label)" ref="baseTabRef" :visible="!widget.options.hidden" v-show="!widget.options.hidden">
+  <baseTabPane :label="getI18nLabel(widget.options.label)" ref="baseTabRef" :visible="!widget.options.hidden" v-show="!widget.options.hidden" :showFold="true"
+               :defaultShowContent="!widget.options.defaultCollapse">
 
     <template #button>
-      <div class='btn-close-open' @click="opeaShowCont()">
+<!--      <div class='btn-close-open' @click="opeaShowCont()">
         <span v-if="showStatus==true"><i class="el-icon-arrow-up"></i>收起</span>
         <span v-else><i class="el-icon-arrow-down"></i>展开</span>
-      </div>
+      </div>-->
       <template v-for="(subWidget, swIdx) in widget.buttonWidgetList">
         <template v-if="'container' === subWidget.category">
           <component :is="subWidget.type + '-item'" :widget="subWidget" :key="swIdx"

package/src/components/xform/form-render/indexMixin.js

@@ -310,6 +310,9 @@ modules = {
       return this.$http({
         url: USER_PREFIX + '/user/currentUser',
         method: 'post',
+        // isLoading: true,
+        // loadingTarget: document.body,
+        modalStrictly: true,
         success: res => {
           let userInfo = res.objx;
           let row = this.formatHumpLineTransfer(userInfo, "toLine")
@@ -323,8 +326,8 @@ modules = {
           url: USER_PREFIX + '/user/getUserSaleOrg',
           method: `post`,
           data: {id: this.$store.getters.userId},
-          isLoading: true,
-          loadingTarget: document.body,
+          // isLoading: true,
+          // loadingTarget: document.body,
           modalStrictly: true,
           success: res => {
             let rows = res.objx || [];
@@ -344,8 +347,8 @@ modules = {
           url: USER_PREFIX + '/user/getUserRole',
           method: `post`,
           data: {id: this.$store.getters.userId},
-          isLoading: true,
-          loadingTarget: document.body,
+          // isLoading: true,
+          // loadingTarget: document.body,
           modalStrictly: true,
           success: res => {
             let rows = res.objx || [];
@@ -362,9 +365,9 @@ modules = {
         url: USER_PREFIX + '/form_develop/getBdService',
         method: `post`,
         data: {},
-        isLoading: true,
-        loadingTarget: document.body,
-        // modalStrictly: true,
+        // isLoading: true,
+        // loadingTarget: document.body,
+        modalStrictly: true,
         success: res => {
           this.bdService = res.objx;
         }
@@ -2268,30 +2271,6 @@ modules = {
                 });
               }
             })
-
-
-            /*let saveUrl = this.formConfig.saveUrl || (USER_PREFIX + `/form_ins/saveFormInsData`);
-            this.$http({
-              url: saveUrl,
-              method: `post`,
-              data: reqData,
-              isLoading: true,
-              loadingTarget: document.body,
-              success: res => {
-                this.$message({
-                  message: res.content,
-                  type: 'success',
-                  duration: 500,
-                  onClose: t => {
-                    callback && callback(res)
-                    this.$parent.$emit('update:object_foreign_id', res.objx)
-                    // this.$parent.$attrs.wfParam.submitCallback();
-                    this.$parent.$baseReload()
-                  }
-                });
-
-              }
-            });*/
           })
         });
       })
@@ -2306,7 +2285,8 @@ modules = {
             method: `post`,
             data: {stringOne: insUuid},
             isLoading: true,
-            loadingTarget: document.body,
+            // loadingTarget: document.body,
+            modalStrictly: true,
             success: res => {
               this.$message({
                 message: res.content,
@@ -2324,39 +2304,6 @@ modules = {
         })
       }
     },
-    async getInsFormData(insUuid) {
-      let formData = {};
-      let formTemplateTableDTOs = this.getFormTemplateTableDTOs();
-      formTemplateTableDTOs.forEach(async (formTemplateTableDTO) => {
-        let tableAlias = formTemplateTableDTO.tableAlias || formTemplateTableDTO.formCode;
-        await this.getFormInsData({
-          insUuid: insUuid,
-          tableAlias: tableAlias
-        }, (data) => {
-          if (formTemplateTableDTO.tableType == 0) {
-            Object.assign(formData, data)
-          } else {
-            let map = {};
-            map[tableAlias] = data;
-            Object.assign(formData, map)
-          }
-        })
-      })
-    },
-    async getFormInsData(param, callback) {
-      return this.$http({
-        url: USER_PREFIX + `/form_ins/getFormInsData`,
-        method: `post`,
-        data: param,
-        isLoading: true,
-        loadingTarget: document.body,
-        modalStrictly: true,
-        success: res => {
-          let formData = res.objx && res.objx.data ? res.objx.data : {};
-          callback && callback(formData)
-        }
-      });
-    },
     jumpFormView(row) {
       // let data = {};
       let data = this.getFormData2(row);
@@ -2417,11 +2364,12 @@ modules = {
           this.$http({
             url: path,
             method: `post`,
-            loadingTarget: document.body,
             data: {
               ...params
             },
             isLoading: true,
+            // loadingTarget: document.body,
+            modalStrictly: true,
             success: res => {
               let e1 = new Function('resultMsg', item.onScriptSuccess);
               e1.call(this, res);

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

@@ -45,11 +45,14 @@ modules = {
       return this.getFormRef ? this.getFormRef() : this;
     },
     getLoadingTarget() {
-      // let that = this.getHttpTarget();
-      // let loadingTarget = that.$el || document.body;
+      let that = this.getHttpTarget();
+      if(!that ||!that.$el){
+        debugger
+      }
+      let loadingTarget = that.$el || document.body;
 
-      let loadingTarget = document.body;
-      return loadingTarget;
+      // let loadingTarget = document.body;
+      // return loadingTarget;
     },
     formHttp(opts) {
       let data = opts.data;
@@ -85,7 +88,7 @@ modules = {
       let getServiceName = (callback) => {
 
         if (formCode && formCode !== reportTemplate.formCode) {
-          that.$http({
+          this.getHttpTarget().$http({
             aes: true,
             url: USER_PREFIX + `/formScript/getServiceName`,
             method: `post`,
@@ -94,7 +97,7 @@ modules = {
               scriptCode
             },
             isLoading,
-            loadingTarget: this.getLoadingTarget(),
+            // loadingTarget: this.getLoadingTarget(),
             // modalStrictly: true,
             success: res => {
               let serviceName = res.objx;
@@ -118,11 +121,11 @@ modules = {
 
             let reportGlobalMap = getReportGlobalMap() || {};
             let url = `/${searviceName}/bd_api/${formCode}/${scriptCode}`;
-            return this.$http({
+            return this.getHttpTarget().$http({
               aes: true,
               url: url,
               method: `post`,
-              loadingTarget: this.getLoadingTarget(),
+              // loadingTarget: this.getLoadingTarget(),
               isLoading,
               ...opts,
               data: {
@@ -152,9 +155,10 @@ modules = {
                       serviceId: serviceId
                     });
                     //初始化流程
-                    let target1 = formTarget.$attrs['parent-target'];
+                    /*let target1 = formTarget.$attrs['parent-target'];
                     let target2 = target1?.$attrs['parent-target'];
-                    let target = !target2 ? this : target1;
+                    let target = !target2 ? this : target1;*/
+                    let target = formTarget;
                     initWf.call(target, opt2);
                   }
                 }

package/src/layout/defaultLayout.vue

@@ -92,7 +92,7 @@ export default {
   position: relative;
   height: 100%;
   width: 100%;
-
+  overflow: hidden;
   &.mobile.openSidebar {
     position: fixed;
     top: 0;

package/src/views/user/form/vform/out_render.vue

@@ -31,7 +31,7 @@ export default {
           data: {
             dw: dw
           },
-          isLoading: true,
+          // isLoading: true,
           success: res => {
             let token = res.objx;
             this.$store

package/src/views/user/form/vform/render.vue

@@ -72,9 +72,9 @@ export default {
         url: url,
         method: `post`,
         data: data,
-        isLoading: true,
-        loadingTarget: document.body,
-        modalStrictly: true,
+        // isLoading: true,
+        // loadingTarget: document.body,
+        // modalStrictly: true,
         success: async res => {
           let formTemplate = res.objx || {};
           this.formTemplate = formTemplate;

package/src/views/user/form/view/list.vue

@@ -99,9 +99,9 @@ export default {
         url: USER_PREFIX + `/formTemplate/getByFormCode`,
         method: `post`,
         data: {stringOne: this.formCode},
-        isLoading: true,
-        loadingTarget: document.body,
-        modalStrictly: true,
+        // isLoading: true,
+        // loadingTarget: document.body,
+        // modalStrictly: true,
         success: async res => {
           let formTemplate = res.objx || {};
           this.formTemplate = formTemplate;

package/src/views/user/project_tag/edit.vue

@@ -46,11 +46,11 @@
             </tr>
             <tr>
               <th>{{ $t1('创建人') }}</th>
-              <td>{{ projectTag._createBy }}</td>
+              <td>{{ projectTag.createBy }}</td>
               <th>{{ $t1('创建时间') }}</th>
               <td>{{ projectTag.createDate }}</td>
               <th>{{ $t1('更新人') }}</th>
-              <td>{{ projectTag._modifyBy }}</td>
+              <td>{{ projectTag.modifyBy }}</td>
               <th>{{ $t1('更新时间') }}</th>
               <td>{{ projectTag.modifyDate }}</td>
             </tr>

package/src/views/user/project_tag/list.vue

@@ -114,7 +114,7 @@ export default {
             width: 250
           },
           {
-            field: '_createBy',
+            field: 'createBy',
             title: this.$t1('创建人'),
             width: 150
           },
@@ -124,7 +124,7 @@ export default {
             width: 150
           },
           {
-            field: '_modifyBy',
+            field: 'modifyBy',
             title: this.$t1('更新人'),
             width: 150
           },