eoss-ui 0.6.69 → 0.6.71

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.6.69",
+  "version": "0.6.71",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [

package/packages/calogin/src/main.vue

@@ -41,7 +41,9 @@ export default {
       type: Array,
       default: () => []
     },
-    success: Function
+    success: Function,
+    // 是否显示证书选择框，默认为true
+    showSelect: Boolean
   },
   data() {
     return {
@@ -56,7 +58,7 @@ export default {
   computed: {
     param() {
       // 生成不重复的 DLL 名称列表
-      const dllnames = [...new Set(this.dllnames.concat(this.dllname))];
+      const dllnames = Array.from(new Set(this.dllnames.concat(this.dllname)));
 
       return `<?xml version="1.0" encoding="utf-8"?>
       <authinfo>
@@ -104,12 +106,12 @@ export default {
           } catch (e) {
             if (this.installPath) {
               this.$confirm('未安装控件，请进行安装控件！', '控件下载', {
-                confirmButtonText: '确定',
+                confirmButtonText: '下载',
                 cancelButtonText: '取消',
                 type: 'warning'
               })
                 .then(() => {
-                  window.open(this.installPath);
+                  util.downloadFile(this.installPath);
                 })
                 .catch(() => {});
             } else {
@@ -126,8 +128,8 @@ export default {
             caPlugin.clearFilter();
             // 初始化vctk控件
             caPlugin.initialize('', this.param);
-            // 控制证书为一个时，不弹出证书选择框
-            caPlugin.setChooseSingleCert(1);
+            // 控制证书为一个时,并且不显示选择框时，不弹出证书选择框
+            !this.showSelect && caPlugin.setChooseSingleCert(1);
 
             // 生成签名信息
             this.signedData = caPlugin.p7SignString(
@@ -184,8 +186,8 @@ export default {
                 return;
               }
               const userList = retValue.split('&&&');
-              if (userList.length === 1) {
-                //如果只有一个证书，直接获取证书信息
+              if (userList.length === 1 && !this.showSelect) {
+                //如果只有一个证书,并且不显示选择框时，直接获取证书信息
                 this.certId = userList[0].split('||')[1];
                 this.getCertInfo(this.certId);
               } else {
@@ -216,13 +218,13 @@ export default {
                   '请检查是否安装并启用证书助手控件！',
                   '控件下载',
                   {
-                    confirmButtonText: '确定',
+                    confirmButtonText: '下载',
                     cancelButtonText: '取消',
                     type: 'warning'
                   }
                 )
                   .then(() => {
-                    window.open(this.installPath);
+                    util.downloadFile(this.installPath);
                   })
                   .catch(() => {});
               } else {

package/packages/flow/src/component/Circulate.vue

@@ -144,6 +144,7 @@ export default {
       isOpinionRequired: 0,
       otherParams: { filid: 'other' },
       loading: false,
+      subLoading:null,
       userModel:{}
     };
   },
@@ -224,13 +225,19 @@ export default {
       if(!this.showBtn){
         param.data.pendingId = this.pendingId;
         delete param.data.processDefinitionId;
+        this.subLoading = util.loading(this.$loading, '加载中...');
+      }else{
+        this.loading = true;
       }
-      this.loading = true;
       util
         .ajax(param)
         .then((res) => {
           const { message, status,rCode } = res;
-          this.loading = false;
+          if(!this.showBtn){
+             this.subLoading.close();
+          }else{
+            this.loading = false;
+          }
           if (status == 'success' || rCode == 0) {
             this.simpleTips && this.$message.success('提交成功');
             this.quit(true);

package/packages/flow/src/component/taskUnionExamine.vue

@@ -65,6 +65,7 @@
           :multiple="newMultiple"
           @change="changeSelectUser($event, 'nextOtherOrgObj')"
           :mix="otherMix"
+          :disableds="otherOrgDisabledObjId"
           :types="
             foreignOrgTabs.length > 0
               ? foreignOrgTabs
@@ -184,6 +185,7 @@ export default {
       foreignOrgTabsParam: {},
       currentOrgTabsParam: {},
       currentOrgProcessKey: '',
+      otherOrgDisabledObjId:[],
       isSubFlow: true,
       choiceDeptId: '',
       choiceOrgId: '',
@@ -321,6 +323,7 @@ export default {
                 readOnlyNotificationType,
                 notificationMessageReadOnly,
                 unionDispatchOrgId,
+                otherOrgDisabledObjId,
                 orgNames,
                 nodeInfoMap: {
                   nodeExtAttr: {
@@ -332,6 +335,11 @@ export default {
                 }
               }
             } = res;
+            console.log(otherOrgDisabledObjId,'otherOrgDisabledObjId')
+            if(otherOrgDisabledObjId){
+              this.otherOrgDisabledObjId = otherOrgDisabledObjId.split(',')
+              console.log( this.otherOrgDisabledObjId,otherOrgDisabledObjId.split(','))
+            }
             if (res.data.customizedConfig) {
               if (res.data.customizedConfig.currentOrgSelectorCustomized) {
                 this.currentMix =

package/packages/flow/src/main.vue

@@ -6,6 +6,34 @@
     v-if="!shrinkAbled"
   >
     <div v-if="showCirculate">
+      <div class="es-flow-top">
+        <div class="es-flow-title">
+          <span v-show="!shrink"
+            >当前节点：{{ isFlow ? nodeName || '拟稿' : NodeName }}</span
+          >
+          <es-button
+            v-if="showShrink"
+            size="medium"
+            class="es-icon"
+            :icon="shrink ? 'es-icon-indent' : 'es-icon-increase'"
+            @click="setShrink"
+          ></es-button>
+        </div>
+        <div class="es-opinion" v-show="!shrink">
+          <span class="es-eidt-title" :style="`${!isFlow ? 'color:red' : ''}`"
+            >填写意见</span
+          >
+          <!-- <span
+            v-show="!isFlow && newTypeCode != 'fenyue'"
+            class="es-opinion-file"
+            @click="showFileList = true"
+            ><i class="es-icon-fujian"></i>意见附件<span
+              class="es-file-num"
+              v-show="fileNum > 0"
+              >({{ fileNum }})</span
+            ></span> -->
+        </div>
+      </div>
       <CommonOpinions
         class="es-common-opinions"
         v-show="!shrink"
@@ -18,10 +46,11 @@
         :nodeFixedOpinionSelectList="nodeFixedOpinionSelectList"
       />
       <el-form ref="form" :model="circulateForm" label-width="120px">
-        <el-form-item prop="nextNodeId" label="下步节点">
+        <el-form-item style="margin-top:20px" prop="nextNodeId" label="下步节点">
           <el-select
             v-if="nextNodeCheckType == 'select'"
             v-model="circulateForm.nextNodeId"
+            style="width: 100% !important;"
             :placeholder="`请选择下步节点`"
           >
             <el-option label="传阅" value="111"></el-option>
@@ -37,7 +66,7 @@
       </el-form>
       <circulate
         style="margin-top: 10px"
-        :businessId="businessId"
+        :businessId="businessIds"
         ref="circulate"
         :selectorParams="params"
         :pending-id="pendingId"
@@ -312,6 +341,7 @@
                 ]"
               >
                 <el-select
+                v-if="nextOperateCheckType == 'select'"
                   v-model="nextNode.nextOperate"
                   :placeholder="`请选择下步操作`"
                   :disabled="operationList && operationList.length == 1"
@@ -324,6 +354,14 @@
                     :value="items.key"
                   ></el-option>
                 </el-select>
+                <es-radio-group
+                    v-else-if="nextOperateCheckType == 'radio'"
+                    v-model="nextNode.nextOperate"
+                    :data="operationList"
+                     @change="selecNext($event, true)"
+                    value-key="key"
+                    label-key="value"
+                  ></es-radio-group>
               </el-form-item>
               <div>
                 <el-form-item
@@ -1054,7 +1092,7 @@ export default {
     return {
       styles: {},
       optionsKey: 0,
-      showCirculate: false,
+      showCirculate: undefined,
       circulateForm: { nextNodeId: '111' },
       userModel: {},
       simpleTips: true,
@@ -1067,6 +1105,7 @@ export default {
       showCustomLimitTimeText: false,
       currentOrgDisabledObjId: [],
       nextNodeCheckType: 'select',
+      nextOperateCheckType:'select',
       readOnlyNotificationType: '',
       circularReadParamsMap: { circularReadOrgRoleCode: '' },
       taskParams: {},
@@ -1242,15 +1281,17 @@ export default {
   mounted() {
     this.businessIds = this.businessId;
     this.nextNode.nextNodeId = this.nextNodeId;
-    this.getInfo();
+    if(!this.isFlow){
+      this.getInfo();
+    }
   },
   watch: {
     isCirculate: {
       handler(val) {
-        this.showCirculate = val;
-        if (!val) {
+        if (!val && this.showCirculate != undefined) {
           this.getInfo();
         }
+        this.showCirculate = val;
       },
       deep: true,
       immediate: true
@@ -2589,6 +2630,7 @@ export default {
                 circularReadParamsMap,
                 isPreset,
                 choiceOrgId,
+                nextOperateCheckType,
                 choiceDeptId,
                 readOnlyNotificationType,
                 notificationMessageReadOnly,
@@ -2618,7 +2660,8 @@ export default {
             this.$emit('startTaskRead', res);
             this.$emit('start-task-read', res);
             this.circularReadParamsMap = circularReadParamsMap || {};
-            this.currentOrgName = currentOrgName;
+            this.currentOrgName = 
+            this.nextOperateCheckType = nextOperateCheckType;
             this.currentNodeIsCircularReadNode =
               nodeInfoMap.nodeExtAttr.currentNodeIsCircularReadNode == 1;
             this.readOnlyNotificationType = readOnlyNotificationType;

package/packages/login/src/main.vue

@@ -18,6 +18,7 @@
     </div>
     <img v-if="loginLogoImg" class="es-login-logo" :src="loginLogoImg" />
     <slot></slot>
+    <slot name="warning" :contents="warningText"></slot>
     <div
       class="es-login"
       v-loading.fullscreen.lock="submit"
@@ -49,28 +50,28 @@
             'es-login-model': modelLength == 2 || mode == 'complex'
           }"
         >
-          <template
-            v-if="this.mode == 'complex' && loginModel.indexOf('3') > -1"
-          >
-            <template v-for="item in switchs">
-              <div
-                v-if="item.tips"
-                v-show="switchActive != item.type"
-                class="es-login-model-tips"
-                :key="item.type + '_0'"
-                :style="getBackground(item.background)"
-              >
-                {{ item.tips }}
-              </div>
-              <span
-                v-show="switchActive != item.type"
-                class="es-icon-box"
-                @click="switchLoginType(item)"
-                :title="modelLength > 2 ? item.name : ''"
-                :key="item.type + '_1'"
-              >
-                <i :class="[item.icon, 'es-icon']"></i>
-              </span>
+          <template v-if="this.mode == 'complex'">
+            <template v-if="loginModel.indexOf('3') > -1">
+              <template v-for="item in switchs">
+                <div
+                  v-if="item.tips"
+                  v-show="switchActive != item.type"
+                  class="es-login-model-tips"
+                  :key="item.type + '_0'"
+                  :style="getBackground(item.background)"
+                >
+                  {{ item.tips }}
+                </div>
+                <span
+                  v-show="switchActive != item.type"
+                  class="es-icon-box"
+                  @click="switchLoginType(item)"
+                  :title="modelLength > 2 ? item.name : ''"
+                  :key="item.type + '_1'"
+                >
+                  <i :class="[item.icon, 'es-icon']"></i>
+                </span>
+              </template>
             </template>
           </template>
           <template v-else>
@@ -391,8 +392,8 @@
               >初次使用请下载一键安装包</span
             >
           </div>
-          <div class="es-warning" v-if="warnInfo">
-            {{ warnInfo }}
+          <div class="es-warning" v-if="showWarnInfo">
+            {{ warningText }}
           </div>
         </div>
       </div>
@@ -501,6 +502,7 @@
     <es-ca-login
       v-if="isCaLogin"
       ref="calogin"
+      :showSelect="showKeySelect"
       :install-path="installPath"
       :ca-model="caLoginModel"
       :identifyingId="identifyingId"
@@ -712,10 +714,7 @@ export default {
       default: true
     },
     storage: String,
-    warning: {
-      type: [Boolean, String],
-      default: false
-    },
+    warning: String,
     copyrightStyle: {
       type: Object,
       default() {
@@ -777,7 +776,8 @@ export default {
       }
     },
     caModel: String,
-    caInstallPath: String
+    caInstallPath: String,
+    showKeySelect: Boolean
   },
   computed: {
     transform() {
@@ -820,21 +820,12 @@ export default {
         return window.location.href || window.href;
       }
     },
-    warnInfo() {
-      if (this.warning === false && !this.warningText) {
-        return false;
-      }
-      if (
-        this.warningText &&
-        this.warningText !== 'true' &&
-        this.warningText !== true
-      ) {
-        return this.warningText;
-      }
-      if (this.warning && typeof this.warning === 'string') {
-        return this.warning;
-      }
-      return '本系统为非涉密系统，禁止上传和处理任何涉密文件';
+    showWarnInfo() {
+      return this.$slots.warning || this.$scopedSlots.warning
+        ? false
+        : this.warningText
+        ? true
+        : false;
     },
     modelLength() {
       return Array.isArray(this.loginModel)
@@ -885,7 +876,6 @@ export default {
       types.forEach((item) => {
         icon.push(this.iconfonts[item]);
       });
-      console.log(icon);
       return icon;
     },
     isCaLogin() {
@@ -1019,7 +1009,7 @@ export default {
       checkCode: '',
       showAssistance: false,
       doAssistance: null,
-      warningText: '',
+      warningText: this.warning,
       safes: {
         paste: (event) => {
           event.preventDefault();

package/packages/main/src/public/search.vue

@@ -131,7 +131,7 @@
         </el-tab-pane>
       </template>
     </el-tabs>
-    <es-dialog :title="title" :visible.sync="visible" size="lg">
+    <es-dialog :title="title" :visible.sync="visible" size="max">
       <iframe width="100%" height="100%" frameborder="0" :src="url"></iframe>
     </es-dialog>
   </div>
@@ -325,20 +325,16 @@ export default {
             this.isLoading = false;
             this.types[i].records = this.searchData(this.menus, keyWords);
             this.types[i].totalCount = this.types[i].records.length;
-            this.types[i].pageCount = Math.ceil(
-              this.types[i].records.length / this.pageSize
-            );
-            this.types[i].pageNum = 0;
+            this.types[i].pageCount = 1;
+            this.types[i].pageNum = 1;
             this.$set(this.loadings, item.id || String(i), false);
             this.$set(this.noMore, item.id || String(i), true);
           } else if (item.name == '应用' && this.apps.length) {
             this.isLoading = false;
             this.types[i].records = this.searchData(this.apps, keyWords);
             this.types[i].totalCount = this.types[i].records.length;
-            this.types[i].pageCount = Math.ceil(
-              this.types[i].records.length / this.pageSize
-            );
-            this.types[i].pageNum = 0;
+            this.types[i].pageCount = 1;
+            this.types[i].pageNum = 1;
             this.$set(this.loadings, item.id || String(i), false);
             this.$set(this.noMore, item.id || String(i), true);
           } else if (item.dataRequestUrl) {

package/packages/main/src/simplicity/avatar.vue

@@ -56,7 +56,6 @@ export default {
   computed: {
     //用户头像
     _userHead() {
-      console.log(this.user);
       return this.userHead ? this.userHead : this.user.userHeadUrl;
     }
   },

package/packages/selector/src/main.vue

@@ -39,9 +39,7 @@
                 @close="deleteTag($event, selected[0])"
               >
                 <span class="el-select__tags-text">
-                  {{
-                    isObject(selected[0]) ? selected[0][labelKey] : selected[0]
-                  }}
+                  {{ getLabel(selected[0]) }}
                 </span>
               </el-tag>
               <el-tag
@@ -181,7 +179,10 @@
               class="es-selector-dropdown-item"
               :class="{ 'es-selected': item.selected }"
             >
-              <span>{{ item[labelKey] }}</span>
+              <span>
+                {{ getDep(item) }}
+                {{ item[labelKey] }}
+              </span>
             </li>
           </el-scrollbar>
           <p v-if="options.length == 0" class="el-select-dropdown__empty">
@@ -224,7 +225,7 @@
 </template>
 <script>
 import util from 'eoss-ui/src/utils/util.js';
-import { getSelectorOrgDetail } from 'eoss-ui/src/config/api.js';
+import { getSelectorOrgDetail, getSysParam } from 'eoss-ui/src/config/api.js';
 import Clickoutside from 'eoss-element/src/utils/clickoutside';
 export default {
   name: 'EsSelector',
@@ -316,7 +317,14 @@ export default {
       type: [String, Number],
       default: -1
     },
+    //是否显示搜索框
     filterable: Boolean,
+    //搜索列表是否显示部门信息
+    showFilterListDep: {
+      type: Boolean,
+      default: true
+    },
+    //是否根据搜索值创建新的数据
     createable: Boolean,
     showButton: Boolean,
     button: Object,
@@ -458,10 +466,16 @@ export default {
         clearTimeout(this.timer);
         this.timer = setTimeout(this.handleSearch, 500);
       }
+    },
+    mix(val) {
+      if (val) {
+        this.getSysParam();
+      }
     }
   },
   created() {
     this.reference = this.$refs.esSelector;
+    this.mix && this.getSysParam();
   },
   mounted() {
     this.resetInputHeight();
@@ -478,8 +492,31 @@ export default {
     }
   },
   methods: {
-    isObject(obj) {
-      return util.isObject(obj);
+    getSysParam() {
+      if (util.getStorage('sysorgname') && util.getStorage('sysdepname')) {
+        return;
+      }
+      util
+        .ajax({
+          url: getSysParam,
+          params: {
+            paramCode: 'sysorgname,sysdepname'
+          }
+        })
+        .then((res) => {
+          if (res.rCode === 0) {
+            let params = res.results.split(',');
+            sessionStorage.setItem('sysorgname', params[0]);
+            sessionStorage.setItem('sysdepname', params[1]);
+          }
+        });
+    },
+    getDep(res) {
+      if (!this.showFilterListDep) {
+        return '';
+      }
+      const attr = res.attr ? JSON.parse(res.attr) : null;
+      return attr && attr.depShortName ? `[${attr.depShortName}]` : '';
     },
     getValueKey(obj) {
       return util.isObject(obj) ? obj[this.valueKey] : obj;
@@ -598,13 +635,14 @@ export default {
     },
     handleConfirm(res) {
       this.visible = false;
-      if (util.isObject(res)) {
-        this.$emit('input', [res]);
-        this.$emit('confirm', [res], this.businessData);
-      } else {
-        this.$emit('input', res);
-        this.$emit('confirm', res, this.businessData);
+      let val = util.isObject(res) ? [res] : res;
+      if (this.mix) {
+        val.forEach((item, index) => {
+          val[index]._typeName = util.getTypeName(item.stype);
+        });
       }
+      this.$emit('input', val);
+      this.$emit('confirm', val, this.businessData);
       let inputChildNodes = this.$refs.reference
         ? this.$refs.reference.$el.childNodes
         : null;
@@ -666,10 +704,14 @@ export default {
       let tag = '';
       if (this.mix) {
         tag = util.getTypeName(res.stype);
+      } else if (this.showFilterListDep) {
+        tag = this.getDep(res);
       }
       return (
         tag +
-        (res[this.labelKey]
+        (typeof res == 'string'
+          ? res
+          : res[this.labelKey]
           ? res[this.labelKey]
           : res.label || res[this.valueKey])
       );

package/packages/selector-panel/src/main.vue

@@ -340,7 +340,7 @@ export default {
           selection: [],
           value: [],
           param: {
-            showarea: 2,
+            showarea: 0,
             id: 0,
             filid: 'all'
           }
@@ -368,7 +368,7 @@ export default {
           selection: [],
           value: [],
           param: {
-            showarea: 2,
+            showarea: 0,
             id: 0,
             filid: 'all'
           }
@@ -396,7 +396,7 @@ export default {
           name: 'filgroup',
           url: getSelectorOrgTree,
           param: {
-            showarea: 3,
+            showarea: 4,
             id: 0,
             filid: 'all'
           }
@@ -410,7 +410,7 @@ export default {
           selection: [],
           value: [],
           param: {
-            showarea: 4,
+            showarea: 5,
             id: 0,
             filid: 'all'
           }
@@ -452,7 +452,7 @@ export default {
           selection: [],
           value: [],
           param: {
-            showarea: 13,
+            showarea: 14,
             id: 0,
             filid: 'all'
           }