eoss-ui 0.4.41 → 0.4.43

package/lib/tips.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 61);
+/******/ 	return __webpack_require__(__webpack_require__.s = 63);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -2698,7 +2698,7 @@ module.exports = require("json-bigint");
 
 /***/ }),
 
-/***/ 61:
+/***/ 63:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/lib/toolbar.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 77);
+/******/ 	return __webpack_require__(__webpack_require__.s = 79);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -192,7 +192,7 @@ function normalizeComponent(
 
 /***/ }),
 
-/***/ 77:
+/***/ 79:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/lib/tree-group.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 63);
+/******/ 	return __webpack_require__(__webpack_require__.s = 65);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -2698,7 +2698,7 @@ module.exports = require("json-bigint");
 
 /***/ }),
 
-/***/ 63:
+/***/ 65:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/lib/tree.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 62);
+/******/ 	return __webpack_require__(__webpack_require__.s = 64);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -2698,7 +2698,7 @@ module.exports = require("json-bigint");
 
 /***/ }),
 
-/***/ 62:
+/***/ 64:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/lib/upload.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 36);
+/******/ 	return __webpack_require__(__webpack_require__.s = 38);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -2677,15 +2677,15 @@ module.exports = require("qs");
 
 /***/ }),
 
-/***/ 36:
+/***/ 38:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/upload/src/main.vue?vue&type=template&id=a8255544&
-var mainvue_type_template_id_a8255544_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/upload/src/main.vue?vue&type=template&id=5c1d17da&
+var mainvue_type_template_id_5c1d17da_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -3029,10 +3029,10 @@ var mainvue_type_template_id_a8255544_render = function () {
   )
 }
 var staticRenderFns = []
-mainvue_type_template_id_a8255544_render._withStripped = true
+mainvue_type_template_id_5c1d17da_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/upload/src/main.vue?vue&type=template&id=a8255544&
+// CONCATENATED MODULE: ./packages/upload/src/main.vue?vue&type=template&id=5c1d17da&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(1);
@@ -3846,17 +3846,20 @@ var _props;
       return flag;
     },
     handleBeforeUpload: function handleBeforeUpload(file) {
+      var flag = this.isLt(file);
       if (this.portrait) {
-        var _flag = this.isLt(file);
-        if (_flag && this.beforeUpload) {
+        if (flag && this.beforeUpload) {
           return this.beforeUpload(file);
         }
-        return _flag;
+        return flag;
       }
       if (this.beforeUpload) {
-        return this.beforeUpload(file);
+        if (flag) {
+          return this.beforeUpload(file);
+        }
+        return flag;
       }
-      return this.isLt(file);
+      return flag;
     },
     handleBeforeRemove: function handleBeforeRemove(file, fileList) {
       var _this6 = this;
@@ -4052,7 +4055,7 @@ var componentNormalizer = __webpack_require__(2);
 
 var component = Object(componentNormalizer["a" /* default */])(
   src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_a8255544_render,
+  mainvue_type_template_id_5c1d17da_render,
   staticRenderFns,
   false,
   null,

package/lib/wujie.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 65);
+/******/ 	return __webpack_require__(__webpack_require__.s = 67);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -2698,7 +2698,7 @@ module.exports = require("json-bigint");
 
 /***/ }),
 
-/***/ 65:
+/***/ 67:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/lib/wxlogin.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 66);
+/******/ 	return __webpack_require__(__webpack_require__.s = 68);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -2698,7 +2698,7 @@ module.exports = require("json-bigint");
 
 /***/ }),
 
