eoss-ui 0.4.39 → 0.4.41

package/packages/editor/src/toolbar.vue

@@ -1,326 +1,115 @@
 <template>
   <div class="es-editor-toolbar">
-    <div class="es-editor-toolbar-item">
-      <el-dropdown
-        placement="bottom"
-        trigger="click"
-        @command="
-          (res) => {
-            handleCommand('tag', res);
-          }
-        "
+    <template v-for="(items, indexs) in contents">
+      <div
+        class="es-editor-toolbar-item"
+        v-for="(item, index) in items"
+        :key="indexs + '_' + index"
+        :class="{
+          'es-last': index == items.length - 1 && indexs < contents.length - 1
+        }"
       >
-        <el-tooltip
-          class="item"
-          effect="dark"
-          content="标题"
+        <el-dropdown
+          v-if="item.dropdown && item.dropdown.length"
           placement="bottom"
+          :trigger="item.trigger"
+          @command="
+            (res) => {
+              handleCommand(item.type, res);
+            }
+          "
         >
-          <el-button size="small">
-            {{ tag }}<i class="el-icon-caret-bottom el-icon--right"></i>
-          </el-button>
-        </el-tooltip>
-        <el-dropdown-menu slot="dropdown">
-          <el-dropdown-item
-            class="es-editor-dropdown-item"
-            v-for="item in _tags"
-            :class="{ active: item == tag }"
-            :key="item"
-            :command="item"
-            >{{ item }}</el-dropdown-item
-          >
-        </el-dropdown-menu>
-      </el-dropdown>
-    </div>
-    <div class="es-editor-toolbar-item">
-      <el-tooltip class="item" effect="dark" content="引用" placement="bottom">
-        <el-button size="small">
-          <svg class="es-icon-svg" viewBox="0 0 1024 1024">
-            <path
-              d="M894.6 907.1H605.4c-32.6 0-59-26.4-59-59V608.2l-4-14.9c0-315.9 125.5-485.1 376.5-507.5v59.8C752.7 180.4 711.3 315.8 711.3 442.4v41.2l31.5 12.3h151.8c32.6 0 59 26.4 59 59v293.2c0 32.5-26.4 59-59 59z m-472 0H133.4c-32.6 0-59-26.4-59-59V608.2l-4-14.9c0-315.9 125.5-485.1 376.5-507.5v59.8C280.7 180.4 239.3 315.8 239.3 442.4v41.2l31.5 12.3h151.8c32.6 0 59 26.4 59 59v293.2c0 32.5-26.4 59-59 59z"
-            ></path>
-          </svg>
-        </el-button>
-      </el-tooltip>
-    </div>
-    <div class="es-editor-toolbar-item">
-      <el-tooltip class="item" effect="dark" content="粗体" placement="bottom">
-        <div class="es-text-center" slot="content">粗体<br />ctrl+b</div>
-        <el-button size="small">
-          <svg class="es-icon-svg" viewBox="0 0 1024 1024">
-            <path
-              d="M707.872 484.64A254.88 254.88 0 0 0 768 320c0-141.152-114.848-256-256-256H192v896h384c141.152 0 256-114.848 256-256a256.096 256.096 0 0 0-124.128-219.36zM384 192h101.504c55.968 0 101.504 57.408 101.504 128s-45.536 128-101.504 128H384V192z m159.008 640H384v-256h159.008c58.464 0 106.016 57.408 106.016 128s-47.552 128-106.016 128z"
-            ></path>
-          </svg>
-        </el-button>
-      </el-tooltip>
-    </div>
-    <div class="es-editor-toolbar-item">
-      <el-tooltip
-        class="item"
-        effect="dark"
-        content="下划线"
-        placement="bottom"
-      >
-        <div class="es-text-center" slot="content">下划线 <br />ctrl+u</div>
-        <el-button size="small">
-          <svg class="es-icon-svg" viewBox="0 0 1024 1024">
-            <path
-              d="M704 64l128 0 0 416c0 159.072-143.264 288-320 288s-320-128.928-320-288l0-416 128 0 0 416c0 40.16 18.24 78.688 51.36 108.512 36.896 33.216 86.848 51.488 140.64 51.488s103.744-18.304 140.64-51.488c33.12-29.792 51.36-68.352 51.36-108.512l0-416zM192 832l640 0 0 128-640 0z"
-            ></path>
-          </svg>
-        </el-button>
-      </el-tooltip>
-    </div>
-    <div class="es-editor-toolbar-item">
-      <el-tooltip class="item" effect="dark" content="斜体" placement="bottom">
-        <div class="es-text-center" slot="content">斜体<br />ctrl+i</div>
-        <el-button size="small">
-          <svg class="es-icon-svg" viewBox="0 0 1024 1024">
-            <path
-              d="M896 64v64h-128L448 896h128v64H128v-64h128L576 128h-128V64z"
-            ></path>
-          </svg>
-        </el-button>
-      </el-tooltip>
-    </div>
-    <div class="es-editor-toolbar-item">
-      <el-dropdown
-        placement="bottom"
-        size="small"
-        @command="
-          (res) => {
-            handleCommand('tag', res);
-          }
-        "
-      >
-        <el-button size="small">
-          <svg class="es-icon-svg" viewBox="0 0 1024 1024">
-            <path
-              d="M204.8 505.6m-76.8 0a76.8 76.8 0 1 0 153.6 0 76.8 76.8 0 1 0-153.6 0Z"
-            ></path>
-            <path
-              d="M505.6 505.6m-76.8 0a76.8 76.8 0 1 0 153.6 0 76.8 76.8 0 1 0-153.6 0Z"
-            ></path>
-            <path
-              d="M806.4 505.6m-76.8 0a76.8 76.8 0 1 0 153.6 0 76.8 76.8 0 1 0-153.6 0Z"
-            ></path>
-          </svg>
-          <i class="el-icon-caret-bottom el-icon--right"></i>
-        </el-button>
-        <el-dropdown-menu slot="dropdown">
-          <el-tooltip
-            class="item"
-            effect="dark"
-            content="ctrl+shift+x"
-            placement="right"
-          >
-            <el-dropdown-item command="删除线">
-              <svg class="es-icon-svg" viewBox="0 0 1024 1024">
-                <path
-                  d="M1024 512v64h-234.496c27.52 38.496 42.496 82.688 42.496 128 0 70.88-36.672 139.04-100.576 186.976C672.064 935.488 594.144 960 512 960s-160.064-24.512-219.424-69.024C228.64 843.04 192 774.88 192 704h128c0 69.376 87.936 128 192 128s192-58.624 192-128-87.936-128-192-128H0v-64h299.52a385.984 385.984 0 0 1-6.944-5.024C228.64 459.04 192 390.88 192 320s36.672-139.04 100.576-186.976C351.936 88.512 429.856 64 512 64s160.064 24.512 219.424 69.024C795.328 180.96 832 249.12 832 320h-128c0-69.376-87.936-128-192-128s-192 58.624-192 128 87.936 128 192 128c78.976 0 154.048 22.688 212.48 64H1024z"
-                ></path>
-              </svg>
-              <span class="title">删除线</span>
-            </el-dropdown-item>
-          </el-tooltip>
           <el-tooltip
