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

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

@@ -10,13 +10,17 @@
 
 <template>
   <container-item-wrapper :widget="widget">
-    <div class="detail-wrap grid-container" :class="[customClass]" :ref="widget.id">
+    <div
+      class="detail-wrap grid-container"
+      :class="[customClass]"
+      :ref="widget.id"
+    >
       <div class="d-header clearfix">
         <div class="fl">
-          <i class="el-icon-info"/>
+          <i class="el-icon-info" />
           {{ getI18nLabel(widget.options.label) }}
         </div>
-<!--        <div class="fr">
+        <!--        <div class="fr">
           <el-button type="primary" plain class="button-sty" icon="el-icon-refresh-right" @click="reload">重置
           </el-button>
           <el-button type="primary" class="button-sty" icon="el-icon-check" @click="saveData" v-if="!wfInfo.id">保存
@@ -25,54 +29,76 @@
         <div class="fr">
           <template v-for="(subWidget, swIdx) in widget.widgetList">
             <template v-if="'container' === subWidget.category">
-              <component :is="subWidget.type + '-item'" :widget="subWidget" :key="swIdx"
-                         :parent-list="widget.widgetList"
-                         :index-of-parent-list="swIdx" :parent-widget="widget">
+              <component
+                :is="subWidget.type + '-item'"
+                :widget="subWidget"
+                :key="swIdx"
+                :parent-list="widget.widgetList"
+                :index-of-parent-list="swIdx"
+                :parent-widget="widget"
+              >
                 <!-- 递归传递插槽！！！ -->
-                <template v-for="slot in Object.keys($scopedSlots)" v-slot:[slot]="scope">
-                  <slot :name="slot" v-bind="scope"/>
+                <template
+                  v-for="slot in Object.keys($scopedSlots)"
+                  v-slot:[slot]="scope"
+                >
+                  <slot :name="slot" v-bind="scope" />
                 </template>
               </component>
             </template>
             <template v-else>
-              <component :is="subWidget.type + '-widget'" :field="subWidget" :designer="null" :key="swIdx"
-                         :parent-list="widget.widgetList"
-                         :index-of-parent-list="swIdx" :parent-widget="widget">
+              <component
+                :is="subWidget.type + '-widget'"
+                :field="subWidget"
+                :designer="null"
+                :key="swIdx"
+                :parent-list="widget.widgetList"
+                :index-of-parent-list="swIdx"
+                :parent-widget="widget"
+              >
                 <!-- 递归传递插槽！！！ -->
-                <template v-for="slot in Object.keys($scopedSlots)" v-slot:[slot]="scope">
-                  <slot :name="slot" v-bind="scope"/>
+                <template
+                  v-for="slot in Object.keys($scopedSlots)"
+                  v-slot:[slot]="scope"
+                >
+                  <slot :name="slot" v-bind="scope" />
                 </template>
               </component>
             </template>
           </template>
         </div>
       </div>
-      <baseTabs style="height: auto;">
-        <detail-pane-widget v-for="(paneWidget, index) in widget.panes" :key="index" :widget="paneWidget"
-                            :parent-list="widget.panes"
-                            :index-of-parent-list="index" :parent-widget="widget"
-                            :col-height="widget.options.colHeight" tabRef="baseTabRef" :tabPaneGrade="2"></detail-pane-widget>
+      <baseTabs :showNav="!widget.options.hideNav">
+        <detail-pane-widget
+          v-for="(paneWidget, index) in widget.panes"
+          :key="index"
+          :widget="paneWidget"
+          :parent-list="widget.panes"
+          :index-of-parent-list="index"
+          :parent-widget="widget"
+          :col-height="widget.options.colHeight"
+          tabRef="baseTabRef"
+          :tabPaneGrade="2"
+        ></detail-pane-widget>
       </baseTabs>
     </div>
   </container-item-wrapper>
 </template>
 
 <script>
+import emitter from "../../../../components/xform/utils/emitter";
+import i18n from "../../../../components/xform/utils/i18n";
+import refMixin from "../../../../components/xform/form-render/refMixin";
+import ContainerItemWrapper from "./container-item-wrapper";
+import containerItemMixin from "./containerItemMixin";
+import detailPaneWidget from "../../../../components/xform/form-render/container-item/detail-pane-item";
+import FieldComponents from "../../../../components/xform/form-designer/form-widget/field-widget/index";
 
