cloud-web-corejs 1.0.54-dev.743 → 1.0.54-dev.745

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

@@ -1188,7 +1188,7 @@ export const basicFields = [
   },
   {
     type: "script-input",
-    icon: "code",
+    icon: "component",
     commonFlag: !0,
     formItemFlag: !0,
     columnFlag: true,
@@ -3008,7 +3008,7 @@ export const advancedFields = [
   },
   {
     type: "autocomplete",
-    icon: "edit",
+    icon: "message",
     commonFlag: !0,
     columnFlag: true,
     formItemFlag: !0,
@@ -3019,7 +3019,7 @@ export const advancedFields = [
   },
   {
     type: "search_button",
-    icon: "search",
+    icon: "el-icon-search",
     commonFlag: !0,
     columnFlag: true,
     formItemFlag: !1,
@@ -3064,7 +3064,7 @@ export const advancedFields = [
   {
     type: "save_button",
     targetType: "button",
-    icon: "save",
+    icon: "el-icon-check",
     commonFlag: !0,
     columnFlag: true,
     formItemFlag: !1,
@@ -3105,7 +3105,7 @@ export const advancedFields = [
   {
     type: "reset_button",
     targetType: "button",
-    icon: "redo",
+    icon: "el-icon-refresh-right",
     commonFlag: !0,
     columnFlag: true,
     formItemFlag: !1,
@@ -3141,7 +3141,7 @@ export const advancedFields = [
   },
   {
     type: "table-export-button",
-    icon: "list-export",
+    icon: "el-icon-upload",
     formItemFlag: !1,
     commonFlag: !0,
     columnFlag: true,
@@ -3170,7 +3170,7 @@ export const advancedFields = [
   },
   {
     type: "select-export-button",
-    icon: "export",
+    icon: "el-icon-upload",
     formItemFlag: !1,
     commonFlag: !0,
     columnFlag: true,
@@ -3201,7 +3201,7 @@ export const advancedFields = [
   },
   {
     type: "select-export-item-button",
-    icon: "document",
+    icon: "el-icon-upload",
     formItemFlag: !1,
     commonFlag: !0,
     columnFlag: true,
@@ -3233,7 +3233,7 @@ export const advancedFields = [
   {
     type: "add_button",
     targetType: "button",
-    icon: "add",
+    icon: "el-icon-plus",
     commonFlag: !0,
     columnFlag: true,
     formItemFlag: !1,
@@ -3269,7 +3269,7 @@ export const advancedFields = [
   },
   {
     type: "import-button",
-    icon: "import",
+    icon: "el-icon-download",
     commonFlag: !0,
     columnFlag: true,
     formItemFlag: !1,
@@ -3321,7 +3321,7 @@ export const advancedFields = [
   },
   {
     type: "import2-button",
-    icon: "excel",
+    icon: "el-icon-download",
     commonFlag: !0,
     columnFlag: true,
     formItemFlag: !1,
@@ -3369,7 +3369,7 @@ export const advancedFields = [
   },
   {
     type: "print-button",
-    icon: "print",
+    icon: "el-icon-printer",
     commonFlag: !0,
     columnFlag: true,
     formItemFlag: !1,
@@ -3410,7 +3410,7 @@ export const advancedFields = [
   },
   {
     type: "print-detail-button",
-    icon: "pdf",
+    icon: "el-icon-printer",
     commonFlag: !0,
     columnFlag: false,
     formItemFlag: !1,
@@ -3573,7 +3573,7 @@ export const advancedFields = [
 
   {
     type: "project-tag",
-    icon: "tag",
+    icon: "star",
     commonFlag: !0,
     columnFlag: true,
     formItemFlag: !0,
@@ -3612,7 +3612,7 @@ export const advancedFields = [
   },
   {
     type: "dropdown",
-    icon: "ico-more",
+    icon: "el-icon-arrow-down",
     commonFlag: !0,
     // columnFlag: true,
     widgetList: [],
@@ -3684,7 +3684,7 @@ export const advancedFields = [
 
   {
     type: "download-button",
-    icon: "download",
+    icon: "el-icon-download",
     commonFlag: !0,
     columnFlag: true,
     formItemFlag: !1,
@@ -3990,7 +3990,7 @@ export const businessFields = [
   {
     type: "saleOrg-vabsearch",
     targetType: "singerSearch",
-    icon: "org",
+    icon: "tree",
     commonFlag: !0,
     columnFlag: true,
     formItemFlag: !0,
@@ -4035,7 +4035,7 @@ export const businessFields = [
   {
     type: "saleOrg-project-tag",
     targetType: "project-tag",
-    icon: "org",
+    icon: "tree",
     commonFlag: !0,
     columnFlag: true,
     formItemFlag: !0,
@@ -4056,7 +4056,7 @@ export const businessFields = [
   {
     type: "save_submit_wf_button",
     targetType: "button",
-    icon: "node-tree",
+    icon: "el-icon-video-play",
     commonFlag: !0,
     columnFlag: true,
     formItemFlag: !1,
@@ -4094,7 +4094,7 @@ export const businessFields = [
   },
   {
     type: "copy_button",
-    icon: "clipboard",
+    icon: "el-icon-document-copy",
     commonFlag: !0,
     columnFlag: true,
     formItemFlag: !1,
@@ -4277,7 +4277,7 @@ export const compareFields = [
   {
     type: "compare-button",
     targetType: "button",
-    icon: "compare",
+    icon: "fullscreen",
     commonFlag: !0,
     formItemFlag: !1,
     columnFlag: true,

package/src/components/xform/utils/formHttp.js

@@ -0,0 +1,162 @@
+// import {initWf} from '../../../components/wf/wfUtil'
+// import {getReportGlobalMap} from "../../../components/xform/utils/util";
+import {decrypt} from "@base/utils/aes";
+
+
+let modules = {};
+modules = {
+  methods: {
+    /*formScriptHttp(opts){
+      return this.formHttp({
+        ...opts
+      });
+    },*/
+    handleDecryptData(data) {
+      if (data) {
+        if (Array.isArray(data)) {
+          data.forEach(item => {
+            this.handleDecryptData(item)
+          })
+        } else if (Object.prototype.toString.call(data) === "[object Object]") {
+          Object.keys(data).forEach(key => {
+
+            let value = data[key];
+            if (value !== null && value !== undefined) {
+              if (Object.prototype.toString.call(data[key]) === "[object String]") {
+                let str = "ATEN*-";
+                if (value.startsWith(str)) {
+                  data[key] = decrypt(value.slice(str.length));
+                }
+              } else {
+                this.handleDecryptData(data[key])
+              }
+            }
+          })
+        } else if (Object.prototype.toString.call(data) === "[object String]") {
+          let str = "ATEN*-";
+          if (data.startsWith(str)) {
+            data = decrypt(data.slice(str.length));
+          }
+        }
+      }
+      return data;
+    },
+    getHttpTarget() {
+      return this.getFormRef ? this.getFormRef() : this;
+    },
+    formHttp(opts) {
+      let data = opts.data;
+      let scriptCode = opts.scriptCode ? opts.scriptCode.trim() : null;
+      let formCode = opts.formCode ? opts.formCode.trim() : null;
+      let isLoading = opts.isLoading ?? true;
+      let success = opts.success;
+      let fail = opts.fail;
+      let error = opts.error;
+
+      let that = this;
+      // let reportTemplate = that.getFormRef ? that.getFormRef().reportTemplate : that.reportTemplate;
+      if (scriptCode && !formCode) {
+        let arr = scriptCode.split("/").filter(item => item)
+        if (arr.length > 1) {
+          formCode = arr[0];
+          scriptCode = arr[1];
+        }
+      }
+
+
+      delete opts.data
+      delete opts.scriptCode
+      delete opts.formCode
+      delete opts.isLoading
+      delete opts.success
+      delete opts.fail
+      delete opts.error
+
+
+      let getReqUrl = (callback) => {
+
+        if (!opts.url) {
+          this.getHttpTarget().$http({
+            aes: true,
+            url: USER_PREFIX + `/formScript/getServiceName`,
+            method: `post`,
+            data: {
+              formCode,
+              scriptCode
+            },
+            isLoading,
+            // loadingTarget: this.getLoadingTarget(),
+            // modalStrictly: true,
+            success: res => {
+              let serviceName = res.objx;
+              if (serviceName) {
+                let url = `/${searviceName}/bd_api/${formCode}/${scriptCode}`;
+                callback(url)
+              } else {
+                this.$baseAlert("服务名不存在")
+              }
+            }
+          });
+        } else {
+          callback(opts.url)
+        }
+
+      }
+      let toDo = () => {
+        return new Promise((resolve, reject) => {
+          getReqUrl(url => {
+            let reqData;
+            reqData = data;
+
+            let reportGlobalMap = {};
+            // let url = `/${searviceName}/bd_api/${formCode}/${scriptCode}`;
+            // let opts.vue
+            return opts.vue.$http({
+              // aes: true,
+              url: url,
+              method: `post`,
+              // loadingTarget: this.getLoadingTarget(),
+              isLoading,
+              ...opts,
+              data: {
+                // scriptCode: scriptCode,
+                fixeData: reportGlobalMap,
+                ...reqData
+              },
+              success: res => {
+                if (res.objx) {
+                  res.objx = this.handleDecryptData(res.objx);
+                }
+                if (opts.successMsg) {
+                  this.$message({
+                    message: res.content,
+                    type: 'success',
+                    duration: 1000
+                  });
+                }
+                success && success(res);
+                resolve(res);
+              },
+              fail: res => {
+                fail && fail(res);
+                resolve(res);
+              },
+              error: e => {
+                error && error(e);
+                reject(e);
+              }
+            });
+          })
+        })
+      }
+      if (opts.isConfirm) {
+        this.$baseConfirm(opts.confirmText).then(() => {
+          return toDo();
+        });
+      } else {
+        return toDo();
+      }
+    }
+  }
+}
+export default modules;

package/src/layout/components/AppMain.vue

@@ -89,11 +89,14 @@ export default {
 <style lang="scss" scoped>
 .app-main {
   /* 45= navbar  45  */
-  min-height: calc(100vh - 45px);
-  //height:calc(100vh - 10px);
+  //min-height: calc(100vh - 45px);
+  height:calc(100vh - 10px);
   width: 100%;
   position: relative;
   overflow: hidden;
+  > div{
+    height:100%;
+  }
 }
 
 .fixed-header + .app-main {

package/src/layout/components/extractedCode/viewDialog.vue

@@ -179,7 +179,7 @@ export default {
   right: 130px;
   top: 0;
 }
-
+/*
 ::v-deep .tab-boxOnly > .el-tabs__content .el-tab-pane .el-tab-pane {
   .detail-wrap .d-cont {
     height: calc(100vh - 158px) !important;
@@ -203,5 +203,5 @@ export default {
   .grid-height {
     height: calc(100vh - 84px) !important;
   }
-}
+} */
 </style>

package/src/views/bd/setting/formVersion/ftHistoryDialog.vue

@@ -479,13 +479,5 @@ export default {
 };
 </script>
 <style scoped lang="scss">
-.grid-height {
-  height: calc(100vh - 106px) !important;
-}
-::v-deep .detail-wrap{
-  margin:-8px -10px 0;
-  .d-cont {
-    height: calc(100vh - 148px) !important;
-  }
-}
+
 </style>

package/src/views/bd/setting/form_template/formDesignerDialog.vue

@@ -144,28 +144,28 @@ export default {
   top: 0;
 }
 
-::v-deep .tab-boxOnly > .el-tabs__content .el-tab-pane .el-tab-pane {
-  .detail-wrap .d-cont {
-    height: calc(100vh - 158px) !important;
-  }
+// ::v-deep .tab-boxOnly > .el-tabs__content .el-tab-pane .el-tab-pane {
+//   .detail-wrap .d-cont {
+//     height: calc(100vh - 158px) !important;
+//   }
 
-  .grid-height {
-    height: calc(100vh - 126px) !important;
-  }
-}
+//   .grid-height {
+//     height: calc(100vh - 126px) !important;
+//   }
+// }
 
-::v-deep
-  .designer-drawer.is-fullscreen
-  .tab-boxOnly
-  > .el-tabs__content
-  .el-tab-pane
-  .el-tab-pane {
-  .detail-wrap .d-cont {
-    height: calc(100vh - 116px) !important;
-  }
+// ::v-deep
+//   .designer-drawer.is-fullscreen
+//   .tab-boxOnly
+//   > .el-tabs__content
+//   .el-tab-pane
+//   .el-tab-pane {
+//   .detail-wrap .d-cont {
+//     height: calc(100vh - 116px) !important;
+//   }
 
-  .grid-height {
-    height: calc(100vh - 84px) !important;
-  }
-}
+//   .grid-height {
+//     height: calc(100vh - 84px) !important;
+//   }
+// }
 </style>

package/src/views/bd/setting/form_template/wfObjConfigDialog.vue

@@ -12,52 +12,51 @@
     v-el-drag-dialog
     v-el-dialog-center
   >
-    <div class="cont">
-      <div id="containt">
-        <el-form ref="editForm" :model="formData">
-          <div class="grid-height" style="height: 500px">
-            <vxe-grid
-              class="is-pointer"
-              ref="table-m1"
-              :data="formData.wfObjConfigDTOs"
-              v-bind="vxeOption"
-              @resizable-change="$vxeTableUtil.onColumnWitchChange"
-              @custom="$vxeTableUtil.customHandle"
-            >
-              <template #form>
-                <div class="clearfix screen-btns">
-                  <div class="fl">
-                    <vxe-button status="primary" class="button-sty" icon="el-icon-plus"
-                                @click="openCompanyDialog">
-                      新增
-                    </vxe-button>
-                    <span class="button-sty tips">{{ $t1('选择表单所在的组织，填写组织对应的流程单据类型数据。') }}</span>
-                  </div>
+    <div id="containt">
+      <el-form ref="editForm" :model="formData">
+        <div class="grid-height" style="height: 500px">
+          <vxe-grid
+            class="is-pointer"
+            ref="table-m1"
+            :data="formData.wfObjConfigDTOs"
+            v-bind="vxeOption"
+            @resizable-change="$vxeTableUtil.onColumnWitchChange"
+            @custom="$vxeTableUtil.customHandle"
+          >
+            <template #form>
+              <div class="clearfix screen-btns">
+                <div class="fl">
+                  <vxe-button status="primary" class="button-sty" icon="el-icon-plus"
+                              @click="openCompanyDialog">
+                    新增
+                  </vxe-button>
+                  <span class="button-sty tips">{{ $t1('选择表单所在的组织，填写组织对应的流程单据类型数据。') }}</span>
                 </div>
-              </template>
-              <template #objTypeName="{row,rowIndex}">
-                <el-form-item :prop="'wfObjConfigDTOs.'+rowIndex+'.objTypeName'"
-                              :rules="[{ required: true, trigger: 'blur' }]">
-                  <el-input v-model="row.objTypeName" clearable></el-input>
-                </el-form-item>
-              </template>
-              <template #operate="{row}">
-                <a
-                  href="javascript:void(0);"
-                  class="a-link"
-                  @click="openEditDialog(row.id)"
-                >
-                  <el-tooltip :enterable="false" effect="dark" :content="$t2('查看','common.view')" placement="top"
-                              popper-class="tooltip-skin">
-                    <i class="el-icon-edit"/>
-                  </el-tooltip>
-                </a>
-              </template>
-            </vxe-grid>
-          </div>
-        </el-form>
-      </div>
+              </div>
+            </template>
+            <template #objTypeName="{row,rowIndex}">
+              <el-form-item :prop="'wfObjConfigDTOs.'+rowIndex+'.objTypeName'"
+                            :rules="[{ required: true, trigger: 'blur' }]">
+                <el-input v-model="row.objTypeName" clearable></el-input>
+              </el-form-item>
+            </template>
+            <template #operate="{row}">
+              <a
+                href="javascript:void(0);"
+                class="a-link"
+                @click="openEditDialog(row.id)"
+              >
+                <el-tooltip :enterable="false" effect="dark" :content="$t2('查看','common.view')" placement="top"
+                            popper-class="tooltip-skin">
+                  <i class="el-icon-edit"/>
+                </el-tooltip>
+              </a>
+            </template>
+          </vxe-grid>
+        </div>
+      </el-form>
     </div>
+
     <span slot="footer" class="dialog-footer">
 			<el-button type="primary" plain class="button-sty" @click="closeDialog">
 				<i class="el-icon-close el-icon"></i>

package/src/views/user/wf/wfReport/index.vue

@@ -520,6 +520,10 @@ export default {
   background: none;
   padding: 10px 0 0;
   box-shadow: none;
+  display:flex;flex-direction: column;
+  > .el-row{flex:1;
+    > .el-col{height:100%;}
+  }
 }
 .filter-btns {
   .f-btn {
@@ -580,12 +584,13 @@ export default {
   }
 }
 ::v-deep .box-style1 {
-  margin: 10px 5px 0;
+  margin: 10px 5px 0;height:calc(100% - 10px);display:flex;flex-direction:column;
   .el-card__body {
-    height: calc(100vh - 254px);
+    flex:1;
   }
 }
 .node-box {
+  height:100%;overflow:auto;display:flex;flex-direction: column;
   .info {
     border: solid 1px #e6ebf5;
     background: #f6faff;
@@ -602,18 +607,19 @@ export default {
       position: absolute;
       right: 12px;
       top: 50%;
-      margin-top: -14px;
+      margin-top: -14px !important;
     }
     .tit {
       font-size: 13px;
       color: #212121;
       margin-bottom: 5px;
+      margin-top:0;
     }
   }
   .el-steps {
-    height: calc(100vh - 326px);
     overflow: auto;
     padding-right: 10px;
+    flex:1;
   }
 }
 </style>