-            class="item"
+            v-if="item.tips"
             effect="dark"
-            content="ctrl+e"
-            placement="right"
+            :content="item.tips"
+            :placement="item.placement ? item.placement : 'bottom'"
           >
-            <el-dropdown-item command="行内代码">
-              <svg class="es-icon-svg" viewBox="0 0 1024 1024">
-                <path
-                  d="M576 736l96 96 320-320L672 192l-96 96 224 224zM448 288l-96-96L32 512l320 320 96-96-224-224z"
-                ></path>
+            <el-button size="small" class="es-icon-right">
+              <svg v-if="item.path" class="es-icon-svg" viewBox="0 0 1024 1024">
+                <path v-for="ele in item.path" :key="ele" :d="ele"></path>
               </svg>
-              <span class="title">行内代码</span>
-            </el-dropdown-item>
+              <span class="es-icon-text" v-else>
+                {{ item.value }}
+              </span>
+              <i class="el-icon-caret-bottom el-icon--right"></i>
+            </el-button>
           </el-tooltip>
-          <el-dropdown-item command="上标">
-            <svg class="es-icon-svg" viewBox="0 0 1024 1024">
-              <path
-                d="M768 206.016v50.016h128v64h-192V174.016l128-60V64h-128V0h192v146.016zM676 256h-136L352 444 164 256H28l256 256-256 256h136L352 580 540 768h136l-256-256z"
-              ></path>
-            </svg>
-            <span class="title">上标</span>
-          </el-dropdown-item>
-          <el-dropdown-item command="下标">
-            <svg class="es-icon-svg" viewBox="0 0 1024 1024">
-              <path
-                d="M768 910.016v50.016h128v64h-192v-146.016l128-60V768h-128v-64h192v146.016zM676 256h-136L352 444 164 256H28l256 256-256 256h136L352 580 540 768h136l-256-256z"
-              ></path>
+          <el-button size="small" class="es-icon-right" v-else>
+            <svg v-if="item.path" class="es-icon-svg" viewBox="0 0 1024 1024">
+              <path v-for="ele in item.path" :key="ele" :d="ele"></path>
             </svg>