-/***/ 66:
+/***/ 68:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.4.41",
+  "version": "0.4.43",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [
@@ -61,6 +61,8 @@
     "qrcode": "^1.5.1",
     "qs": "^6.11.2",
     "runtime-import": "^2.2.1",
+    "slate": "^0.100.0",
+    "slate-history": "^0.100.0",
     "sm-crypto": "^0.3.11",
     "sockjs-client": "^1.6.1",
     "stompjs": "^2.3.3",

package/packages/editor/src/editor.vue

@@ -1,16 +1,21 @@
 <template>
-  <div class="es-editor-main"></div>
+  <el-scrollbar class="es-editor-main-box" :style="_style" ref="scrollbar">
+    <div class="es-editor-main es-editor-contents" v-html="value"></div>
+  </el-scrollbar>
 </template>
 <script>
 export default {
   name: 'Editors',
   props: {
-    tags: Array,
-    fontSizes: Array,
-    fontFamilys: Array,
-    lineHeights: Array
+    value: String,
+    height: [String, Number]
+  },
+  computed: {
+    _style() {
+      let height = this.height ? parseInt(this.height, 10) + 'px' : '500px';
+      return { height };
+    }
   },
-  computed: {},
   data() {
     return {};
   },

package/packages/editor/src/main.vue

@@ -7,7 +7,10 @@
       v-html="model"
     ></div>
     <template v-else>
-      <Toolbars v-if="cs"></Toolbars>
+      <template v-if="cs">
+        <Toolbars></Toolbars>
+        <Editors v-model="model"></Editors>
+      </template>
       <template v-else>
         <Toolbar
           class="es-editor-toolbar"
@@ -28,12 +31,15 @@
   </div>
 </template>
 <script>
+import { createEditor } from 'slate';
+import { withHistory } from 'slate-history';
 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 },
+  components: { Editor, Toolbar, Toolbars, Editors },
   inject: {
     elForm: {
       default: ''
@@ -88,7 +94,10 @@ export default {
       editor: null
     };
   },
-  mounted() {},
+  mounted() {
+    let editor = withHistory(createEditor());
+    console.log(editor);
+  },
   methods: {
     onCreated(editor) {
       this.editor = Object.seal(editor);

package/packages/flow/src/processForm.vue

@@ -386,6 +386,7 @@ export default {
   mounted() {
     this.getStartFlow(this.processDefinitionId);
     this.newOpinion = this.opinion;
+
   },
   methods: {
     getIsShowNextUser(val) {
@@ -542,7 +543,6 @@ export default {
           if (noticeType) {
             newNoticeType = noticeType.join(',');
           }
-
           let params = {
             processDefinitionId: this.processDefinitionId,
             nextUserId: this.multiple ? newNextUser.join(',') : nextUser,
@@ -566,7 +566,7 @@ export default {
               this.mixPresetList && this.mixPresetList.length > 0
                 ? this.mixPresetList.join('|')
                 : presetReadUserId.join(','),
-            opinion: newOpinion
+            opinion: this.newOpinion || newOpinion
           };
           if (this.activeNames != '1') delete params.customPresetUserJson;
           util

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

@@ -399,7 +399,7 @@ export default {
         url: pressListJson,
         params: { historyId },
         method: 'POST',
-        data: { page: currentPage, rows: pageSize, sidx, sord }
+        data: { page: currentPage, rows: pageSize, sidx, sord,historyId }
       };
       util
         .ajax(params)

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

@@ -3,7 +3,7 @@
     <img :src="headImg" class="es-user-img" @click="handleClick" />
     <div class="es-user-info" v-if="user">
       <div class="es-user-name">{{ user.username || user.userName }}</div>
-      <template v-if="user.identityList.length">
+      <template v-if="user.identityList && user.identityList.length">
         <div
           v-if="user.identityList.length < 2"
           class="es-user-job"
@@ -63,7 +63,7 @@ export default {
       immediate: true,
       deep: true,
       handler(val) {
-        if (val) {
+        if (val && val.identityList) {
           this.job = val.identityList.filter((item) => {
             return item.id === val.identityId;
           })[0];

package/packages/theme-chalk/lib/editor.css

@@ -1 +1 @@
-@charset "UTF-8";.es-editor{border:1px solid #d9d9d9}.es-editor .es-editor-toolbar{position:relative;display:-webkit-box;display:-ms-flexbox;display:flex;padding:0 4px;-ms-flex-wrap:wrap;flex-wrap:wrap;border-bottom:1px solid #d9d9d9}.es-editor .es-editor-toolbar .es-editor-toolbar-item-box{height:40px;display:-webkit-inline-box;display:-ms-inline-flexbox;display:inline-flex}.es-editor .es-editor-toolbar .es-editor-toolbar-item-box+.es-editor-toolbar-item-box .es-editor-toolbar-item:first-child{border-left:1px solid #d9d9d9}.es-editor .es-editor-toolbar .es-editor-toolbar-item{height:40px;padding:4px}.es-editor .es-editor-toolbar .es-editor-toolbar-item.es-last{border-right:1px solid #d9d9d9}.es-editor .es-editor-toolbar .es-editor-toolbar-item .es-icon-text+.el-icon--right{width:auto}.es-editor .es-editor-toolbar .el-button--default{border:0;color:#595959}.es-editor .es-editor-toolbar .el-button--default:hover{color:#333;background-color:#f1f1f1}.es-editor .es-editor-toolbar .el-button--default.es-icon-right{padding-right:3px}.es-editor .es-editor-main{overflow:hidden}.es-icon-svg{width:14px;height:14px;fill:#595959;position:relative;top:3px}.es-icon-svg+.el-icon--right{width:auto}.es-editor-color li{border-radius:3px;cursor:pointer;display:inline-block;padding:2px;border:1px solid transparent}.es-editor-color li.active,.es-editor-color li:hover{border-color:#d9d9d9}.es-editor-color li .es-editor-color-block{border:1px solid #d9d9d9;height:17px;width:17px;border-radius:3px}.es-editor-color .es-editor-color-clear{line-height:1.5;margin-bottom:5px;width:100%}.es-editor-dropdown-item:not(.is-disabled).active{background-color:rgba(0,0,0,.04);color:#69c0ff}
+@charset "UTF-8";.es-editor{border:1px solid #d9d9d9}.es-editor .es-editor-toolbar{position:relative;display:-webkit-box;display:-ms-flexbox;display:flex;padding:0 4px;-ms-flex-wrap:wrap;flex-wrap:wrap;border-bottom:1px solid #d9d9d9}.es-editor .es-editor-toolbar .es-editor-toolbar-item-box{height:40px;display:-webkit-inline-box;display:-ms-inline-flexbox;display:inline-flex}.es-editor .es-editor-toolbar .es-editor-toolbar-item-box+.es-editor-toolbar-item-box .es-editor-toolbar-item:first-child{border-left:1px solid #d9d9d9}.es-editor .es-editor-toolbar .es-editor-toolbar-item{height:40px;padding:4px}.es-editor .es-editor-toolbar .es-editor-toolbar-item.es-last{border-right:1px solid #d9d9d9}.es-editor .es-editor-toolbar .es-editor-toolbar-item .es-icon-text+.el-icon--right{width:auto}.es-editor .es-editor-toolbar .el-button--default{border:0;color:#595959}.es-editor .es-editor-toolbar .el-button--default:hover{color:#333;background-color:#f1f1f1}.es-editor .es-editor-toolbar .el-button--default.es-icon-right{padding-right:3px}.es-editor .es-editor-main{overflow:hidden;padding:0 12px}.es-icon-svg{width:14px;height:14px;fill:#595959;position:relative;top:3px}.es-icon-svg+.el-icon--right{width:auto}.es-editor-color li{border-radius:3px;cursor:pointer;display:inline-block;padding:2px;border:1px solid transparent}.es-editor-color li.active,.es-editor-color li:hover{border-color:#d9d9d9}.es-editor-color li .es-editor-color-block{border:1px solid #d9d9d9;height:17px;width:17px;border-radius:3px}.es-editor-color .es-editor-color-clear{line-height:1.5;margin-bottom:5px;width:100%}.es-editor-dropdown-item:not(.is-disabled).active{background-color:rgba(0,0,0,.04);color:#69c0ff}.es-editor-contents p{margin:12px 0;line-height:1.5}