eoss-ui 0.4.41 → 0.4.42

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.4.41",
+  "version": "0.4.42",
   "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"
@@ -30,10 +33,11 @@
 <script>
 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: ''

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/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}