-            <span class="title">下标</span>
-          </el-dropdown-item>
-          <el-dropdown-item command="清除格式">
-            <svg class="es-icon-svg" viewBox="0 0 1024 1024">
-              <path
-                d="M969.382408 288.738615l-319.401123-270.852152a67.074236 67.074236 0 0 0-96.459139 5.74922l-505.931379 574.922021a68.35184 68.35184 0 0 0-17.886463 47.910169 74.101061 74.101061 0 0 0 24.274486 47.910168l156.50655 132.232065h373.060512L975.131628 383.281347a67.074236 67.074236 0 0 0-5.74922-96.459139z m-440.134747 433.746725H264.144729l-90.071117-78.572676c-5.74922-5.74922-12.137243-12.137243-12.137243-17.886463a36.411728 36.411728 0 0 1 5.749221-24.274485l210.804741-240.828447 265.102932 228.691204z m-439.495945 180.781036h843.218964a60.047411 60.047411 0 1 1 0 120.733624H89.751716a60.047411 60.047411 0 1 1 0-120.733624z m0 0"
-              ></path>
-            </svg>
-            <span class="title">清除格式</span>
-          </el-dropdown-item>
-        </el-dropdown-menu>
-      </el-dropdown>
-    </div>
-    <div class="es-editor-toolbar-item">
-      <Colors @select="selectColor" tips="文字颜色"></Colors>
-    </div>
-    <div class="es-editor-toolbar-item">
-      <Colors @select="selectBgColor" tips="背景颜色" title="清除背景色">
-        <svg class="es-icon-svg" viewBox="0 0 1024 1024">
-          <path
-            d="M510.030769 315.076923l84.676923 196.923077h-177.230769l76.8-196.923077h15.753846zM945.230769 157.538462v708.923076c0 43.323077-35.446154 78.769231-78.769231 78.769231H157.538462c-43.323077 0-78.769231-35.446154-78.769231-78.769231V157.538462c0-43.323077 35.446154-78.769231 78.769231-78.769231h708.923076c43.323077 0 78.769231 35.446154 78.769231 78.769231z m-108.307692 643.938461L600.615385 216.615385c-5.907692-11.815385-15.753846-19.692308-29.538462-19.692308h-139.815385c-11.815385 0-23.630769 7.876923-27.56923 19.692308l-216.615385 584.861538c-3.938462 11.815385 3.938462 25.6 17.723077 25.6h80.738462c11.815385 0 23.630769-9.846154 27.56923-21.661538l63.015385-175.261539h263.876923l68.923077 175.261539c3.938462 11.815385 15.753846 21.661538 27.569231 21.661538h80.738461c13.784615 0 23.630769-13.784615 19.692308-25.6z"
-          ></path>
-        </svg>
-      </Colors>
-    </div>
-    <div class="es-editor-toolbar-item">
-      <el-dropdown
-        placement="bottom"
-        trigger="click"
-        @command="
-          (res) => {
-            handleCommand('size', res);
-          }
-        "
-      >
-        <el-tooltip
-          class="item"
-          effect="dark"
-          content="字号"
-          placement="bottom"
-        >
-          <el-button size="small">
-            {{ fontSize }}<i class="el-icon-caret-bottom el-icon--right"></i>
+            <span class="es-icon-text" v-else>
+              {{ item.value }}
+            </span>
+            <i class="el-icon-caret-bottom el-icon--right"></i>
           </el-button>
