eoss-ui 0.5.81-beta2 → 0.5.81-beta21

package/packages/data-table/src/main.vue

@@ -6,12 +6,15 @@
     ref="component"
     v-loading="tableLoading"
     element-loading-background="rgba(0, 0, 0, 0.65)"
-    :model="tag === 'div' ? '' : datas"
+    :model="tag === 'div' ? '' : list"
     :element-loading-text="tableLoadingText"
   >
     <es-toolbar
       v-if="showToolbar"
       ref="toolbar"
+      :class="{
+        'es-table-toolbar-plus': mode == 'plus'
+      }"
       v-bind="{
         contents: toolbars,
         showLabel: showLabel,
@@ -35,7 +38,10 @@
     <div
       style="styles"
       class="es-data-table-content"
-      :class="border == 'none' ? 'es-table-border-none' : ''"
+      :class="{
+        'es-table-border-none': border == 'none',
+        'es-table-plus': mode == 'plus'
+      }"
       ref="esTableContent"
       v-if="show"
     >
@@ -57,7 +63,7 @@
           dragSort: dragSort,
           dragSortClass: dragSortIcon
         }"
-        :data.sync="datas"
+        :data.sync="list"
         v-on="{
           ...$listeners,
           'row-click': rowClick,
@@ -71,11 +77,6 @@
           (theadBorder && border != 'none' ? ' es-thead-border' : '')
         "
       >
-        <!-- <el-table-column v-if="dragSort" width="32" fixed>
-          <template slot-scope="scope">
-            <es-icon :contents="dragSortIcon"></es-icon>
-          </template>
-        </el-table-column> -->
         <slot name="prepend"></slot>
         <slot></slot>
         <template v-for="(item, index) in theads">
@@ -99,7 +100,9 @@
             <children
               v-else
               :key="item.label || item.title"
+              :tag="item.tag"
               v-bind="{
+                mode: mode,
                 name: name,
                 indexs: index,
                 form: form,
@@ -149,13 +152,15 @@
       </el-table>
       <div v-if="infiniteScroll" class="es-table-page es-loading-page">
         <span>共{{ config.totalCount }}条，</span>
-        <span>已加载{{ datas.length }}条</span>
+        <span>已加载{{ list.length }}条</span>
       </div>
       <es-pagination
         v-else-if="page"
+        ref="pagination"
         v-bind="config"
         class="es-table-page"
-        :style="{ 'text-align': page.position || 'center' }"
+        :position="page.position"
+        :style="{ 'text-align': page.position }"
         v-on="{
           change: sizeChange,
           current: currentChange,
@@ -166,7 +171,7 @@
       <slot name="dialog"></slot>
       <slot name="other"></slot>
     </div>
-    <sizer ref="sizer" :data="theads"></sizer>
+    <sizer ref="sizer" :data="theads" :mode="mode"></sizer>
   </component>
 </template>
 <script>
@@ -177,6 +182,8 @@ import sizer from './sizer.vue';
 import util from 'eoss-ui/src/utils/util';
 import bus from 'eoss-ui/src/utils/bus';
 import qs from 'qs';
