eoss-ui 0.6.51 → 0.6.53

package/packages/flow/src/startTaskRead.vue

@@ -12,126 +12,135 @@
       class="demo-dynamic"
       label-width="110px"
     >
-    <div :style="`max-height: ${typeCode?'unset' : '290px'}; overflow-y: auto; margin-bottom: 10px`">
-      <el-form-item
-        prop="handleExplain"
-        label="当前步骤"
-        v-if="type === 'transfer'"
+      <div
+        :style="`max-height: ${
+          typeCode ? 'unset' : '290px'
+        }; overflow-y: auto; margin-bottom: 10px`"
       >
-        <el-input readonly v-model="nextNode.nodeName"></el-input>
-      </el-form-item>
-      <el-form-item
-        v-if="type == 'transfer' && transferInfo.isSinglePage"
-        prop="handleExplain"
-        label="意见"
-      >
-        <el-input
-          v-model="nextNode.handleExplain"
-          placeholder="请填写意见"
-        ></el-input>
-      </el-form-item>
-      <el-form-item
-        prop="nextUser"
-        :label="
-          type === 'transfer'
-            ? '转办对象'
-            : configInfo.isCdjxjTaskHandle == 'true'
-            ? '接收人'
-            : '办理用户'
-        "
-      >
-        <SelectUser
-          :nextUser="nextNode.nextUser"
-          :options="userOptions"
-          :multiple="type != 'transfer' ? multiple : false"
-          :mix="type != 'transfer'"
-          :selectUserList="selectUserList"
-          :types="
-            type == 'transfer'
-              ? ['employee', 'persongroup']
-              : ['employee', 'enterprise', 'department', 'persongroup']
+        <el-form-item
+          prop="handleExplain"
+          label="当前步骤"
+          v-if="type === 'transfer'"
+        >
+          <el-input readonly v-model="nextNode.nodeName"></el-input>
+        </el-form-item>
+        <el-form-item
+          v-if="type == 'transfer' && transferInfo.isSinglePage"
+          prop="handleExplain"
+          label="意见"
+        >
+          <el-input
+            v-model="nextNode.handleExplain"
+            placeholder="请填写意见"
+          ></el-input>
+        </el-form-item>
+        <el-form-item
+          prop="nextUser"
+          :label="
+            type === 'transfer'
+              ? '转办对象'
+              : configInfo.isCdjxjTaskHandle == 'true'
+              ? '接收人'
+              : '办理用户'
           "
-          @change="changeSelectUser($event, 'nextUser')"
-          :tabs="tabs"
-          :where="{ type: 'user' }"
-        />
-      </el-form-item>
+        >
+          <SelectUser
+            :nextUser="nextNode.nextUser"
+            :options="userOptions"
+            :multiple="type != 'transfer' ? multiple : false"
+            :mix="type != 'transfer'"
+            :selectUserList="selectUserList"
+            :types="
+              type == 'transfer'
+                ? ['employee', 'persongroup']
+                : ['employee', 'enterprise', 'department', 'persongroup']
+            "
+            @change="changeSelectUser($event, 'nextUser')"
+            :tabs="tabs"
+            :where="{ type: 'user' }"
+          />
+        </el-form-item>
 
-      <el-form-item
-        v-if="configInfo.isCdjxjTaskHandle != 'true' && type != 'transfer'"
-        prop="cy"
-        label="常用群组"
-        ><el-checkbox-group v-model="selectCheck">
-          <el-checkbox
-            @change="handleSelectCheck($event, item)"
-            v-for="item in configInfo.groups"
-            :label="item.name"
-            :key="item.id"
-            >{{ item.name }}</el-checkbox
+        <el-form-item
+          v-if="configInfo.isCdjxjTaskHandle != 'true' && type != 'transfer'"
+          prop="cy"
+          label="常用群组"
+          ><el-checkbox-group v-model="selectCheck">
+            <el-checkbox
+              @change="handleSelectCheck($event, item)"
+              v-for="item in configInfo.groups"
+              :label="item.name"
+              :key="item.id"
+              >{{ item.name }}</el-checkbox
+            >
+          </el-checkbox-group>
+        </el-form-item>
+        <el-form-item
+          v-if="configInfo.fyDoresult == 'true'"
+          prop="showDoresult"
+          label="流程意见"
+          ><el-radio v-model="nextNode.showDoresult" label="0">分阅</el-radio>
+          <el-radio v-model="nextNode.showDoresult" label="1">不分阅</el-radio>
+        </el-form-item>
+        <el-form-item
+          v-if="configInfo.fyeh == 'true'"
+          prop="isInHistory"
+          label="分阅记录"
+          ><el-radio v-model="nextNode.isInHistory" label="0">记录</el-radio>
+          <el-radio v-model="nextNode.isInHistory" label="1">不记录</el-radio>
+        </el-form-item>
+        <el-form-item
+          v-if="configInfo.download"
+          prop="isDownload"
+          label="打印下载文件"
+          ><el-radio v-model="nextNode.isDownload" label="0">允许</el-radio>
+          <el-radio v-model="nextNode.isDownload" label="1">不允许</el-radio>
+        </el-form-item>
+        <el-form-item
+          prop="handleExplain"
+          :label="configInfo.isCdjxjTaskHandle == 'true' ? '附言' : '办理说明'"
+          v-if="type != 'transfer'"
+        >
+          <el-input
+            v-model="nextNode.handleExplain"
+            placeholder="请填写办理说明"
+          ></el-input>
+        </el-form-item>
+        <el-form-item
+          v-if="configInfo.isCdjxjTaskHandle != 'true'"
+          prop="noticeType"
+          label="通知方式"
+          :rules="[
+            { required: false, message: `请选择通知方式`, trigger: 'blur' }
+          ]"
+        >
+          <el-checkbox-group
+            v-model="nextNode.noticeType"
+            style="display: contents"
           >
-        </el-checkbox-group>
-      </el-form-item>
-      <el-form-item
-        v-if="configInfo.fyDoresult == 'true'"
-        prop="showDoresult"
-        label="流程意见"
-        ><el-radio v-model="nextNode.showDoresult" label="0">分阅</el-radio>
-        <el-radio v-model="nextNode.showDoresult" label="1">不分阅</el-radio>
-      </el-form-item>
-      <el-form-item
-        v-if="configInfo.fyeh == 'true'"
-        prop="isInHistory"
-        label="分阅记录"
-        ><el-radio v-model="nextNode.isInHistory" label="0">记录</el-radio>
-        <el-radio v-model="nextNode.isInHistory" label="1">不记录</el-radio>
-      </el-form-item>
-      <el-form-item
-        v-if="configInfo.download"
-        prop="isDownload"
-        label="打印下载文件"
-        ><el-radio v-model="nextNode.isDownload" label="0">允许</el-radio>
-        <el-radio v-model="nextNode.isDownload" label="1">不允许</el-radio>
-      </el-form-item>
-      <el-form-item
-        prop="handleExplain"
-        :label="configInfo.isCdjxjTaskHandle == 'true' ? '附言' : '办理说明'"
-        v-if="type != 'transfer'"
-      >
-        <el-input
-          v-model="nextNode.handleExplain"
-          placeholder="请填写办理说明"
-        ></el-input>
-      </el-form-item>
-      <el-form-item
-        v-if="configInfo.isCdjxjTaskHandle != 'true'"
-        prop="noticeType"
-        label="通知方式"
-        :rules="[
-          { required: false, message: `请选择通知方式`, trigger: 'blur' }
-        ]"
-      >
-        <el-checkbox-group v-model="nextNode.noticeType" style="display:contents">
-          <el-checkbox
-            v-for="item of noticeList"
-            :key="item.cciValue"
-            :label="item.cciValue"
-            :disabled="readOnlyNotificationType
+            <el-checkbox
+              v-for="item of noticeList"
+              :key="item.cciValue"
+              :label="item.cciValue"
+              :disabled="
+                readOnlyNotificationType
                   ? readOnlyNotificationType.indexOf(item.cciValue) != -1
-                  : false"
-          >
-            {{ item.shortName }}
-          </el-checkbox>
-        </el-checkbox-group>
-      </el-form-item>
-      <el-form-item
-      v-show="
-        nextNode.noticeType.length != 0 &&
-        configInfo.isCdjxjTaskHandle != 'true'
-      "
-        prop="nextNode"
-        label="通知消息"
-      >
-      <es-input
+                  : false
+              "
+            >
+              {{ item.shortName }}
+            </el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
+        <el-form-item
+          v-show="
+            nextNode.noticeType.length != 0 &&
+            configInfo.isCdjxjTaskHandle != 'true'
+          "
+          prop="nextNode"
+          label="通知消息"
+        >
+          <es-input
             style="
               border-color: #ccc;
               padding: 5px;
@@ -140,11 +149,11 @@
             "
             type="textarea"
             v-model="newsNoice"
-            :readonly="notificationMessageReadOnly =='true'"
+            :readonly="notificationMessageReadOnly == 'true'"
           />
-        <!-- <span>{{ newsInfo }}</span> -->
-      </el-form-item>
-    </div>
+          <!-- <span>{{ newsInfo }}</span> -->
+        </el-form-item>
+      </div>
       <el-form-item>
         <div style="text-align: right">
           <el-button type="primary" size="small" @click="submit('nextNode')">
@@ -162,6 +171,7 @@ import {
   taskReadHtml,
   toStartTaskRead,
   toTaskTransferIndex,
+  getNotificationMsg,
   taskTransfer,
   findCodeValues
 } from 'eoss-ui/src/config/api';
@@ -179,14 +189,18 @@ export default {
     type: { type: String, default: '' },
     option: { type: String, default: '' },
     typeCode: { type: String, default: '' },
-    taskExamine: { type: Object, default: () => {} }
+    taskExamine: { type: Object, default: () => {} },
+    readParams: {
+      type: [Object,undefined],
+      default: undefined
+    },
   },
   data() {
     return {
       loading: false,
-      newsNoice:'',
-      readOnlyNotificationType:'',
-      notificationMessageReadOnly:false,
+      newsNoice: '',
+      readOnlyNotificationType: '',
+      notificationMessageReadOnly: false,
       nextNode: {
         nextUser: [],
         userInfo: [],
@@ -236,13 +250,35 @@ export default {
     }
   },
   mounted() {
-    this.newsNoice = this.newsInfo
+    this.newsNoice = this.newsInfo;
+    if(this.readParams){
+      this.getMessage()
+    }
     this.getFind();
-    if(util.getStorage('mainConfig')){
-      this.orgId = JSON.parse(util.getStorage('mainConfig')).userModel.orgId
+    if (util.getStorage('mainConfig')) {
+      this.orgId = JSON.parse(util.getStorage('mainConfig')).userModel.orgId;
     }
   },
   methods: {
+    //获取通知信息
+    getMessage() {
+      let params = {
+        appId: this.readParams.appId
+      };
+      util
+        .ajax({ url: getNotificationMsg, params, methods: 'post' })
+        .then((res) => {
+          if (res.status === 'success') {
+            this.newsNoice = res.message;
+          }
+        })
+        .catch((err) => {
+          this.loading = false;
+          if (err.message && err.message !== 'canceled') {
+            this.$message.error(err.message);
+          }
+        });
+    },
     toTaskTransfer() {
       const { opinion, pendingId, taskExamine } = this;
       let params = {
@@ -404,7 +440,10 @@ export default {
       util
         .ajax({
           url: findCodeValues,
-          params: { ccCode: 'notification_type',userId:util.getStorage('userId') }
+          params: {
+            ccCode: 'notification_type',
+            userId: util.getStorage('userId')
+          }
         })
         .then((res) => {
           const { status, data } = res;
@@ -431,7 +470,7 @@ export default {
     // 转办提交
     subTaskTransfer() {
       const { choiceDeptId, choiceOrgId, bCode, bName } = this.taskExamine;
-      const { opinion, pendingId, nextNode, newsNoice, multiple,type } = this;
+      const { opinion, pendingId, nextNode, newsNoice, multiple, type } = this;
       let params = {
         url: taskTransfer,
         data: {
@@ -439,9 +478,10 @@ export default {
           choiceOrgId,
           bCode,
           bName,
-          nextUserId: multiple && type != 'transfer'
-            ? nextNode.nextUser.join(',')
-            : nextNode.nextUser,
+          nextUserId:
+            multiple && type != 'transfer'
+              ? nextNode.nextUser.join(',')
+              : nextNode.nextUser,
           opinion,
           pendingId,
           notificationType: nextNode.noticeType.join(','),
@@ -523,6 +563,9 @@ export default {
             fyeh != 'true' && delete params.isInHistory;
             !download && delete params.isDownload;
             isCdjxjTaskHandle == 'true' && delete params.noticeType;
+            if (this.readParams) {
+              params = { ...params, ...this.readParams };
+            }
             util
               .ajax({
                 url: taskReadHtml,
@@ -567,13 +610,14 @@ export default {
           url: findSysCodes
         })
         .then((res) => {
-          const { status, message,data } = res;
+          const { status, message, data } = res;
           this.loading = false;
           if (status === 'success') {
             this.nextNode.noticeType = message.split(',');
-            if(data){
-              this.notificationMessageReadOnly = data.notificationMessageReadOnly
-              this.readOnlyNotificationType = data.readOnlyNotificationType
+            if (data) {
+              this.notificationMessageReadOnly =
+                data.notificationMessageReadOnly;
+              this.readOnlyNotificationType = data.readOnlyNotificationType;
             }
           } else {
             this.$message.error(message || '系统错误，请联系管理员！');
@@ -581,7 +625,7 @@ export default {
           this.getNodeType();
           if (this.type === 'transfer') {
             this.toTaskTransfer();
-          } else {
+          } else if(!this.readParams) {
             this.toStartTaskRead();
           }
         })

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

@@ -124,6 +124,10 @@ export default {
       type: Array,
       default: () => []
     },
+    headFields: {
+      type: Array,
+      default: () => []
+    },
     contents: {
       type: Array,
       default() {
@@ -745,7 +749,9 @@ export default {
                       : params.row.pendstate == 1
                       ? 'green'
                       : 'deepskyblue',
-                  cursor: this.hasCircularReadWithdrawAuthority?'pointer' :'unset'
+                  cursor: this.hasCircularReadWithdrawAuthority
+                    ? 'pointer'
+                    : 'unset'
                 },
                 domProps: {
                   innerHTML:
@@ -844,16 +850,33 @@ export default {
       };
     },
     content() {
+      const _that = this;
       let newContents = JSON.parse(JSON.stringify(this.contents));
       if (this.contents.indexOf('circular') != -1) {
         newContents = newContents.filter((item) => item != 'splitReading');
       }
       let contents = newContents.map((item) => {
         if (typeof item === 'string') {
+          let data = [];
+          if (_that.headFields.length > 0) {
+            _that.headFields.map((headFiled) => {
+              _that.theads[item].map((theadItem) => {
+                if (theadItem.field === headFiled.field) {
+                  theadItem = headFiled;
+                  data.push(theadItem);
+                }
+              });
+            });
+            _that.theads[item].map(x => {
+              if(x.type == 'handle'){
+                data.push(x);
+              }
+            })
+          }
           return {
             type: item,
             toolbar: this.toolbars[item],
-            thead: this.theads[item],
+            thead: data.length > 0 ? data : this.theads[item],
             showFormBtn: false
           };
         } else {

package/packages/form/src/main.vue

@@ -2178,7 +2178,7 @@
 </template>
 <script>
 import { formContents } from 'eoss-ui/src/config/api.js';
-import { debounce } from 'throttle-debounce';
+import { throttle } from 'throttle-debounce';
 import util from 'eoss-ui/src/utils/util';
 import rules from 'eoss-ui/src/utils/rules.js';
 const pageView = util.getParams('pageView');
@@ -2709,10 +2709,10 @@ export default {
     }
   },
   beforeCreate() {
-    this.getContent = debounce(500, () => {
+    this.getContent = throttle(500, () => {
       this.getContents();
     });
-    this.getValue = debounce(500, () => {
+    this.getValue = throttle(500, () => {
       this.getValues();
     });
   },

package/packages/input/src/main.vue

@@ -1,5 +1,5 @@
 <script>
-import { debounce } from 'throttle-debounce';
+import { throttle } from 'throttle-debounce';
 import util from 'eoss-ui/src/utils/util';
 import rules from 'eoss-ui/src/utils/rules.js';
 export default {
@@ -125,7 +125,7 @@ export default {
     }
   },
   beforeCreate() {
-    this.getData = debounce(500, (query, callback, isChange) => {
+    this.getData = throttle(500, (query, callback, isChange) => {
       this.getDatas(query, callback, isChange);
     });
   },

package/packages/login/src/main.vue

@@ -461,7 +461,7 @@
   </div>
 </template>
 <script>
-import { debounce } from 'throttle-debounce';
+import { throttle } from 'throttle-debounce';
 import resetPassword from './resetPassword.vue';
 import store from 'eoss-ui/src/utils/store';
 import util from 'eoss-ui/src/utils/util';
@@ -998,7 +998,7 @@ export default {
     };
   },
   beforeCreate() {
-    this.setScale = debounce(300, () => {
+    this.setScale = throttle(300, () => {
       util.setScale();
     });
     util.removeStorage([

package/packages/main/src/default/index.vue

@@ -1267,6 +1267,8 @@ export default {
           }
         } else if (item.url == url) {
           return item.id;
+        } else if (item.url && url.indexOf(item.url) > -1) {
+          return item.id;
         } else {
           if (item.url) {
             try {
@@ -1809,7 +1811,11 @@ export default {
       if (node.url) {
         this.selectPage = node.url;
         this.refresh = false;
-        this.handleJump(node.url, Number(node.urlopenmode), node);
+        let type = Number(node.urlopenmode);
+        if (type != 1) {
+          this.drawer.visible = false;
+        }
+        this.handleJump(node.url, type, node);
       }
     },
     hasRouter(res, url) {

package/packages/main/src/main.vue

@@ -52,6 +52,7 @@ import Simplicity from './simplicity/index.vue';
 import MainDefault from './default/index.vue';
 import util from 'eoss-ui/src/utils/util';
 import WujieVue from 'wujie-vue2';
+import { isArray } from 'lodash';
 export default {
   name: 'EsMain',
   inheritAttrs: false,
@@ -161,7 +162,9 @@ export default {
             this.$refs.main.handleRefresh(args);
             break;
           case 'jumpMenu':
-            this.$refs.main.jumpMenu(args);
+            Array.isArray(args)
+              ? this.$refs.main.jumpMenu(...args)
+              : this.$refs.main.jumpMenu(args);
             break;
           case 'emit':
             const { origin, ...data } = args;

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

@@ -68,6 +68,7 @@
           :label="item.name"
           :name="item.id || String(index + 1)"
           :key="item.id"
+          lazy
           v-loading="loadings[item.id || String(index)]"
           element-loading-background="rgba(0, 0, 0, 0.01)"
           element-loading-text="加载中..."
@@ -139,7 +140,7 @@
 <script>
 import util from 'eoss-ui/src/utils/util';
 import { searchType } from 'eoss-ui/src/config/api.js';
-import { debounce } from 'throttle-debounce';
+import { throttle } from 'throttle-debounce';
 export default {
   name: 'Search',
   components: {},
@@ -231,10 +232,12 @@ export default {
     }
   },
   beforeCreate() {
-    this.handleSearchAll = debounce(500, (res) => {
+    this.handleSearchAll = throttle(500, (res) => {
+      console.log(res, 999);
       this.searchAll(res);
     });
-    this.handleSearchd = debounce(500, (obj, index) => {
+    this.handleSearchd = throttle(500, (obj, index) => {
+      console.log(obj, index, 6666);
       this.handleSearch(obj, index, false);
     });
   },
@@ -319,6 +322,7 @@ export default {
     searchAll(keyWords) {
       for (let i = 0; i < this.types.length; i++) {
         let item = this.types[i];
+        console.log(item, 8888);
         if (keyWords && !this.hides.includes(item.name) && !item.hide) {
           if (item.name == '菜单' && this.menus.length) {
             this.isLoading = false;
@@ -379,6 +383,7 @@ export default {
       return records;
     },
     handleSearch(obj, index, reset) {
+      console.log(obj, reset, 77777);
       if (obj.pageNum < obj.pageCount && this.keyWords) {
         this.$set(this.loadings, obj.id || String(index), true);
         if (this.active == '0') {

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

@@ -192,7 +192,7 @@
 
 <script>
 import util from 'eoss-ui/src/utils/util';
-import { debounce } from 'throttle-debounce';
+import { throttle } from 'throttle-debounce';
 import { recordUserApp } from 'eoss-ui/src/config/api.js';
 export default {
   name: 'Apps',
@@ -300,7 +300,7 @@ export default {
     }
   },
   beforeCreate() {
-    this.getApps = debounce(500, () => {
+    this.getApps = throttle(500, () => {
       this.getApp();
     });
   },

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

@@ -1962,15 +1962,15 @@ export default {
         clearTimeout(this.sysMsgOut);
       }
     },
-    jumpMenu(res, close) {
+    jumpMenu(res, close, params = {}) {
       let apps = res;
-      let param = null;
+      let param = params;
       let reload = true;
       if (typeof res === 'string') {
         apps = res.split(',');
       } else if (typeof res === 'object') {
         apps = res.appCode.split(',');
-        param = res.param;
+        res.param && (param = { ...res.param, ...params });
         reload = Object.prototype.hasOwnProperty.call(res, 'reload')
           ? res.reload
           : true;

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

@@ -77,7 +77,7 @@
 import avatar from './avatar.vue';
 import userInfo from './userinfo.vue';
 import util from 'eoss-ui/src/utils/util';
-import { debounce } from 'throttle-debounce';
+import { throttle } from 'throttle-debounce';
 import {
   initUserSet,
   switchUserTo,
@@ -116,7 +116,7 @@ export default {
     }
   },
   beforeCreate() {
-    this.setNoticeType = debounce(1000, () => {
+    this.setNoticeType = throttle(1000, () => {
       this.setNotice();
     });
   },