-        </el-tooltip>
-        <el-dropdown-menu slot="dropdown">
-          <el-dropdown-item
-            class="es-editor-dropdown-item"
-            v-for="item in _fontSizes"
-            :class="{ active: item == fontSize }"
-            :key="item"
-            :command="item"
-            >{{ item }}</el-dropdown-item
-          >
-        </el-dropdown-menu>
-      </el-dropdown>
-    </div>
-    <div class="es-editor-toolbar-item">
-      <el-dropdown
-        placement="bottom"
-        trigger="click"
-        @command="
-          (res) => {
-            handleCommand('family', res);
-          }
-        "
-      >
+          <el-dropdown-menu slot="dropdown">
+            <el-dropdown-item
+              class="es-editor-dropdown-item"
+              v-for="ele in item.dropdown"
+              :class="{ active: ele == item.value }"
+              :key="typeof ele == 'string' ? ele : ele.title"
+              :command="typeof ele == 'string' ? ele : ele.title"
+            >
+              <template v-if="typeof ele == 'string'">{{ ele }}</template>
+              <template v-else>
+                <svg
+                  v-if="ele.path"
+                  class="es-icon-svg"
+                  viewBox="0 0 1024 1024"
+                >
+                  <path v-for="path in ele.path" :key="path" :d="path"></path>
+                </svg>
+                <span class="title">{{ ele.title }}</span>
+              </template>
+            </el-dropdown-item>
+          </el-dropdown-menu>
+        </el-dropdown>
         <el-tooltip
-          class="item"
+          v-else-if="item.tips"
           effect="dark"
-          content="字体"
+          :content="item.tips"
           placement="bottom"
         >
-          <el-button size="small">
-            {{ fontFamily }}<i class="el-icon-caret-bottom el-icon--right"></i>
+          <el-button size="small" :class="{ 'es-icon-right': item.popover }">
+            <svg
+              v-if="item.path"
+              class="es-icon-svg"
+              :viewBox="item.viewBox ? item.viewBox : '0 0 1024 1024'"
+            >
+              <path v-for="ele in item.path" :key="ele" :d="ele"></path>
+            </svg>
+            <span class="es-icon-text" v-else>
+              {{ item.value }}
+            </span>
+            <i
+              v-if="item.popover"
+              class="el-icon-caret-bottom el-icon--right"
+            ></i>
           </el-button>
         </el-tooltip>
-        <el-dropdown-menu slot="dropdown">
-          <el-dropdown-item
-            class="es-editor-dropdown-item"
-            v-for="item in _fontFamilys"
-            :class="{ active: item == fontFamily }"
-            :key="item"
-            :command="item"
-            >{{ item }}</el-dropdown-item
-          >
-        </el-dropdown-menu>
-      </el-dropdown>
-    </div>
-    <div class="es-editor-toolbar-item">
-      <el-dropdown
-        placement="bottom"
-        trigger="click"
-        @command="
-          (res) => {
-            handleCommand('family', res);
-          }
-        "
-      >
-        <el-tooltip
-          class="item"
-          effect="dark"
-          content="字体"
-          placement="bottom"
+        <Colors
+          v-else-if="item.colors"
+          @select="selectColor"
+          :tips="item.colors.tips"
+          :title="item.colors.title"
         >