-import emitter from '../../../../components/xform/utils/emitter'
-import i18n from "../../../../components/xform/utils/i18n"
-import refMixin from "../../../../components/xform/form-render/refMixin"
-import ContainerItemWrapper from './container-item-wrapper'
-import containerItemMixin from "./containerItemMixin"
-import detailPaneWidget from "../../../../components/xform/form-render/container-item/detail-pane-item"
-import FieldComponents from '../../../../components/xform/form-designer/form-widget/field-widget/index'
-
-
-import {initWf} from '../../../../components/wf/wfUtil'
+import { initWf } from "../../../../components/wf/wfUtil";
 
 export default {
   name: "detail-item",
-  componentName: 'ContainerItem',
+  componentName: "ContainerItem",
   mixins: [emitter, i18n, refMixin, containerItemMixin],
   components: {
     ContainerItemWrapper,
@@ -82,35 +108,35 @@ export default {
   props: {
     widget: Object,
   },
-  inject: ['refList', 'sfRefList', 'globalModel', 'previewState'],
+  inject: ["refList", "sfRefList", "globalModel", "previewState"],
   created() {
-    this.initRefList()
+    this.initRefList();
     this.handleOnCreated();
   },
   mounted() {
     this.handleOnMounted();
     this.$nextTick(() => {
       this.createWf();
-    })
+    });
   },
   beforeDestroy() {
-    this.unregisterFromRefList()
+    this.unregisterFromRefList();
   },
   data() {
     return {
-      wfInfo: {}
-    }
+      wfInfo: {},
+    };
   },
   methods: {
     reload() {
-      this.getFormRef().$parent.$baseReload()
+      this.getFormRef().$parent.$baseReload();
     },
     saveData() {
-      if (!!this.previewState) return
+      if (!!this.previewState) return;
       this.getFormRef().saveForm();
     },
     createWf() {
-      if (!!this.previewState || !this.widget.options.wfEnabled) return
+      if (!!this.previewState || !this.widget.options.wfEnabled) return;
       let formTarget = this.getFormRef();
       let formData = formTarget.formData;
       if (formData && formData.object_foreign_id) {
@@ -120,17 +146,16 @@ export default {
           objId: formData.object_foreign_id, //单据ID
           wfCode: formCode, //流程编码
           showStartBtn: true, //是否放出启动按钮,流程已启动时此参数失效
-          serviceId: 'user',
-          callback: ({wfInfo}) => {
+          serviceId: "user",
+          callback: ({ wfInfo }) => {
             this.wfInfo = wfInfo;
-          }
-        }
+          },
+        };
         initWf.call(formTarget.$parent, option);
       }
-
-    }
+    },
   },
-}
+};
 </script>
 
 <style lang="scss" scoped>
@@ -148,11 +173,10 @@ export default {
     // min-height: 28px;
     height: 100%;
   }
-
 }
 
-.grid-container.selected, .grid-cell.selected {
+.grid-container.selected,
+.grid-cell.selected {
   outline: 2px solid $--color-primary !important;
 }
-
 </style>

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

@@ -1,6 +1,10 @@
 <template>
   <container-item-wrapper :widget="widget">
-    <div :key="widget.id" class="table-container" v-show="!widget.options.hidden">
+    <div
+      :key="widget.id"
+      class="table-container"
+      v-show="!widget.options.hidden"
+    >
       <table
         :ref="widget.id"
         class="table-layout table-d-box"
@@ -22,7 +26,10 @@
                 :row.sync="rowData"
               >
                 <!-- 递归传递插槽！！！ -->
-                <template v-for="slot in Object.keys($scopedSlots)" v-slot:[slot]="scope">
+                <template
+                  v-for="slot in Object.keys($scopedSlots)"
+                  v-slot:[slot]="scope"
+                >
                   <slot :name="slot" v-bind="scope" />
                 </template>
               </table-cell-item>
@@ -92,7 +99,7 @@ export default {
         1: "textarea",
         2: "date",
         3: "number",
-        4: "text"
+        4: "text",
       },
     };
   },
@@ -195,7 +202,9 @@ export default {
       let formScriptEnabled = this.widget.options.formScriptEnabled || false;
       let scriptCode = this.widget.options.formScriptCode;
       if (!scriptCode) return;
-      let accessParam = this.handleCustomEvent(this.widget.options.formScriptParam);
+      let accessParam = this.handleCustomEvent(
+        this.widget.options.formScriptParam
+      );
       return this.formHttp({
         scriptCode: scriptCode,
         data: {
@@ -209,6 +218,11 @@ export default {
         },
         success: (res) => {
           let rows = res.objx || [];
+          this.handleCustomEvent(
+            this.widget.options.formScriptSuccess,
+            ["res"],
+            [res]
+          );
           this.setValue(rows);
         },
       });
@@ -265,12 +279,12 @@ export default {
           f_field_value: "6",
         },
         {
-          f_field_name: "姓名",//显示名称
-          f_key: "name",//字段名
-          f_field_type: 4,//类型，0: "文本输入框",1: "多行输入框",2: "日期输入框",3: "数字输入框",4:"纯文本"
-          f_is_required: false,//是否必填
-          f_field_value: "张三",//字段值
-        }
+          f_field_name: "姓名", //显示名称
+          f_key: "name", //字段名
+          f_field_type: 4, //类型，0: "文本输入框",1: "多行输入框",2: "日期输入框",3: "数字输入框",4:"纯文本"
+          f_is_required: false, //是否必填
+          f_field_value: "张三", //字段值
+        },
       ];
       let a = 1;
       this.setValue(items);

package/src/components/xform/utils/smart-vue-i18n/index.js

@@ -1,5 +1,6 @@
 import {deepAssign, get} from './utils'
-import {extendDeeply} from "../../../../utils/index.js";
+import xeUtils from "xe-utils";
+import {extendDeeply} from "@base/utils/index.js";
 
 
 const install = (Vue, options) => {

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;