eoss-ui 0.5.81-beta9 → 0.5.82

package/packages/date-picker/src/main.vue

@@ -144,21 +144,29 @@ export default {
   mounted() {},
   methods: {
     getData(val) {
-      if (typeof val === 'number') {
-        return this.dateFormat(val);
-      }
-      if (Array.isArray(val)) {
-        val
-          .map((item) => {
-            if (typeof item === 'string') {
-              return item;
-            } else if (typeof item === 'number') {
-              return this.dateFormat(item);
-            }
-          })
-          .join(this.rangeSeparator);
+      if (val) {
+        if (
+          typeof val === 'number' ||
+          (typeof val === 'string' && this.format)
+        ) {
+          return this.dateFormat(val);
+        }
+        if (Array.isArray(val)) {
+          val
+            .map((item) => {
+              if (item) {
+                return typeof item === 'number' ||
+                  (typeof item === 'string' && this.format)
+                  ? this.dateFormat(item)
+                  : item;
+              }
+              return '';
+            })
+            .join(this.rangeSeparator);
+        }
+        return val;
       }
-      return val;
+      return '';
     },
     dateFormat(date) {
       let newDate = '';

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.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.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);
     },

package/packages/form/src/main.vue

@@ -192,14 +192,14 @@
                 <template v-else>
                   <template v-for="item in items.contents">
                     <div
-                      v-if="item.type === 'caption'"
+                      v-if="item.type === 'caption' && !item.hide"
                       class="es-form-item-caption"
                       :key="item.name"
                     >
                       {{ item.text }}
                     </div>
                     <el-form-item
-                      v-else-if="!item.hide"
+                      v-else-if="!item.hide && !hides.includes(item.name)"
                       ref="es-form-pane"
                       :key="item.name"
                       :label-width="
@@ -1187,14 +1187,14 @@
             <template v-else>
               <template v-for="item in formContent">
                 <div
-                  v-if="item.type === 'caption'"
+                  v-if="item.type === 'caption' && !item.hide"
                   class="es-form-item-caption"
                   :key="item.name"
                 >
                   {{ item.text }}
                 </div>
                 <el-form-item
-                  v-else-if="!item.hide"
+                  v-else-if="!item.hide && !hides.includes(item.name)"
                   ref="es-form-pane"
                   :key="item.name"
                   :label-width="
@@ -2197,14 +2197,14 @@
               <template v-else>
                 <template v-for="item in items.contents">
                   <div
-                    v-if="item.type === 'caption'"
+                    v-if="item.type === 'caption' && !item.hide"
                     class="es-form-item-caption"
                     :key="item.name"
                   >
                     {{ item.text }}
                   </div>
                   <el-form-item
-                    v-else-if="!item.hide"
+                    v-else-if="!item.hide && !hides.includes(item.name)"
                     ref="es-form-pane"
                     :key="item.name"
                     :label-width="
@@ -3146,14 +3146,14 @@
           <template v-else>
             <template v-for="item in formContent">
               <div
-                v-if="item.type === 'caption'"
+                v-if="item.type === 'caption' && !item.hide"
                 class="es-form-item-caption"
                 :key="item.name"
               >
                 {{ item.text }}
               </div>
               <el-form-item
-                v-else-if="!item.hide"
+                v-else-if="!item.hide && !hides.includes(item.name)"
                 ref="es-form-pane"
                 :key="item.name"
                 :label-width="
@@ -4071,6 +4071,12 @@ export default {
     }
   },
   props: {
+    hides: {
+      type: Array,
+      default() {
+        return [];
+      }
+    },
     model: {
       type: [Object, String]
     },
@@ -4223,7 +4229,8 @@ export default {
         return {};
       }
     },
-    active: Array
+    active: Array,
+    resetActive: Boolean
   },
   data() {
     return {
@@ -4448,7 +4455,11 @@ export default {
               }
             });
             if (!this.active || (this.active && !this.active.length)) {
-              this.activeNames = names;
+              if (this.resetActive) {
+                this.activeNames = names;
+              } else if (this.activeNames.length == 0) {
+                this.activeNames = names;
+              }
             }
             this.content = contents;
             if (this.content.length === 1) {

package/packages/handle-user/src/main.vue

@@ -14,8 +14,9 @@
         <el-dropdown
           trigger="click"
           v-else
-          @command="handleChange"
           placement="bottom-start"
+          @command="handleChange"
+          @visible-change="handleVisibleChange"
         >
           <div class="es-user-job es-pointer" :title="job.name">
             {{ job.name }}<i class="es-icon-tri-down"></i>
@@ -124,6 +125,9 @@ export default {
           });
         this.$emit('change', item);
       }