-          <el-button size="small">
-            {{ lineHeight }}<i class="el-icon-caret-bottom el-icon--right"></i>
-          </el-button>
-        </el-tooltip>
-        <el-dropdown-menu slot="dropdown">
-          <el-dropdown-item
-            class="es-editor-dropdown-item"
-            v-for="item in _lineHeights"
-            :class="{ active: item == lineHeight }"
-            :key="item"
-            :command="item"
-            >{{ item }}</el-dropdown-item
-          >
-        </el-dropdown-menu>
-      </el-dropdown>
-    </div>
-    <div class="es-editor-toolbar-item">
-      <el-tooltip
-        class="item"
-        effect="dark"
-        content="无序列表"
-        placement="bottom"
-      >
-        <el-button size="small">
-          <svg class="es-icon-svg" viewBox="0 0 1024 1024">
-            <path
-              d="M384 64h640v128H384V64z m0 384h640v128H384v-128z m0 384h640v128H384v-128zM0 128a128 128 0 1 1 256 0 128 128 0 0 1-256 0z m0 384a128 128 0 1 1 256 0 128 128 0 0 1-256 0z m0 384a128 128 0 1 1 256 0 128 128 0 0 1-256 0z"
-            ></path>
-          </svg>
-        </el-button>
-      </el-tooltip>
-    </div>
-    <div class="es-editor-toolbar-item">
-      <el-tooltip
-        class="item"
-        effect="dark"
-        content="有序列表"
-        placement="bottom"
-      >
-        <el-button size="small">
-          <svg class="es-icon-svg" viewBox="0 0 1024 1024">
-            <path
-              d="M384 832h640v128H384z m0-384h640v128H384z m0-384h640v128H384zM192 0v256H128V64H64V0zM128 526.016v50.016h128v64H64v-146.016l128-60V384H64v-64h192v146.016zM256 704v320H64v-64h128v-64H64v-64h128v-64H64v-64z"
-            ></path>
+          <svg class="es-icon-svg" viewBox="0 0 1024 1024" v-if="item.path">
+            <path v-for="ele in item.path" :key="ele" :d="ele"></path>
           </svg>
-        </el-button>
-      </el-tooltip>
-    </div>
+        </Colors>
+      </div>
+    </template>
   </div>
 </template>
 <script>
 import Colors from './color.vue';
+import mixin from './minx';
 export default {
   name: 'Toolbars',
   components: { Colors },
-  inject: {
-    elForm: {
-      default: ''
-    },
-    elFormItem: {
-      default: ''
-    }
-  },
+  mixins: [mixin],
   props: {
     tags: Array,
     fontSizes: Array,
@@ -394,25 +183,6 @@ export default {
           : ['默认行高'].concat(this.lineHeights);
       }
       return lineHeights;
-    },
-    contents() {
-      return [
-        [
-          { name: '正文', tips: '正文', contents: this._tags },
-          {
-            name: '引用',
-            tips: '引用',
-            path: 'M894.6 907.1H605.4c-32.6 0-59-26.4-59-59V608.2l-4-14.9c0-315.9 125.5-485.1 376.5-507.5v59.8C752.7 180.4 711.3 315.8 711.3 442.4v41.2l31.5 12.3h151.8c32.6 0 59 26.4 59 59v293.2c0 32.5-26.4 59-59 59z m-472 0H133.4c-32.6 0-59-26.4-59-59V608.2l-4-14.9c0-315.9 125.5-485.1 376.5-507.5v59.8C280.7 180.4 239.3 315.8 239.3 442.4v41.2l31.5 12.3h151.8c32.6 0 59 26.4 59 59v293.2c0 32.5-26.4 59-59 59z'
-          }
-        ],
-        [
-          {
-            name: '粗体',
-            tips: '粗体',
-            path: 'M894.6 907.1H605.4c-32.6 0-59-26.4-59-59V608.2l-4-14.9c0-315.9 125.5-485.1 376.5-507.5v59.8C752.7 180.4 711.3 315.8 711.3 442.4v41.2l31.5 12.3h151.8c32.6 0 59 26.4 59 59v293.2c0 32.5-26.4 59-59 59z m-472 0H133.4c-32.6 0-59-26.4-59-59V608.2l-4-14.9c0-315.9 125.5-485.1 376.5-507.5v59.8C280.7 180.4 239.3 315.8 239.3 442.4v41.2l31.5 12.3h151.8c32.6 0 59 26.4 59 59v293.2c0 32.5-26.4 59-59 59z'
-          }
-        ]
-      ];
     }
   },
   data() {
@@ -420,10 +190,13 @@ export default {
       tag: '正文',
       fontSize: '默认字号',
       fontFamily: '默认字体',
-      lineHeight: '默认行高'
+      lineHeight: '默认行高',
+      outdent: true
     };
   },