+const dataTableMode =
+  util.win.top.dataTableMode || util.win.dataTableMode || 'default';
 export default {
   name: 'EsDataTable',
   inheritAttrs: false,
@@ -202,6 +209,10 @@ export default {
     }
   },
   props: {
+    mode: {
+      type: String,
+      default: dataTableMode
+    },
     service: String,
     loading: {
       type: Boolean,
@@ -449,7 +460,11 @@ export default {
       config: {
         pageNum: 1,
         pageSize: 20,
-        totalCount: 0
+        totalCount: 0,
+        layout:
+          this.mode == 'plus'
+            ? 'total, sizes, prev, pager, next, jumper'
+            : undefined
       },
       searchWhere: {},
       advanceWhere: {},
@@ -582,6 +597,11 @@ export default {
         return this.data;
       },
       set(val) {
+        if (this.list && this.list.length) {
+          this.$nextTick(() => {
+            this.list = val;
+          });
+        }
         this.$emit('update:data', val);
         return val;
       }
@@ -646,18 +666,12 @@ export default {
       this.resetHeight();
       this.doLayout();
     },
-    // data: {
-    //   deep: true,
-    //   handler(val) {
-    //     if (
-    //       this.page &&
-    //       typeof this.page === 'object' &&
-    //       !Object.prototype.hasOwnProperty.call(this.page, 'totalCount')
-    //     ) {
-    //       this.config.totalCount = val.length - this.lose;
-    //     }
-    //   }
-    // },
+    data: {
+      deep: true,
+      handler() {
+        this.list = this.setData();
+      }
+    },
     page() {
       this.resetHeight();
       this.doLayout();
@@ -676,7 +690,7 @@ export default {
       }
     },
     zoom: {
-      handler(val) {
+      handler() {
         if (
           this.tableHeight != 'auto' &&
           this.tableHeight !== false &&
@@ -688,7 +702,7 @@ export default {
       }
     },
     checked(newVal) {
-      this.datas.length && this.checkSelect(newVal);
+      this.list.length && this.checkSelect(newVal);
     },
     thead: {
       deep: true,
@@ -708,7 +722,7 @@ export default {
     },
     param: {
       deep: true,
-      handler(val) {
+      handler() {
         this.getTableData();
       }
     },
@@ -718,12 +732,6 @@ export default {
       handler(val) {
         if (typeof val === 'object') {
           this.config = util.extend({}, this.config, val);
-        } else {
-          this.config = {
-            pageNum: 1,
-            pageSize: 20,
-            totalCount: 0
-          };
         }
       }
     },
@@ -732,6 +740,7 @@ export default {
         this.$refs.oaTable &&
           this.$refs.oaTable.resetScroll &&
           this.$refs.oaTable.resetScroll(0, 0);
+        this.list = this.setData();
       }
     },
     height: {
@@ -770,10 +779,36 @@ export default {
     this.chekOpenTotalArea();
   },
   mounted() {
-    this.datas.length && this.checkSelect(this.checked);
+    if (this.data.length) {
+      this.list = this.setData();
+    }
+    this.list.length && this.checkSelect(this.checked);
     this.resetHeight();
+    if (util.win.top != util.win.self) {
+      util.win.onresize = debounce(500, this.resetHeight);
+    }
   },
   methods: {
+    setData() {
+      if (
+        this.page &&
+        ((typeof this.page === 'object' &&
+          (!Object.prototype.hasOwnProperty.call(this.page, 'totalCount') ||
+            this.page.totalCount == 0)) ||
+          this.page === true)
+      ) {
+        this.config.totalCount = this.data.length - this.lose;
+      }
+      if (this.page && this.data.length > this.config.pageSize) {
+        return this.data.filter((item, index) => {
+          return (
+            index > (this.config.pageNum - 1) * this.config.pageSize - 1 &&
+            index < this.config.pageNum * this.config.pageSize
+          );
+        });
+      }
+      return this.data;
+    },
     getRequestKey(config) {
       const { method, url, params, data } = config;
       return [method, url, qs.stringify(params), qs.stringify(data)].join('&');
@@ -951,7 +986,7 @@ export default {
             if (util.isObject(row)) {
               this.$refs.oaTable.toggleRowSelection(row, true);
             } else
-              this.datas.forEach((item) => {
+              this.list.forEach((item) => {
                 if (item[this.checkedKey] === row) {
                   this.$refs.oaTable.toggleRowSelection(item, true);
                   return;
@@ -982,6 +1017,7 @@ export default {
               this.list = results.data || results.records || [];
               this.config.totalCount =
                 results.count || results.total || results.totalCount;
+              this.config.pageCount = results.pageCount;
               this.getOptions(this.theadData);
             }
           } else {
@@ -1070,6 +1106,7 @@ export default {
             }
             this.config.totalCount =
               results.count || results.total || results.totalCount;
+            this.config.pageCount = results.pageCount;
             this.checked &&
               this.$nextTick(() => {
                 this.checkSelect(this.checked);
@@ -1129,14 +1166,14 @@ export default {
       this.$refs.oaTable.sort(prop, order);
     },
     formBlur(data) {
-      this.$emit('blur', data, this.datas);
+      this.$emit('blur', data, this.list);
     },
     formFocus(data) {
-      this.$emit('focus', data, this.datas);
+      this.$emit('focus', data, this.list);
     },
     formChange(data) {
-      this.$emit('edit', data, this.datas);
-      this.$emit('change', data, this.datas);
+      this.$emit('edit', data, this.list);
+      this.$emit('change', data, this.list);
     },
     handleAjax(handle, row) {
       this.changeLoading(true, `${handle.text}中...`);
@@ -1291,7 +1328,7 @@ export default {
           handle.event({
             ele: this,
             thead: thead,
-            data: this.datas,
+            data: this.list,
             selected: rows,
             ...res
           });
@@ -1394,13 +1431,13 @@ export default {
           });
           util.exportXls({
             thead: thead,
-            data: this.datas,
+            data: this.list,
             name: this.fileName,
             option: this.optionDatas
           });
         }
-        this.$emit('btnClick', res, this.datas, thead, rows);
-        this.$emit('btn-click', res, this.datas, thead, rows);
+        this.$emit('btnClick', res, this.list, thead, rows);
+        this.$emit('btn-click', res, this.list, thead, rows);
       }
     },
     sizeChange(res) {
@@ -1513,8 +1550,11 @@ export default {
                   parseInt(util.getStyle(ele, 'margin-bottom'), 10);
               }
             }
-            height -= this.showToolbar ? 45 : 0;
-            height -= this.page === false ? 0 : 46;
+            height -= this.showToolbar
+              ? this.$refs.toolbar.$el.offsetHeight
+              : 0;
+            height -=
+              this.page === false ? 0 : this.$refs.pagination.$el.offsetHeight;
             height -= this.title ? this.$refs.title.offsetHeight : 0;
             height -= parseInt(
               util.getStyle(this.$refs.esTableContent, 'padding-top'),

package/packages/data-table/src/sizer.vue

@@ -7,6 +7,7 @@
       row-key="id"
       default-expand-all
       height="500px"
+      :mode="mode"
       :data="theads"
       :thead="thead"
       :tree-props="{ children: 'childHead' }"
@@ -26,6 +27,7 @@ import util from 'eoss-ui/src/utils/util';
 export default {
   name: 'Sizer',
   props: {
+    mode: String,
     data: Array
   },
   computed: {

package/packages/dialog/src/main.vue

@@ -3,8 +3,8 @@
     class="es-dialog"
     :title="titles"
     :visible.sync="show"
-    :width="wd"
-    :height="ht"
+    :width="_width"
+    :height="_height"
     :close-on-click-modal="shadeClose"
     :showScale="showScale"
     :drag="drag"
@@ -264,6 +264,10 @@ import WujieVue from 'wujie-vue2';
 import util from 'eoss-ui/src/utils/util';
 import mbus from 'eoss-ui/src/utils/bus';
 const { bus } = WujieVue;
+let availWidth = 0;
+let availHeight = 0;
+availWidth = util.win.top.document.body.offsetWidth - 260;
+availHeight = util.win.top.document.body.offsetHeight - 60;
 export default {
   name: 'EsDialog',
   inheritAttrs: false,
@@ -344,6 +348,12 @@ export default {
   computed: {
     wujieName() {
       return this.name ? this.name : util.uuid(16);
+    },
+    _width() {
+      return this.width ? this.width : this.sizes[this.size]['width'];
+    },
+    _height() {
+      return this.height ? this.height : this.sizes[this.size]['height'];
     }
   },
   watch: {
@@ -363,36 +373,20 @@ export default {
       full: false,
       method: 'router',
       sizes: {
-        sm: { width: '900px', height: '400px' },
-        md: { width: '900px', height: '600px' },
-        lg: { width: '900px', height: '800px' },
+        mini: { width: '800px', height: '400px' },
+        sm: { width: '960px', height: '500px' },
+        md: { width: '1060px', height: '600px' },
+        lg: { width: '1200px', height: '800px' },
+        max: { width: `${availWidth}px`, height: `${availHeight}px` },
         full: { width: '100%', height: '100%' }
       },
       show: this.visible,
       defaultProps: {},
-      wd: '',
-      ht: '',
       zoom: 1,
       scales: { zoom: 1 }
     };
   },
   created() {
-    let availWidth = 0;
-    let availHeight = 0;
-    availWidth = util.win.top.document.body.offsetWidth - 260;
-    availHeight = util.win.top.document.body.offsetHeight - 60;
-    this.sizes.max = { width: `${availWidth}px`, height: `${availHeight}px` };
-    if (
-      this.size === 'full' ||
-      (this.width == '100%' && this.height == '100%')
-    ) {
-      this.full = true;
-      this.wd = '100%';
-      this.ht = '100%';
-    } else {
-      this.wd = this.width ? this.width : this.sizes[this.size]['width'];
-      this.ht = this.height ? this.height : this.sizes[this.size]['height'];
-    }
     if (this.busEvent) {
       mbus.$on(this.busEvent, async (res) => {
         this.titles = res.title;

package/packages/flow/src/main.vue

@@ -9,6 +9,7 @@
       <div class="es-flow-title">
         <span v-show="!shrink">当前节点：{{ isFlow ? '拟稿' : NodeName }}</span>
         <es-button
+          v-if="showShrink"
           size="medium"
           class="es-icon"
           :icon="shrink ? 'es-icon-indent' : 'es-icon-increase'"
@@ -117,6 +118,17 @@
                 @change="changeSelectUser($event, 'addSignUserId', true)"
               />
             </el-form-item>
+            <el-form-item
+              prop="addSignMode"
+              v-if="isCanPreAddSign"
+              label="加签模式"
+              :rules="[{ required: true, trigger: 'blur' }]"
+            >
+              <el-radio-group v-model="nextNode.addSignMode">
+                <el-radio label="preAddSign">前置加签</el-radio>
+                <el-radio label="postAddSign">后置加签</el-radio>
+              </el-radio-group>
+            </el-form-item>
           </div>
           <!-- 加签结束 -->
           <!-- 减签开始 -->
@@ -400,12 +412,10 @@
           <div
             v-show="showNews"
             style="
-               {
-                border: 1px solid #ccc;
-                padding: 5px;
-                border-radius: 5px;
-                font-size: 13px;
-              }
+              border: 1px solid #ccc;
+              padding: 5px;
+              border-radius: 5px;
+              font-size: 13px;
             "
           >
             {{ nextNode.notificationMsg }}
@@ -708,6 +718,7 @@ export default {
     Preset
   },
   props: {
+    showShrink: { type: Boolean, default: true },
     isStartFlow: { type: Boolean, default: false },
     businessId: { type: String, default: '' },
     pendingId: { type: String, default: '' },
@@ -740,6 +751,7 @@ export default {
     return {
       styles: {},
       userModel: {},
+      isCanPreAddSign: false,
       nextOtherOrgObjSelect: [],
       subProcessColumns: [],
       nextCurrentOrgObjSelect: [],
@@ -860,6 +872,7 @@ export default {
       presetReadUserId: [],
       nextNode: {
         nextNodeId: '', // 下步节点
+        addSignMode: 'postAddSign',
         isAddSign: '', // 是否加签
         isRemoveSign: '', // 是否减签
         nextOperate: '', // 下步操作
@@ -1332,8 +1345,8 @@ export default {
     rejectBtn() {
       if (this.value === '') this.value = this.nodeDefaultRejectOpinion;
       if (!this.value) {
-              if(!this.$refs.commonOpinions.validate()) return
-            }
+        if (!this.$refs.commonOpinions.validate()) return;
+      }
       if (this.beforeSubmit != undefined) {
         this.beforeSubmit(0)
           .then((next) => {
@@ -1341,7 +1354,6 @@ export default {
           })
           .catch((e) => {});
       } else {
-        
         this.showReject = true;
       }
     },
@@ -1643,11 +1655,10 @@ export default {
      * @date 2022年9月29日
      **/
     rejectAndEnd(res) {
-      if (this.isOpinionRequired == 1 && (this.value == '' || !this.value)){
-            if(!this.$refs.commonOpinions.validate()) return
-          }
+      if (this.isOpinionRequired == 1 && (this.value == '' || !this.value)) {
+        if (!this.$refs.commonOpinions.validate()) return;
+      }
       if (this.beforeSubmit != undefined) {
-        
         this.beforeSubmit()
           .then((next) => {
             this.saveRejectAndEnd(res);
@@ -1660,7 +1671,6 @@ export default {
     saveRejectAndEnd(res) {
       this.$confirm('确认' + res.value + '?')
         .then(() => {
-          
           // return this.$message.warning('请填写意见');
           let params = {
             url: rejectAndEnd,
@@ -1783,7 +1793,7 @@ export default {
                 this.isHideOtherOrg = false;
                 this.isNodeShowProcess = false;
                 this.isMainSubProcess = false;
-                this.isNextUser =this.nextNode.nextOperate != 9 ;
+                this.isNextUser = this.nextNode.nextOperate != 9;
                 // this.isMainSubProcess === true
                 //   ? (this.isMainSubProcess = true)
                 //   : (this.isMainSubProcess = false);
@@ -1960,7 +1970,7 @@ export default {
         return;
       } else {
       }
-     
+
       if (isDef !== true) this.getNodeInfo();
     },
     /**
@@ -2041,13 +2051,15 @@ export default {
                 isSpecial,
                 canPresetRead,
                 isCdjxjTaskHandle,
-                taskButtonList
+                taskButtonList,
+                isCanPreAddSign
               }
             } = res;
             this.$emit('startTaskRead', res);
             this.$emit('start-task-read', res);
             this.currentOrgName = currentOrgName;
             this.otherOrgName = otherOrgName;
+            this.isCanPreAddSign = isCanPreAddSign;
             this.endFlowInfo.choiceOrgId = choiceOrgId;
             this.endFlowInfo.choiceDeptId = choiceDeptId;
             this.endFlowInfo.pendingId = this.pendingId;
@@ -2514,6 +2526,9 @@ export default {
           notificationType = this.nextNode.notificationType.join(',');
           addSignUserId = addSignUserId.join(',');
           removeSignUserId = removeSignUserId.join(',');
+          if (!this.isCanPreAddSign) {
+            delete this.nextNode.addSignMode;
+          }
           let params = {
             ...this.nextNode,
             pendingId: this.pendingId,

package/packages/flow-group/src/main.vue

@@ -11,7 +11,7 @@
         <template v-for="(items, indexs) in tabs">
           <el-tab-pane
             v-if="handleHide(items.hide)"
-            :key="indexs"
+            :key="items.id || indexs"
             :immediate="items.label === '流程图' ? false : items.immediate"
             :name="String(indexs)"
             :class="{ 'es-flex-vertical': items.average }"
@@ -32,9 +32,9 @@
                     :value="items.title.count"
                     :color="items.title.color"
                     :max="99"
-                  >
+                    >{{ items.title.text }}
                   </el-badge>
-                  <template v-if>{{ items.title.text }}</template>
+                  <template v-else>{{ items.title.text }}</template>
                 </template>
                 <template v-else>{{ items.title }}</template>
               </template>
@@ -279,11 +279,12 @@
                       >
                       </es-dialog>
                       <component
-                        v-if="item.component"
-                        :is="item.type"
+                        v-if="item.component || item.type == 'component'"
+                        :is="item.is || item.name || item.type"
                         v-bind="
                           handleExclAttribute({
-                            data: item
+                            data: item,
+                            attrs: ['is', 'type']
                           })
                         "
                       ></component>
@@ -292,11 +293,12 @@
                 </template>
                 <template v-else>
                   <component
-                    v-if="contents.component"
-                    :is="contents.type"
+                    v-if="contents.component || contents.type == 'component'"
+                    :is="contents.is || contents.name || contents.type"
                     v-bind="
                       handleExclAttribute({
-                        data: contents
+                        data: contents,
+                        attrs: ['is', 'type']
                       })
                     "
                   ></component>
@@ -426,7 +428,7 @@
       class="es-group-flow"
       v-bind="_flow"
       :width="width"
-      :before-submit="handleSubmit"
+      :before-submit="isSubmit ? handleSubmit : undefined"
       :businessId="businessId"
       @startTaskRead="handleTaskRead"
       @success="handleSuccess"
@@ -482,7 +484,11 @@ export default {
       type: String,
       default: '360px'
     },
-    refs: String
+    refs: String,
+    isSubmit: {
+      type: Boolean,
+      default: true
+    }
   },
   data() {
     return {
@@ -635,6 +641,7 @@ export default {
       if (Array.isArray(esFlowForm)) {
         esFlowForm = esFlowForm[0];
       }
+      esFlowForm;
       this.showMsg = res == 1 ? false : true;
       return esFlowForm.submitData(undefined, false, {}, res);
     },