+    },
+    handleVisibleChange(res) {
+      this.$emit('visible-change', res);
     }
   }
 };

package/packages/handler/src/main.vue

@@ -12,6 +12,7 @@
         :data="item"
         :userModel="userModel"
         :job-scrollbar="jobScrollbar"
+        @visible-change="handleVisibleChange"
         @click="handleClick"
         @change="handleChange"
       ></es-handle-user>
@@ -22,7 +23,7 @@
             >当前<span
               class="es-online-num"
               :class="{ 'es-pointer': onlineList }"
-              @click="onlineList ? handleClick({ type: 'online' }) : ''"
+              @click.stop="onlineList ? handleClick({ type: 'online' }) : ''"
               >{{ online }}</span
             >人在线</span
           >
@@ -92,7 +93,7 @@
           class="es-handler-icon"
           :title="item.title"
           :class="item.icon"
-          @click="handleClick(item)"
+          @click.stop="handleClick(item)"
         ></div>
       </el-badge>
       <div
@@ -100,7 +101,7 @@
         class="es-handler-icon"
         :title="item.title"
         :class="item.icon"
-        @click="handleClick(item)"
+        @click.stop="handleClick(item)"
       ></div>
     </li>
   </ul>
@@ -362,6 +363,9 @@ export default {
             });
         })
         .catch((e) => {});
+    },
+    handleVisibleChange(res) {
+      this.$emit('visible-change', res);
     }
   }
 };

package/packages/login/src/main.vue

@@ -328,13 +328,17 @@
       >
     </div>
     <es-dialog
-      v-if="showResetPassword"
       title="修改密码"
       width="680px"
       height="auto"
       :visible.sync="showResetPassword"
     >
-      <slot name="user" :secret="secret" :is-encrypt="isEncrypt">
+      <slot
+        name="user"
+        :secret="secret"
+        :is-encrypt="isEncrypt"
+        v-if="showResetPassword"
+      >
         <reset-password
           :secret="secret"
           :is-encrypt="isEncrypt"
@@ -352,7 +356,7 @@
       custom-class="es-clients-dialog"
       :visible.sync="showDownLoadApp"
     >
-      <es-clients :downloads="download"></es-clients>
+      <es-clients :downloads="download" :showTips="showIosTips"></es-clients>
     </es-dialog>
     <slot name="calogin"></slot>
     <es-dialog
@@ -588,7 +592,8 @@ export default {
       type: Number,
       default: 1500
     },
-    isScale: Boolean
+    isScale: Boolean,
+    showIosTips: Boolean
   },
   computed: {
     transform() {
@@ -730,17 +735,19 @@ export default {
         localStorage.removeItem('unpd');
         //localStorage.removeItem('remember');
       }
-    },
-    secret: {
-      immediate: true,
-      handler(val) {
-        if (val) {
-          if (this.storage) {
-            localStorage.setItem('storage', this.storage);
-          }
-        }
-      }
     }
+    // secret: {
+    //   immediate: true,
+    //   handler(val) {
+    //     if (val) {
+    //       if (this.storage) {
+    //         localStorage.setItem('secret', val);
+    //       } else {
+    //         sessionStorage.setItem('secret', val);
+    //       }
+    //     }
+    //   }
+    // }
   },
   data() {
     return {
@@ -826,7 +833,7 @@ export default {
   },
   mounted() {
     this.getRemember();
-    delete util.win.websocket;
+    //delete util.win.websocket;
   },
   methods: {
     init() {