-  mounted() {},
+  mounted() {
+    console.log(this.contents);
+  },
   methods: {
     handleCommand(type, res) {
       switch (type) {
@@ -433,6 +206,8 @@ export default {
         case 'family':
           this.fontFamily = res;
           break;
+        case 'tag2':
+          break;
         default:
           this.tag = res;
       }
@@ -442,14 +217,8 @@ export default {
       console.log(res);
     },
     selectBgColor(res) {
-      console.log(res);
+      typeof console.log(res);
     }
-  },
-  beforeDestroy() {
-    const editor = this.editor;
-    if (editor == null) return;
-    editor.destroy(); // 组件销毁时，及时销毁编辑器
   }
 };
 </script>
-<style src="@wangeditor/editor/dist/css/style.css"></style>

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

@@ -2,7 +2,7 @@
   <div class="commonOpinion">
     <el-input
       v-model="value"
-      :disabled="isBanInputOpinion == '1'"
+      :disabled="isBanInputOpinion == '1' || disabled"
       type="textarea"
       clear="inp"
       placeholder="请输入意见"
@@ -29,6 +29,7 @@
         ></el-option>
       </el-select>
       <el-button
+        :disabled="disabled"
         slot="append"
         icon="el-icon-edit"
         @click="dialogVisible = true"
@@ -107,6 +108,7 @@ export default {
       optionList: [],
       dialogVisible: false,
       addVisible: false,
+      disabled: false,
       FormData: {
         id: null
       }
@@ -120,10 +122,19 @@ export default {
     opinion: {
       type: String,
       default: ''
+    },
+    nodeFixedOpinionSelectList: {
+      type: Array,
+      default: () => []
     }
   },
   mounted() {
-    this.getCommonOpion();
+    if (this.nodeFixedOpinionSelectList.length > 0) {
+      this.optionList = this.nodeFixedOpinionSelectList;
+      this.disabled = true;
+    } else {
+      this.getCommonOpion();
+    }
   },
   watch: {
     opinion(val) {
@@ -190,15 +201,22 @@ export default {
      * @date 2022年5月25日
      **/
     selectChange(val) {
-      const that = this
-      util.ajax({ url: findSysParam,params:{cpName:'commonOpinionsSelectType'} }).then((res) => {
-        if (res.status == 'success') {
-          res.data == 2 ? (that.value = that.value + val) : (that.value = val);
-        }else{
-          that.value = val
-        }
-        this.$emit('change', that.value);
-      });
+      const that = this;
+      util
+        .ajax({
+          url: findSysParam,
+          params: { cpName: 'commonOpinionsSelectType' }
+        })
+        .then((res) => {
+          if (res.status == 'success') {
+            res.data == 2
+              ? (that.value = that.value + val)
+              : (that.value = val);
+          } else {
+            that.value = val;
+          }
+          this.$emit('change', that.value);
+        });
     },
     /**
      * del

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

@@ -1,6 +1,6 @@
 <template>
   <el-collapse v-model="activeNames" accordion>
-    <el-collapse-item title="预设节点信息（折叠不作处理）" name="1">
+    <el-collapse-item :title="customPresetHintMessage || '预设节点信息（折叠不作处理）'" name="1">
       <div v-for="(item, index) of newPresetList" :key="index">
         <el-form-item prop="flow" :label="`➤ 节点${index + 1}`">
           <el-select
@@ -61,6 +61,10 @@ export default {
       type: String,
       default: ''
     },
+    customPresetHintMessage: {
+      type: String,
+      default: ''
+    },
     id: {
       type: String,
       default: ''

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

@@ -1,6 +1,6 @@
 <template>
   <el-collapse v-model="parserActive" accordion>
-    <el-collapse-item title="预设办理人信息" name="1">
+    <el-collapse-item :title="'预设办理人信息'" name="1">
       <div v-for="(item, index) of nodeList" :key="index">
         <el-form-item prop="flow" :label="`➤ 节点`">
           <el-select
@@ -61,6 +61,10 @@ export default {
       type: String,
       default: ''
     },
+    customPresetHintMessage: {
+      type: String,
+      default: ''
+    },
     presetTaskNodeMap: {
       type: Object,
       default: () => {}