eoss-ui 0.4.47 → 0.4.48

package/lib/wxlogin.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 68);
+/******/ 	return __webpack_require__(__webpack_require__.s = 66);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -92,13 +92,13 @@ module.exports =
 
 "use strict";
 /* harmony import */ var _config_api__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(1);
-/* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(4);
+/* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(5);
 /* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(axios__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var qs__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(3);
+/* harmony import */ var qs__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(4);
 /* harmony import */ var qs__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(qs__WEBPACK_IMPORTED_MODULE_2__);
 /* harmony import */ var json_bigint__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(6);
 /* harmony import */ var json_bigint__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(json_bigint__WEBPACK_IMPORTED_MODULE_3__);
-/* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(5);
+/* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(2);
 /* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(eoss_element__WEBPACK_IMPORTED_MODULE_4__);
 var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
 
@@ -164,8 +164,7 @@ function delPendingRequest(config) {
   }
 }
 var ajax = function ajax(_ref) {
-  var _ref$headers = _ref.headers,
-      headers = _ref$headers === undefined ? {} : _ref$headers,
+  var headers = _ref.headers,
       method = _ref.method,
       url = _ref.url,
       _ref$host = _ref.host,
@@ -182,6 +181,7 @@ var ajax = function ajax(_ref) {
       defaults = _ref$defaults === undefined ? false : _ref$defaults,
       loading = _ref.loading;
 
+  var header = headers || {};
   if (!method) {
     if (format) {
       method = 'get';
@@ -351,9 +351,9 @@ var ajax = function ajax(_ref) {
     if (!mix) {
       params = {};
     }
-    if (format) {
+    if (format && !headers) {
       data = qs__WEBPACK_IMPORTED_MODULE_2___default.a.stringify(data);
-      headers['content-type'] = 'application/x-www-form-urlencoded';
+      header['content-type'] = 'application/x-www-form-urlencoded';
     }
   }
   return http({
@@ -361,7 +361,7 @@ var ajax = function ajax(_ref) {
     url: url,
     data: data,
     params: params,
-    headers: headers
+    header: header
   });
 };
 
@@ -409,6 +409,108 @@ var browser = function browser() {
   }
 };
 
+/**
+ * calcDateDayDiff
+ * @desc:时间计算-天数计算
+ * @author sutao
+ * @date 2023年11月10日
+ * @param {String/Object/Number} [date1] - 时间对象、字符串、时间戳
+ * @param {String/Object/Number} [date2] - 时间对象、字符串、时间戳
+ **/
+var calcDateDayDiff = function calcDateDayDiff(date1, date2) {
+  if (date1 && date2) {
+    try {
+      // 尝试将输入转换为 Date 对象
+      var d1 = new Date(date1);
+      var d2 = new Date(date2);
+
+      // 检查转换是否成功
+      if (isNaN(d1.getTime()) || isNaN(d2.getTime())) {
+        throw new Error('日期格式不正确');
+      }
+
+      // 将日期转换为毫秒数
+      var timeDiff = Math.abs(d2.getTime() - d1.getTime());
+
+      // 计算天数
+      var days = Math.floor(timeDiff / (1000 * 60 * 60 * 24));
+
+      return days;
+    } catch (error) {
+      // 捕获错误并抛出
+      eoss_element__WEBPACK_IMPORTED_MODULE_4__["MessageBox"].error(error, 5);
+    }
+  }
+};
+
+/**
+ * calcDateHourDiff
+ * @desc:时间计算-小时计算
+ * @author sutao
+ * @date 2023年11月10日
+ * @param {String/Object/Number} [date1] - 时间对象、字符串、时间戳
+ * @param {String/Object/Number} [date2] - 时间对象、字符串、时间戳
+ **/
+var calcDateHourDiff = function calcDateHourDiff(date1, date2) {
+  if (date1 && date2) {
+    try {
+      // 尝试将输入转换为 Date 对象
+      var d1 = new Date(date1);
+      var d2 = new Date(date2);
+
+      // 检查转换是否成功
+      if (isNaN(d1.getTime()) || isNaN(d2.getTime())) {
+        throw new Error('日期格式不正确');
+      }
+
+      // 将日期转换为毫秒数
+      var timeDiff = Math.abs(d2.getTime() - d1.getTime());
+
+      // 计算小时
+      var hours = Math.floor(timeDiff / (1000 * 60 * 60));
+
+      return hours;
+    } catch (error) {
+      // 使用 MessageBox.error 处理错误
+      eoss_element__WEBPACK_IMPORTED_MODULE_4__["MessageBox"].error(error.message, 5);
+    }
+  }
+};
+
+/**
+ * calcDateMinuteDiff
+ * @desc:时间计算-分钟计算
+ * @author sutao
+ * @date 2023年11月10日
+ * @param {String/Object/Number} [date1] - 时间对象、字符串、时间戳
+ * @param {String/Object/Number} [date2] - 时间对象、字符串、时间戳
+ **/
+var calcDateMinuteDiff = function calcDateMinuteDiff(date1, date2) {
+  if (date1 && date2) {
+    try {
+      // 尝试将输入转换为 Date 对象
+      var d1 = new Date(date1);
+      var d2 = new Date(date2);
+
+      // 检查转换是否成功
+      if (isNaN(d1.getTime()) || isNaN(d2.getTime())) {
+        throw new Error('日期格式不正确');
+      }
+
+      // 将日期转换为毫秒数
+      var timeDiff = Math.abs(d2.getTime() - d1.getTime());
+
+      // 计算分钟
+      var minutes = Math.floor(timeDiff / (1000 * 60));
+
+      return minutes;
+    } catch (error) {
+      // 使用 MessageBox.error 处理错误
+      eoss_element__WEBPACK_IMPORTED_MODULE_4__["MessageBox"].error(error.message, 5);
+    }
+  }
+};
+
 /**
  * debounce
  * @desc:添加js内容
@@ -2177,10 +2279,14 @@ var watermark = function watermark(option) {
   wrap.appendChild(docFrag);
   document.body.appendChild(wrap);
 };
+
 /* harmony default export */ __webpack_exports__["a"] = ({
   ajax: ajax,
   arrUnique: arrUnique,
   browser: browser,
+  calcDateDayDiff: calcDateDayDiff,
+  calcDateHourDiff: calcDateHourDiff,
+  calcDateMinuteDiff: calcDateMinuteDiff,
   debounce: debounce,
   delUrlParam: delUrlParam,
   domEval: domEval,
@@ -2566,6 +2672,13 @@ var formContents = '/config/admin/online/onlineForm/render';
 /***/ }),
 
 /***/ 2:
+/***/ (function(module, exports) {
+
+module.exports = require("eoss-element");
+
+/***/ }),
+
+/***/ 3:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -2668,26 +2781,19 @@ function normalizeComponent(
 }
 
 
-/***/ }),
-
-/***/ 3:
-/***/ (function(module, exports) {
-
-module.exports = require("qs");
-
 /***/ }),
 
 /***/ 4:
 /***/ (function(module, exports) {
 
-module.exports = require("axios");
+module.exports = require("qs");
 
 /***/ }),
 
 /***/ 5:
 /***/ (function(module, exports) {
 
-module.exports = require("eoss-element");
+module.exports = require("axios");
 
 /***/ }),
 
@@ -2698,7 +2804,7 @@ module.exports = require("json-bigint");
 
 /***/ }),
 
-/***/ 68:
+/***/ 66:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -2743,7 +2849,7 @@ render._withStripped = true
 var util = __webpack_require__(0);
 
 // EXTERNAL MODULE: external "qs"
-var external_qs_ = __webpack_require__(3);
+var external_qs_ = __webpack_require__(4);
 var external_qs_default = /*#__PURE__*/__webpack_require__.n(external_qs_);
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/wxlogin/src/main.vue?vue&type=script&lang=js&
@@ -2854,7 +2960,7 @@ var external_qs_default = /*#__PURE__*/__webpack_require__.n(external_qs_);
 // CONCATENATED MODULE: ./packages/wxlogin/src/main.vue?vue&type=script&lang=js&
  /* harmony default export */ var src_mainvue_type_script_lang_js_ = (mainvue_type_script_lang_js_); 
 // EXTERNAL MODULE: ./node_modules/vue-loader/lib/runtime/componentNormalizer.js
