cloud-web-corejs 1.0.54-dev.628 → 1.0.54-dev.629

package/package.json

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

package/src/components/xform/form-designer/form-widget/container-widget/detail-pane-widget.vue

@@ -5,6 +5,7 @@
                :key="widget.id" @click.native.stop="selectWidget(widget)" :visible="!widget.options.hidden">
     <template #button>
 <!--      <el-button class="button-sty" icon="el-icon-search" v-if="widget.options.tableRef">新增</el-button>-->
+
       <div class="grid-cell">
         <draggable
           :list="widget.buttonWidgetList"
@@ -21,7 +22,7 @@
                   :is="subWidget.type + '-widget'"
                   :widget="subWidget"
                   :designer="designer"
-                  :key="subWidget.id"
+                   :key="subWidget.id"
                   :parent-list="widget.buttonWidgetList"
                   :index-of-parent-list="swIdx"
                   :parent-widget="widget"
@@ -145,7 +146,7 @@ export default {
   methods: {
     checkContainerMove(evt) {
       return true;
-    }
+    },
   }
 }
 </script>

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

@@ -120,7 +120,9 @@ export default {
             let datas = $grid.getTableData().tableData;
             let fieldKey = this.fieldKey;
             this.checkRows.forEach((checkRow) => {
-              let row = datas.find((row) => row[fieldKey] == checkRow[fieldKey]);
+              let row = datas.find(
+                (row) => row[fieldKey] == checkRow[fieldKey]
+              );
               if (row) {
                 $grid.setCheckboxRow(row, true);
               }
@@ -168,7 +170,9 @@ export default {
         width: "1200px",
         fullscreen: this.option.fullscreen,
       };
-      config = Object.assign({}, config, this.option.dialogConfig, { customClass });
+      config = Object.assign({}, config, this.option.dialogConfig, {
+        customClass,
+      });
       config.title = this.$t1(config.title);
       return config;
     },
@@ -181,7 +185,9 @@ export default {
       if (this.option.showFooter == false) {
         classStr = classStr + " nfootBtn";
       }
-      config = Object.assign({}, config, this.option.bodyConfig, { class: classStr });
+      config = Object.assign({}, config, this.option.bodyConfig, {
+        class: classStr,
+      });
       return config;
     },
   },
@@ -233,7 +239,9 @@ export default {
             : {};
           this.layoutType = this.formJson.formConfig.layoutType;
           let formConfig = this.formJson.formConfig;
-          if (formConfig.searchDialogUniqueField) {
+          if (this.options.fieldKey) {
+            this.fieldKey = this.options.fieldKey;
+          } else if (formConfig.searchDialogUniqueField) {
             this.fieldKey = formConfig.searchDialogUniqueField;
           }
           /*this.$nextTick(() => {
@@ -268,7 +276,8 @@ export default {
       return this.$grid;
     },
     initShowFormField() {
-      let showFormField = this.formJson.formConfig.searchDialogNameField || null;
+      let showFormField =
+        this.formJson.formConfig.searchDialogNameField || null;
       if (!showFormField) {
         // let widgetList = this.formJson.widgetList;
         let dataTableWidget = this.getDataTableWidget();

package/src/layout/components/Sidebar/default.vue

@@ -1,5 +1,5 @@
 <template>
-  <div :class="{ 'has-logo': showLogo }">
+  <div :class="{ 'has-logo': showLogo,telescopMenu:!isMenu }">
     <!-- <logo v-if="showLogo" :collapse="isCollapse" /> -->
 
     <div class="hamburger-box" ref="hamhurger" @click="openUserInfo">
@@ -122,6 +122,7 @@
       :unique-opened="true"
       @mouseleave="showNav()"
       ref="seconMenus"
+      :collapse="!isMenu"
     >
       <el-scrollbar wrap-class="scrollbar-wrapper" id="menuUl">
         <el-submenu
@@ -268,6 +269,9 @@ import createCompanyDialog from "@base/layout/components/createCompany/createCom
 export default {
   props: {
     option: Object,
+    isMenu: {
+      type: Boolean
+    }
   },
   components: {
     userInfo,
@@ -844,6 +848,7 @@ export default {
   font-size: 12px;
   color: rgba(255, 255, 255, 0.65);
 
+
   > div {
     color: #fff;
     font-size: 13px;
@@ -887,6 +892,7 @@ export default {
       line-height: 16px;
       overflow: hidden;
       vertical-align: middle;
+      white-space: nowrap;
     }
 
     &.name {
@@ -910,7 +916,7 @@ export default {
   text-align: center;
 
   p {
-    margin: 0;
+    margin: 0;display: -webkit-box; overflow: hidden; text-overflow: ellipsis; -webkit-line-clamp: 2; -webkit-box-orient: vertical;
   }
 }
 
@@ -1420,7 +1426,6 @@ export default {
     }
   }
 }
-
 // .el-submenu .el-menu {
 //   height: auto !important;
 // }

package/src/layout/components/Sidebar/index.vue

@@ -1,10 +1,15 @@
 <template>
-  <defaultView></defaultView>
+  <defaultView :isMenu.sync="isMenu"></defaultView>
 </template>
 
 <script>
 import defaultView from "./default.vue";
 export default {
+  props: {
+    isMenu: {
+      type: Boolean
+    }
+  },
   data() {
     return {};
   },

package/src/layout/components/TagsView/index.vue

@@ -1,5 +1,6 @@
 <template>
   <div id="tags-view-container" class="navbar-tag">
+    <div @click="$baseEventBus.$emit('triggerMenu')" class="telescopMenuIcon"><i class="iconfont" :class="isMenu?'icon-shouqi':'icon-shouqi-copy'"></i></div>
     <scroll-pane ref="scrollPane" class="tags-view-wrapper" @scroll="handleScroll">
       <router-link
         v-for="tag in visitedViews"
@@ -63,6 +64,11 @@ import path from 'path'
 
 export default {
   components: {ScrollPane},
+  props: {
+    isMenu: {
+      type: Boolean
+    }
+  },
   data() {
     return {
       visible: false,

package/src/layout/defaultLayout.vue

@@ -1,10 +1,10 @@
 <template>
-  <div class="app-wrapper openSidebar">
-    <sidebar class="sidebar-container" :class="{ hoverold: hoverSidebar }" @selfClose="hoverSidebar = false"
-             @selfEnter="hoverSidebar = true"/>
-    <div class="main-container">
-      <div class="fixed-header">
-        <tags-view v-if="needTagsView"/>
+  <div :class="{'app-wrapper openSidebar':showSidebar,'empty-home-wrapper':!showSidebar}">
+    <sidebar v-show="showSidebar" class="sidebar-container" :class="{ hoverold: hoverSidebar }" @selfClose="hoverSidebar = false"
+             @selfEnter="hoverSidebar = true" :isMenu.sync="isMenu"/>
+    <div :class="{'main-container':showSidebar,telescopMenu:!isMenu}">
+      <div class="fixed-header" v-show="showSidebar">
+        <tags-view v-if="needTagsView" :isMenu.sync="isMenu"/>
       </div>
       <app-main v-if="showAppMain" ref="appMain"/>
     </div>
@@ -38,6 +38,10 @@ export default {
         withoutAnimation: this.sidebar.withoutAnimation,
         mobile: this.device === 'mobile'
       };
+    },
+    showSidebar() {
+      let result = true
+      return result;
     }
   },
   data() {
@@ -45,7 +49,8 @@ export default {
       hoverSidebar: false,
       showAppMain: false,
       showModifyPasswordDialog: true,
-      passwordStatus: 2
+      passwordStatus: 2,
+      isMenu:true
     };
   },
   created() {
@@ -57,6 +62,9 @@ export default {
       success: res => {
       }
     });
+    this.$baseEventBus.$on("triggerMenu",(value)=>{
+      this.isMenu = !this.isMenu;
+    });
   },
   async mounted() {
     if (sessionStorage.getItem('toHome') == '1') {
@@ -120,7 +128,7 @@ export default {
   padding-top: 2px;
   //box-shadow:0 2px 6px rgba(0,0,0,0.04);
   //background:#FFF;
-  border-bottom: solid 2px $baseColor;
+  // border-bottom: solid 2px $baseColor;
   display: -moz-box;
   display: -webkit-box;
   display: box;

package/src/views/bd/setting/form_template/mixins/list2.js

@@ -0,0 +1,411 @@
+import tableForm from "@base/components/table/tableForm.vue";
+import editView from "@base/views/bd/setting/form_template/edit.vue";
+import itemList from "@base/views/bd/setting/form_template/itemList.vue";
+import formScriptList from "@base/views/bd/setting/form_script/form_list.vue";
+import indexUtil from "@base/utils";
+import {getBdFlag} from "@base/api/user";
+import designer from "@base/views/user/form/vform/designer.vue";
+import {getJsxBtnList, getJsxStatus} from "@base/views/bd/setting/utils/index";
+
+let modules = {};
+modules = {
+  name: 'bd_form_template:list',
+  components: {
+
+    tableForm,
+    editView,
+    itemList,
+    formScriptList,
+    designer
+  },
+  data() {
+    return {
+      isFullscreen: false,
+      formDesTabs: 'first',
+      activeName: 'second',
+      dataId: 0,
+      showEdit: false,
+      vxeOption: {},
+      formData: {},
+      showDesingerDialog: false,
+      formCode: null,
+      formName: null,
+      templateId: null,
+      currentFormTemplate: null,
+
+      showItemEdit: false,
+      showParamEdit: false,
+      vxeOption1: {},
+      editId: '',
+      itemEditId: '',
+      pRow: null,
+      currentRow: {},
+      serviceId: null,
+      itemServiceId: null,
+
+      showWfDialog: false,
+      wfUrl: '',
+      ph: '',
+      dialogActiveName: 'first',
+      showFunctionScriptList: false,
+      showUserDialog: false,
+      wfAssignData: [],
+      wfAssignCallback: null,
+      wfAssignMulti: true,
+
+      showPositionDialog: false,
+      wfAssignPositionData: [],
+      wfAssignPositionCallback: null,
+
+      showFormTemplateDialog: false,
+      wfAssignFormTemplateCallback: null,
+
+      showScriptDescriptionDialog: false,
+      showWfDiyAttributeEdit: false,
+
+      showFtHistoryDialog: false,
+      operateFtHistory: null,
+
+      defaultProps: {
+        label: 'name', //这里是树结构中需显示的数据（即接口返回的需展示在页面上的参数）
+        children: [],
+        isLeaf: 'leaf'
+      },
+      showItemView: false,
+
+      currentFormType: {},
+      editFormTypeId: null,
+      showFormTypeDialog: false,
+      showFormScriptList: false,
+      addProjectTagOption: {
+        url: USER_PREFIX + `/formTemplate/saveTag`,
+        tableDatas: () => {
+          return this.$refs["table-m1"].getCheckboxRecords(true);
+        },
+        reqData: (tagDatas, tableDatas) => {
+          let sids = tableDatas.map(item => item.sid);
+          let tagCodes = tagDatas.map(item => item.tagCode);
+          let reqData = {
+            tagCodes,
+            sids
+          };
+          return reqData;
+        },
+        callback: () => {
+          this.searchEvent()
+        }
+      },
+      deleteProjectTagOption: {
+        url: USER_PREFIX + `/formTemplate/deleteTag`,
+        tableDatas: () => {
+          return this.$refs["table-m1"].getCheckboxRecords(true);
+        },
+        reqData: (tagDatas, tableDatas) => {
+          let sids = tableDatas.map(item => item.sid);
+          let tagCodes = tagDatas.map(item => item.tagCode);
+          let reqData = {
+            tagCodes,
+            sids
+          };
+          return reqData;
+        },
+        callback: () => {
+          this.searchEvent()
+        }
+      },
+      showProjectTagDialog3: false,
+      checkTags: [],
+      isDev: true,
+      menuKindAuth: {},
+      showTree: false,
+
+      showWfObjConfigDialog: false,
+      formTemplate: null
+    };
+  },
+  computed: {
+    currentMenuKindId() {
+      return this.currentFormType?.id || null
+    },
+    currentMenuKindName() {
+      return this.currentFormType?.name || null
+    }
+  },
+  watch: {
+    formDesTabs(val) {
+      if (this.showFormScriptList == false && val == 'second') {
+        this.showFormScriptList = true;
+      }
+    }
+  },
+  mounted() {
+    this.getBdEnv();
+    this.initTableList();
+    this.initWfWinParam();
+  },
+  methods: {
+    searchEvent() {
+      this.$refs['table-m1'].commitProxy('reload');
+    },
+    resetEvent() {
+      this.formData = {};
+      this.checkTags = [];
+      this.$refs['table-m1'].commitProxy('reload');
+    },
+    openEditDialog(row) {
+      let formCode = row?.formCode || null;
+      /*this.dataId = !id || typeof id == 'object' ? 0 : id;
+      this.activeName = 'first';
+      this.showItemEdit = false;
+      this.$openEditView('showEdit');*/
+      if (!formCode) {
+        this.dataId = formCode;
+        this.activeName = 'first';
+        this.$openEditView('showEdit');
+      } else {
+        this.$refs.xTabs.openEditTab(row);
+      }
+
+    },
+    openDesingerDialog(row, callback) {
+      this.formCode = row.formCode;
+      this.formName = row.formName;
+      this.currentFormTemplate = row;
+      this.isFullscreen = false;
+      this.showDesingerDialog = true;
+      this.designerSaveCallback = callback ?? null;
+    },
+    openDesingerDialogByChild({row, callback}) {
+      this.openDesingerDialog(row, callback)
+    },
+    reflushTemplateList() {
+      this.searchEvent();
+      this.designerSaveCallback && this.designerSaveCallback();
+    },
+    handleFullscreen() {
+      let isFullscreen = this.isFullscreen;
+      if (!isFullscreen) {
+        indexUtil.addClass(document.body, "hideMenu");
+      } else {
+        indexUtil.removeClass(document.body, "hideMenu");
+      }
+      this.isFullscreen = !isFullscreen;
+    },
+    openFtHistoryDialog(row) {
+      this.operateFtHistory = row;
+      this.showFtHistoryDialog = true;
+    },
+    confirmFtHistoryDialog(row) {
+      this.searchEvent();
+    },
+    closeFormDesignwinEvent(done) {
+      this.$baseConfirm(this.$t1('请确认"已保存"报表模板，是否继续关闭？')).then(() => {
+        indexUtil.removeClass(document.body, "hideMenu");
+        done && done();
+      });
+    },
+    getSearchParam() {
+      let tagCodes = null;
+      if (this.checkTags.length) {
+        tagCodes = this.checkTags.map(item => item.tagCode);
+      }
+      let currentFormType = this.currentFormType || {}
+      return {
+        ...this.formData,
+        tagCodes,
+        menuKindCode: currentFormType.menuKindCode || null,
+        history: false
+      };
+    },
+    initTableList() {
+      let that = this;
+      let tableOption = {
+        vue: this,
+        tableRef: 'table-m1',
+        tableName: 'bd_form_template_list-m2',
+        path: USER_PREFIX + '/formTemplate/listPageWf',
+        param: () => {
+          return this.getSearchParam();
+        },
+        columns: [
+          {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
+          {
+            title: this.$t1('模板名称'),
+            field: 'formName',
+            width: 250,
+            fixed: 'left'
+          },
+          {
+            title: this.$t1('模板编码'),
+            field: 'formCode',
+            width: 250
+          },
+          {field: 'serviceName', title: this.$t1('服务名'), width: 150},
+          {
+            title: this.$t1('更新时间'),
+            field: 'modifyDate',
+            width: 150
+          },
+          {
+            title: this.$t1('创建时间'),
+            field: 'createDate',
+            width: 150
+          },
+          {
+            width: 120,
+            fixed: 'right',
+            title: '',
+            sortable: false,
+            slots: {
+              default: ({row}) => {
+                return getJsxBtnList([
+                  {
+                    iconName: "iconfont icon-liuchengguanli-shejiqi_liucheng",
+                    content: this.$t1('流程单据维护'),
+                    onclick: () => {
+                      this.openWfObjConfigDialog(row);
+                    }
+                  }
+                ]);
+              }
+            }
+          }
+        ],
+        searchColumns: [
+          {title: this.$t1('模板名称'), field: "formName", type: "input", common: true},
+          {title: this.$t1('模板编码'), field: "formCode", type: "input", common: true}
+        ],
+        config: {
+
+        },
+      };
+      this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
+        this.vxeOption = opts;
+        this.showTree = true;
+      });
+    },
+    chooseCellM1(row) {
+      this.currentRow = row;
+      this.showItemView = true;
+    },
+    openWfDesignDialog(actModelId) {
+      //wfType 0:单据流程，1：场景流程
+      let serviceId = this.currentRow.serviceName;
+      this.wfUrl = WEB_PREFIX + '/activiti-explorer/modeler.html?wfType=0&serviceId=' + serviceId + '&modelId=' + actModelId;
+      this.dialogActiveName = 'first';
+      this.showWfDialog = true;
+    },
+    closeDesignwinEvent(done) {
+      this.$baseConfirm(this.$t1('请确认"已保存"流程模板，是否继续关闭？')).then(() => {
+        this.showWfDialog = false;
+        // this.showDesingerDialog = false;
+      });
+    },
+    initWfWinParam() {
+      this.initCloseWfDesignWin();
+      this.initWinUserDialog();
+      this.initWinPositionDialog();
+      this.initSysParamForWf();
+      this.initWinFormTemplateDialog();
+      this.initWinScriptDescriptionDialog();
+    },
+    initCloseWfDesignWin() {
+      window.closeWfDesignWin = () => {
+        this.showWfDialog = false;
+      };
+    },
+    initWinUserDialog() {
+      window.openAssignUserDialog = opts => {
+        this.wfAssignMulti = opts.multi;
+        this.wfAssignData = opts.data || [];
+        this.wfAssignCallback = opts.callback;
+        this.showUserDialog = true;
+      };
+    },
+    confirmUser(rows) {
+      this.wfAssignCallback(rows);
+    },
+    initWinPositionDialog() {
+      window.openAssignPositionDialog = opts => {
+        this.wfAssignPositionData = opts.data || [];
+        this.wfAssignPositionCallback = opts.callback;
+        this.showPositionDialog = true;
+      };
+    },
+    initSysParamForWf() {
+      let webPrefix = WEB_PREFIX;
+      let baseApi = process.env.VUE_APP_BASE_API;
+      window.sysParamForWf = {
+        webPrefix,
+        baseApi
+      }
+    },
+    confirmPosition(rows) {
+      this.wfAssignPositionCallback(rows);
+    },
+    initWinFormTemplateDialog() {
+      window.openAssignFormTemplateDialog = opts => {
+        this.wfAssignFormTemplateCallback = opts.callback;
+        this.showFormTemplateDialog = true;
+      };
+    },
+    confirmFormTemplate(rows) {
+      this.wfAssignFormTemplateCallback(rows);
+    },
+    initWinScriptDescriptionDialog() {
+      window.openScriptDescriptionDialog = opts => {
+        this.showScriptDescriptionDialog = true;
+      };
+    },
+    handleFormDesignClose() {
+      this.formDesTabs = 'first';
+      this.showFormScriptList = false;
+    },
+    openProjectTagDialog3() {
+      this.showProjectTagDialog3 = true;
+    },
+    confirmProjectTagDialog3(rows) {
+      this.checkTags = rows;
+    },
+    getTabNames() {
+      return this.checkTags.map(item => item.tagName).join(",");
+    },
+    jsonImport() {
+      this.$jsonImport({
+        saveUrl: USER_PREFIX + '/form_develop/importFormTemplate',
+        showResult: true,
+        resultColumns: [
+          {title: this.$t1('模板名称'), field: "formName", type: "input", common: true},
+          {title: this.$t1('模板编码'), field: "formCode", type: "input", common: true},
+        ],
+        callback: () => {
+          this.searchEvent();
+        }
+      });
+    },
+    jsonExport() {
+      this.$jsonExport({
+        targetRef: "table-m1",
+        url: USER_PREFIX + "/form_develop/exportFormTemplate",
+        abcEnabled: true,
+        editAuth: this.currentFormType.editAuth,
+        selectTypeAuth: this.currentFormType.selectTypeAuth
+      })
+    },
+    getBdEnv() {
+      getBdFlag({
+        success: res => {
+          this.isDev = res.objx == 1
+        }
+      });
+    },
+    openWfObjConfigDialog(row) {
+      this.formTemplate = row;
+      this.showWfObjConfigDialog = true;
+
+    },
+    confirmWfObjConfigDialog() {
+    }
+  }
+};
+export default modules