-var componentNormalizer = __webpack_require__(2);
+var componentNormalizer = __webpack_require__(3);
 
 // CONCATENATED MODULE: ./packages/wxlogin/src/main.vue
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.4.47",
+  "version": "0.4.48",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [
@@ -53,8 +53,6 @@
   "unpkg": "lib/index.js",
   "style": "lib/theme-chalk/index.css",
   "dependencies": {
-    "@wangeditor/editor": "^5.1.23",
-    "@wangeditor/editor-for-vue": "^1.0.2",
     "axios": "^0.27.2",
     "json-bigint": "^1.0.0",
     "net": "^1.0.2",
@@ -95,7 +93,7 @@
     "cp-cli": "^1.0.2",
     "cross-env": "^3.1.3",
     "css-loader": "^2.1.0",
-    "eoss-element": "^0.2.56",
+    "eoss-element": "^0.2.59",
     "es6-promise": "^4.0.5",
     "eslint": "4.18.2",
     "eslint-config-elemefe": "0.1.1",

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

@@ -438,6 +438,7 @@
               <es-input
                 v-else
                 v-bind="exclAttribute({ data: item, attrs: 'width' })"
+                :scope="scope"
                 v-model="scope.row[item.field]"
                 @blur="
                   (event) => {

package/packages/editor/src/main.vue

@@ -12,7 +12,7 @@
         <Editors v-model="model"></Editors>
       </template>
       <template v-else>
-        <Toolbar
+        <!-- <Toolbar
           class="es-editor-toolbar"
           :editor="editor"
           :defaultConfig="toolbarConfig"
@@ -25,7 +25,7 @@
           :defaultConfig="_editorConfig"
           :mode="mode"
           @onCreated="onCreated"
-        />
+        /> -->
       </template>
     </template>
   </div>
@@ -33,13 +33,13 @@
 <script>
 import { createEditor } from 'slate';
 import { withHistory } from 'slate-history';
-import { Editor, Toolbar } from '@wangeditor/editor-for-vue';
+//import { Editor, Toolbar } from '@wangeditor/editor-for-vue';
 import Toolbars from './toolbar.vue';
 import Editors from './editor.vue';
 export default {
   name: 'EsEditor',
   inheritAttrs: false,
-  components: { Editor, Toolbar, Toolbars, Editors },
+  //components: { Editor, Toolbar, Toolbars, Editors },
   inject: {
     elForm: {
       default: ''
@@ -112,4 +112,3 @@ export default {
   }
 };
 </script>
-<style src="@wangeditor/editor/dist/css/style.css"></style>

package/packages/flow/src/main.vue

@@ -640,7 +640,7 @@ export default {
       flowMultiple: true,
       isCustomUser: 0,
       shrink: false,
-      shrinkAbled:false,
+      shrinkAbled: false,
       taskExamineInfo: {},
       presetUserJson: [],
       presetList: [],
@@ -1560,7 +1560,7 @@ export default {
      * @param {String} val 当前选中值
      * @date 2022年5月25日
      **/
-    selecNext(val, type) {
+    selecNext(val, type, isDef) {
       this.loading = util.loading(this.$loading, '加载中...');
       if (this.multiple) {
         this.nextNode.nextUserId = [];
@@ -1572,7 +1572,39 @@ export default {
       this.radioList = [];
 
       if (type) {
+        this.nextNode.nextNodeId = '';
+        this.nextNode.isReturnSubmitter = 0;
+        this.nextNode.isUndertakeReply = 0;
+        this.nextNode.isTakeAdviceReply = 0;
+        this.nextNode.isUndertakeEnd = 0;
+        this.nextNode.isTakeAdviceEnd = 0;
+        this.nextNode.isReadDealReply = 0;
+        this.nextNode.isReadDealEnd = 0;
+        this.nextNode.isReturnRejectNode = 0;
+        this.nextNode.isSerialSubmit = 0;
         this.nodeInfos = [];
+        if (val == -1) {
+          this.nextNode.isSerialSubmit = 1;
+        } else if (val == 0) {
+        } else if (val == 1) {
+        } else if (val == 2) {
+          this.nextNode.isReturnSubmitter = 1;
+        } else if (val == 3) {
+          this.nextNode.isUndertakeReply = 1;
+        } else if (val == 4) {
+          this.nextNode.isTakeAdviceReply = 1;
+        } else if (val == 5) {
+          this.nextNode.isUndertakeEnd = 1;
+        } else if (val == 6) {
+          this.nextNode.isTakeAdviceEnd = 1;
+        } else if (val == 7) {
+          this.nextNode.isReadDealReply = 1;
+        } else if (val == 8) {
+          this.nextNode.isReadDealEnd = 1;
+        } else if (val == 9) {
+          this.nextNode.isReturnRejectNode = 1;
+        } else {
+        }
         this.operationList.map((item) => {
           if (item.key === val) {
             if (!item.taskNodeList) {
@@ -1603,7 +1635,7 @@ export default {
       } else {
         this.isReject = false;
       }
-      this.getNodeInfo();
+      if (isDef !== true) this.getNodeInfo();
     },
     /**
      * isMultiple
@@ -1656,35 +1688,35 @@ export default {
         .ajax({ url: getHandleInfoHtml, params })
         .then((res) => {
           //pc返回数据
-          
+
           this.loading.close();
           if (res.status === 'success') {
             const {
-            data: {
-              nextNodeList,
-              taskOperations,
-              isCustomPreset,
-              presetTaskNodeKeyStr,
-              presetTaskNodeMap,
-              isPreset,
-              choiceOrgId,
-              choiceDeptId,
-              pOrgId,
-              taskExamine,
-              nodeInfoMap,
-              canRemoveSignUserList,
-              defaultNotificationMessage,
-              customPresetHintMessage,
-              isCanAddSign,
-              isCanRemoveSign,
-              attachedCode,
-              isSpecial,
-              opinion,
-              canPresetRead,
-              isCdjxjTaskHandle,
-              taskButtonList
-            }
-          } = res;
+              data: {
+                nextNodeList,
+                taskOperations,
+                isCustomPreset,
+                presetTaskNodeKeyStr,
+                presetTaskNodeMap,
+                isPreset,
+                choiceOrgId,
+                choiceDeptId,
+                pOrgId,
+                taskExamine,
+                nodeInfoMap,
+                canRemoveSignUserList,
+                defaultNotificationMessage,
+                customPresetHintMessage,
+                isCanAddSign,
+                isCanRemoveSign,
+                attachedCode,
+                isSpecial,
+                opinion,
+                canPresetRead,
+                isCdjxjTaskHandle,
+                taskButtonList
+              }
+            } = res;
             this.$emit('startTaskRead', res);
             this.endFlowInfo.choiceOrgId = choiceOrgId;
             this.endFlowInfo.choiceDeptId = choiceDeptId;
@@ -1693,7 +1725,7 @@ export default {
             this.endFlowInfo.pOrgId = pOrgId;
             this.canPresetRead = canPresetRead;
             this.isCdjxjTaskHandle = isCdjxjTaskHandle;
-
+            this.operationList = taskOperations;
             this.customPresetHintMessage = customPresetHintMessage;
             if (canPresetRead) {
               let ids =
@@ -1736,8 +1768,9 @@ export default {
                   }
                 }
               });
+              this.selecNext(this.nextNode.nextOperate, true, true);
             }
-            this.operationList = taskOperations;
+
             if (nodeInfoMap && JSON.stringify(nodeInfoMap) != '{}') {
               if (nodeInfoMap.nodeExtAttr.nodeFixedOpinionSelectList) {
                 let notice = JSON.parse(
@@ -1794,6 +1827,15 @@ export default {
               this.endFlowInfo.processType = taskExamine.processType;
               this.endFlowInfo.isReturnSubmitter =
                 taskExamine.isReturnSubmitter;
+              this.nextNode.isReturnSubmitter = taskExamine.isReturnSubmitter;
+              this.nextNode.isUndertakeReply = taskExamine.isUndertakeReply;
+              this.nextNode.isTakeAdviceReply = taskExamine.isTakeAdviceReply;
+              this.nextNode.isUndertakeEnd = taskExamine.isUndertakeEnd;
+              this.nextNode.isTakeAdviceEnd = taskExamine.isTakeAdviceEnd;
+              this.nextNode.isReadDealReply = taskExamine.isReadDealReply;
+              this.nextNode.isReadDealEnd = taskExamine.isReadDealEnd;
+              this.nextNode.isReturnRejectNode = taskExamine.isReturnRejectNode;
+              this.nextNode.isSerialSubmit = taskExamine.isSerialSubmit;
               this.endFlowInfo.isSubFlow = taskExamine.isSubFlow;
               this.endFlowInfo.isUndertakeReply = taskExamine.isUndertakeReply;
               this.endFlowInfo.isUndertakeEnd = taskExamine.isUndertakeEnd;
@@ -1805,8 +1847,8 @@ export default {
               this.endFlowInfo.isReturnRejectNode =
                 taskExamine.isReturnRejectNode;
               this.endFlowInfo.isSerialSubmit = taskExamine.isSerialSubmit;
-              this.endFlowInfo.isReadDealReply =
-                taskExamine.isReadDealReplybusinessId;
+              // this.endFlowInfo.isReadDealReply =
+              //   taskExamine.isReadDealReplybusinessId;
               this.endFlowInfo.appId = taskExamine.appId;
               this.endFlowInfo.businessId = taskExamine.businessId;
               this.endFlowInfo.processDefinitionId =
@@ -1852,10 +1894,10 @@ export default {
             this.getNodeType();
             this.getNodeInfo();
           } else {
-            if(res.status === "taskCompleted"){
-              this.shrinkAbled = true
+            if (res.status === 'taskCompleted') {
+              this.shrinkAbled = true;
               this.$message.warning(res.message || '系统错误，请联系管理员！');
-            }else{
+            } else {
               this.$message.error(res.message || '系统错误，请联系管理员！');
             }
           }
@@ -2100,6 +2142,12 @@ export default {
             this.nextNode.processDefinitionId =
               this.processObj.taskExamine.processDefinitionId;
           }
+          if (
+            this.nextNode.nextOperate == 9 ||
+            this.nextNode.nextOperate == 2
+          ) {
+            delete this.nextNode.nextNodeId;
+          }
           await this.saveInfo('subMit');
           this.loading = util.loading(this.$loading, '加载中...');
 

package/packages/input/src/main.vue

@@ -44,7 +44,8 @@ export default {
     },
     readonly: Boolean,
     plain: Boolean,
-    text: [String, Number]
+    text: [String, Number],
+    scope: {}
   },
   data() {
     return {
@@ -197,9 +198,9 @@ export default {
               on: {
                 click: () => {
                   this.$attrs[type].click &&
-                    this.$attrs[type].click(this, this.model);
+                    this.$attrs[type].click(this, this.model, this.scope);
                   this.$attrs[type].event &&
-                    this.$attrs[type].event(this, this.model);
+                    this.$attrs[type].event(this, this.model, this.scope);
                 }
               }
             },

package/packages/login/src/main.vue

@@ -14,6 +14,7 @@
       element-loading-text="登录中..."
       element-loading-spinner="el-icon-loading"
       element-loading-background="rgba(0, 0, 0, 0.65)"
+      :class="{ 'es-simple': mode == 'simple' }"
       :style="transform"
     >
       <img v-if="loginNameUrl" class="es-login-name" :src="loginNameUrl" />
@@ -331,6 +332,10 @@ export default {
       type: String,
       default: initLogin
     },
+    mode: {
+      type: String,
+      default: 'default'
+    },
     title: {
       type: String,
       default: '账号登录'
@@ -978,8 +983,15 @@ export default {
             this.$message({
               message: res.msg,
               duration: 2000,
-              type: res ? 'error' : 'success'
+              type: res.rCode == 0 ? 'success' : 'error'
             });
+
+            if (res.rCode === 2) {
+              this.btnText = '获取验证码';
+              this.disabled = false;
+              this.countdown = 0;
+              clearInterval(this.timer);
+            }
             // if (res.rCode) {
             //   clearInterval(this.timer);
             // }

package/packages/login/src/resetPassword.vue

@@ -210,7 +210,7 @@ export default {
         .ajax({
           url: initModifyPassword
         })
-        .then(res => {
+        .then((res) => {
           if (res.rCode === 0) {
             const results = JSON.parse(JSON.stringify(res.results));
             if (results.checkPassword) {
@@ -224,7 +224,7 @@ export default {
             this.$message.error(msg);
           }
         })
-        .catch(err => {
+        .catch((err) => {
           if (err.message && err.message !== 'canceled') {
             this.$message.error(err.message);
           }
@@ -239,7 +239,7 @@ export default {
         return false;
       } else {
         let flag = false;
-        this.$refs.pwdForm.validateField('target', res => {
+        this.$refs.pwdForm.validateField('target', (res) => {
           flag = res != '';
         });
         if (flag) {
@@ -270,15 +270,21 @@ export default {
           url: getModifyPassCode,
           params: params
         })
-        .then(res => {
+        .then((res) => {
           if (res.rCode === 0) {
             this.$message.success(res.msg);
           } else {
             let msg = res.msg || '系统错误，请联系管理员！';
+            if (res.rCode === 2) {
+              this.btnText = '获取验证码';
+              this.disabled = false;
+              this.countdown = 0;
+              clearInterval(this.timer);
+            }
             this.$message.error(msg);
           }
         })
-        .catch(err => {
+        .catch((err) => {
           if (err.message && err.message !== 'canceled') {
             this.$message.error(err.message);
           }
@@ -304,7 +310,7 @@ export default {
           url: codeModifyPass,
           data: data
         })
-        .then(res => {
+        .then((res) => {
           this.submit = false;
           if (res.rCode === 0) {
             this.$message.success(res.msg);
@@ -314,7 +320,7 @@ export default {
             this.$message.error(msg);
           }
         })
-        .catch(err => {
+        .catch((err) => {
           if (err.message && err.message !== 'canceled') {
             this.$message.error(err.message);
           }