mooho-base-admin-plus 2.10.61 → 2.10.63

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mooho-base-admin-plus",
   "description": "MOOHO basic framework for admin by Vue3",
-  "version": "2.10.61",
+  "version": "2.10.63",
   "author": "jinyifan <jinyifan@mooho.com.cn>",
   "license": "MIT",
   "private": false,

package/public/setting.js

@@ -96,5 +96,12 @@ window.setting = {
     auto: true,
     // 切换语言时是否刷新页面
     refresh: true
+  },
+  /**
+   * 加密配置
+   * */
+  encrypt: {
+    // 是否开启密码加密，开启后，登录、修改密码等操作，都需要进行密码加密处理
+    passwordEncrypt: false
   }
 };

package/src/api/user.js

@@ -1,5 +1,6 @@
 import request from '../libs/request';
 import encrypt from '../libs/encrypt';
+import Setting from '../setting.js';
 
 const res = 'User';
 
@@ -14,7 +15,10 @@ export default {
     });
   },
   login(data) {
-    data.password = encrypt(data.password);
+    if (Setting.encrypt.passwordEncrypt) {
+      data.password = encrypt(data.password);
+    }
+
     return request({
       url: `api/${res}/login`,
       method: 'post',
@@ -31,8 +35,11 @@ export default {
     });
   },
   updatePassword(data) {
-    data.oldPassword = encrypt(data.oldPassword);
-    data.newPassword = encrypt(data.newPassword);
+    if (Setting.encrypt.passwordEncrypt) {
+      data.oldPassword = encrypt(data.oldPassword);
+      data.newPassword = encrypt(data.newPassword);
+    }
+
     return request({
       url: `api/${res}/updatePassword`,
       method: 'post',

package/src/components/view/mixin.js

@@ -108,15 +108,31 @@ export default {
       let data = {};
       this.columns.forEach(item => {
         if (item.defaultValue) {
-          if (item.defaultValue == '{today}') {
+          if (item.defaultValue.startsWith('{today}')) {
             // 当前日期
             let date = new Date();
+
+            if (item.defaultValue.indexOf('+') != -1) {
+              date.setDate(date.getDate() + parseInt(item.defaultValue.split('+')[1]));
+            } else if (item.defaultValue.indexOf('-') != -1) {
+              date.setDate(date.getDate() - parseInt(item.defaultValue.split('-')[1]));
+            }
+
             let value = date.toISOString().replace(/T.*/, '');
             setData(data, item, new Date(value));
-          } else if (item.defaultValue.startsWith('{today(') && item.defaultValue.endsWith(')}')) {
-            // 当前时间转字符串
-            let format = item.defaultValue.substr(7, item.defaultValue.length - 9);
-            setData(data, item, dateFormat(new Date(), format));
+          } else if (item.defaultValue.startsWith('{today(')) {
+            // 当前日期
+            let date = new Date();
+
+            if (item.defaultValue.indexOf('+') != -1) {
+              date.setDate(date.getDate() + parseInt(item.defaultValue.split('+')[1]));
+            } else if (item.defaultValue.indexOf('-') != -1) {
+              date.setDate(date.getDate() - parseInt(item.defaultValue.split('-')[1]));
+            }
+
+            let format = item.defaultValue.substr(7, item.defaultValue.indexOf(')}') - 7);
+
+            setData(data, item, dateFormat(date, format));
           } else if (item.defaultValue == '{currentUserID}') {
             // 当前用户编号
             setData(data, item, this.info.id);

package/src/components/workflow/flow-chart.vue

@@ -22,25 +22,25 @@
           @mousemove="mousemove"
         >
           <defs>
-            <symbol id="iconUser" viewBox="0 0 1024 1024">
+            <symbol :id="'iconUser_' + id" viewBox="0 0 1024 1024">
               <path
                 d="M908 799.542857a427.428571 427.428571 0 0 0-92.114286-136.571428 429.291429 429.291429 0 0 0-136.571428-92.114286c-0.457143-0.228571-0.914286-0.342857-1.371429-0.571429C749.142857 518.857143 795.428571 435.085714 795.428571 340.571429c0-156.571429-126.857143-283.428571-283.428571-283.428572S228.571429 184 228.571429 340.571429c0 94.514286 46.285714 178.285714 117.485714 229.828571-0.457143 0.228571-0.914286 0.342857-1.371429 0.571429-51.2 21.6-97.142857 52.571429-136.571428 92.114285a429.291429 429.291429 0 0 0-92.114286 136.571429A424.8 424.8 0 0 0 82.285714 957.485714a9.142857 9.142857 0 0 0 9.142857 9.371429h68.571429c5.028571 0 9.028571-4 9.142857-8.914286 2.285714-88.228571 37.714286-170.857143 100.342857-233.485714 64.8-64.8 150.857143-100.457143 242.514286-100.457143s177.714286 35.657143 242.514286 100.457143C817.142857 787.085714 852.571429 869.714286 854.857143 957.942857c0.114286 5.028571 4.114286 8.914286 9.142857 8.914286h68.571429a9.142857 9.142857 0 0 0 9.142857-9.371429c-1.142857-54.628571-12.457143-107.771429-33.714286-157.942857zM512 537.142857c-52.457143 0-101.828571-20.457143-138.971429-57.6S315.428571 393.028571 315.428571 340.571429c0-52.457143 20.457143-101.828571 57.6-138.971429S459.542857 144 512 144s101.828571 20.457143 138.971429 57.6S708.571429 288.114286 708.571429 340.571429c0 52.457143-20.457143 101.828571-57.6 138.971428S564.457143 537.142857 512 537.142857z"
               ></path>
             </symbol>
-            <symbol id="iconApi" viewBox="0 0 1024 1024">
+            <symbol :id="'iconApi_' + id" viewBox="0 0 1024 1024">
               <path
                 d="M975.657143 96.914286l-48.457143-48.457143c-1.828571-1.828571-4.114286-2.628571-6.514286-2.628572s-4.685714 0.914286-6.514285 2.628572l-86.971429 86.971428a227.737143 227.737143 0 0 0-128.114286-39.2c-58.514286 0-117.028571 22.285714-161.714285 66.971429L420.914286 279.657143a9.177143 9.177143 0 0 0 0 12.914286L731.428571 603.085714c1.828571 1.828571 4.114286 2.628571 6.514286 2.628572 2.285714 0 4.685714-0.914286 6.514286-2.628572l116.457143-116.457143c78.742857-78.857143 88-200.8 27.771428-289.714285l86.971429-86.971429c3.542857-3.657143 3.542857-9.485714 0-13.028571zM805.828571 431.657143l-67.885714 67.885714-213.485714-213.485714 67.885714-67.885714c28.457143-28.457143 66.4-44.228571 106.742857-44.228572 40.342857 0 78.171429 15.657143 106.742857 44.228572 28.457143 28.457143 44.228571 66.4 44.228572 106.742857 0 40.342857-15.771429 78.171429-44.228572 106.742857z m-217.371428 120a9.177143 9.177143 0 0 0-12.914286 0L499.428571 627.771429 396.228571 524.571429l76.228572-76.228572c3.542857-3.542857 3.542857-9.371429 0-12.914286L430.857143 393.828571a9.177143 9.177143 0 0 0-12.914286 0L341.714286 470.057143l-49.142857-49.142857a8.971429 8.971429 0 0 0-6.514286-2.628572c-2.285714 0-4.685714 0.914286-6.514286 2.628572L163.2 537.371429c-78.742857 78.857143-88 200.8-27.771429 289.714285l-86.971428 86.971429a9.177143 9.177143 0 0 0 0 12.914286l48.457143 48.457142c1.828571 1.828571 4.114286 2.628571 6.514285 2.628572s4.685714-0.914286 6.514286-2.628572l86.971429-86.971428c38.514286 26.171429 83.314286 39.2 128.114285 39.2 58.514286 0 117.028571-22.285714 161.714286-66.971429l116.457143-116.457143c3.542857-3.542857 3.542857-9.371429 0-12.914285l-49.142857-49.142857 76.228571-76.228572c3.542857-3.542857 3.542857-9.371429 0-12.914286l-41.828571-41.371428zM431.657143 805.828571a150.08 150.08 0 0 1-106.742857 44.228572c-40.342857 0-78.171429-15.657143-106.742857-44.228572a150.08 150.08 0 0 1-44.228572-106.742857c0-40.342857 15.657143-78.171429 44.228572-106.742857l67.885714-67.885714 213.485714 213.485714-67.885714 67.885714z"
               ></path>
             </symbol>
-            <marker id="arrowStart" markerWidth="10" markerHeight="10" refX="2" refY="2" orient="auto">
+            <marker :id="'arrowStart_' + id" markerWidth="10" markerHeight="10" refX="2" refY="2" orient="auto">
               <circle cx="2" cy="2" r="2" fill="#000" />
             </marker>
-            <marker id="arrowEnd" markerWidth="10" markerHeight="10" refX="6" refY="2" orient="auto">
+            <marker :id="'arrowEnd_' + id" markerWidth="10" markerHeight="10" refX="6" refY="2" orient="auto">
               <path d="M0,0 L0,4 L6,2 Z" style="fill: #000" />
             </marker>
-            <path v-for="(item, index) in data.outcomes" :key="index" :id="'outcome_' + item.pid" :d="getOutcomPath(item)" />
+            <path v-for="(item, index) in data.outcomes" :key="index" :id="'outcome_' + id + '_' + item.pid" :d="getOutcomPath(item)" />
           </defs>
-          <rect fill="#ddd" stroke-width="0" rx="0" stroke="#000" :x="10" :y="10" :width="30 * 2 + setting.rectWidth" :height="630"></rect>
+          <rect v-if="!readonly" fill="#ddd" stroke-width="0" rx="0" stroke="#000" :x="10" :y="10" :width="30 * 2 + setting.rectWidth" :height="630"></rect>
           <!-- 开始 -->
           <template v-for="(item, index) in displayActivities" :key="index">
             <template v-if="item.activityType === 'Begin'">
@@ -99,7 +99,7 @@
             <!-- 交互 -->
             <template v-else-if="item.activityType === 'Interactive'">
               <rect
-                fill="#fff"
+                :fill="getColor(item)"
                 stroke-width="2"
                 rx="5"
                 stroke="#000"
@@ -113,7 +113,7 @@
                 :y="item.y - setting.rectHeight / 2 + 2"
                 :width="setting.rectHeight / 3"
                 :height="setting.rectHeight / 3"
-                href="#iconUser"
+                :href="'#iconUser_' + id"
               ></use>
               <text fill="#000" :x="item.x" :y="item.y" :font-size="setting.rectFontSize" text-anchor="middle" dominant-baseline="middle">
                 {{ item.name }}
@@ -200,7 +200,7 @@
                 :y="item.y - setting.rectHeight / 2 + 2"
                 :width="setting.rectHeight / 3"
                 :height="setting.rectHeight / 3"
-                href="#iconApi"
+                :href="'#iconApi_' + id"
               ></use>
               <text fill="#000" :x="item.x" :y="item.y" :font-size="setting.rectFontSize" text-anchor="middle" dominant-baseline="middle">
                 {{ item.name }}
@@ -306,7 +306,7 @@
               />
             </template>
             <text fill="#000" :font-size="setting.lineFontSize" text-anchor="middle" :dominant-baseline="'text-after-edge'" @dblclick="dblclickOutcome(item, index)">
-              <textPath :href="'#outcome_' + item.pid" startOffset="50%">
+              <textPath :href="'#outcome_' + id + '_' + item.pid" startOffset="50%">
                 {{ item.name }}
               </textPath>
             </text>
@@ -318,16 +318,16 @@
             :x2="current.x"
             :y2="current.y"
             style="stroke: rgb(0, 0, 0); stroke-width: 2; pointer-events: none"
-            marker-start="url(#arrowStart)"
-            marker-end="url(#arrowEnd)"
+            :marker-start="'url(#arrowStart_' + id + ')'"
+            :marker-end="'url(#arrowEnd_' + id + ')'"
           ></line>
         </svg>
       </div>
       <template #footer>
         <div>
           <slot name="footer">
-            <Button type="primary" custom-icon="fa fa-save" @click="save">{{ $t('Front_Btn_Save') }}</Button>
-            <Button type="primary" custom-icon="fa fa-upload" @click="publish">{{ $t('Front_Btn_Publish') }}</Button>
+            <Button v-if="!readonly" type="primary" custom-icon="fa fa-save" @click="save">{{ $t('Front_Btn_Save') }}</Button>
+            <Button v-if="!readonly" type="primary" custom-icon="fa fa-upload" @click="publish">{{ $t('Front_Btn_Publish') }}</Button>
           </slot>
           <Button type="default" custom-icon="fa fa-times" @click="close">{{ $t('Front_Btn_Close') }}</Button>
         </div>
@@ -405,6 +405,8 @@
     props: {},
     data() {
       return {
+        id: null,
+        readonly: null,
         opened: false,
         current: {},
         offset: {},
@@ -430,7 +432,12 @@
     },
     computed: {
       displayActivities() {
-        let activities = this.toolbars;
+        let activities = [];
+
+        if (!this.readonly) {
+          activities = this.toolbars;
+        }
+
         if (this.data && this.data.activities) {
           activities = activities.concat(this.data.activities);
         }
@@ -446,6 +453,7 @@
       }
     },
     async created() {
+      this.id = this.generateRandomString(10);
       this.toolbars = [];
       const src = await enumApi.query('ActivityType');
       let index = 0;
@@ -467,6 +475,12 @@
       async open(params) {
         this.opened = true;
 
+        if (params.processInstID) {
+          this.readonly = true;
+        } else {
+          this.readonly = false;
+        }
+
         const res = await processDefApi.getChart(params);
 
         this.data = res;
@@ -614,6 +628,10 @@
       },
       // 鼠标按钮在活动上按下
       mousedownActivity(activity, e) {
+        if (this.readonly) {
+          return;
+        }
+
         if (activity.isTool) {
           // 从工具栏拖动
           this.newActivity = this.copy(activity);
@@ -629,6 +647,10 @@
       },
       // 鼠标按钮在活动上抬起
       mouseupActivity(activity) {
+        if (this.readonly) {
+          return;
+        }
+
         if (this.isCreatingOutcome) {
           if (this.activityFrom.pid == activity.pid) {
             return;
@@ -658,6 +680,10 @@
       },
       // 鼠标按钮在点上按下
       mousedownPoint(outcome, point, index, e) {
+        if (this.readonly) {
+          return;
+        }
+
         this.movingOutcome = outcome;
         this.movingPointIndex = index;
 
@@ -667,6 +693,10 @@
       },
       // 鼠标按钮在点上抬起
       mouseupPoint(outcome, index) {
+        if (this.readonly) {
+          return;
+        }
+
         if (this.isCreatingOutcome) {
           if (this.activityFrom.pid == activity.pid) {
             return;
@@ -696,6 +726,10 @@
       },
       // 鼠标双击活动
       dblclickActivity(activity) {
+        if (this.readonly) {
+          return;
+        }
+
         if (!activity.isTool) {
           this.editActivity = activity;
           if (activity.activityType == 'Interactive') {
@@ -717,6 +751,10 @@
       },
       // 鼠标双击结果
       dblclickOutcome(outcome) {
+        if (this.readonly) {
+          return;
+        }
+
         this.editOutcome = this.copy(outcome);
 
         let activity = this.data.activities.find(item => {
@@ -731,6 +769,10 @@
       },
       // 鼠标按钮抬起
       mouseUp(e) {
+        if (this.readonly) {
+          return;
+        }
+
         if (this.isMoving && this.movingActivity && this.movingActivity.isTool) {
           // 从工具栏拖动
           if (e.layerX > 10 + 30 * 2 + this.setting.rectWidth + this.setting.rectWidth / 2) {
@@ -750,6 +792,10 @@
       },
       // 鼠标移动
       mousemove(e) {
+        if (this.readonly) {
+          return;
+        }
+
         this.current.x = e.offsetX;
         this.current.y = e.offsetY;
         //this.$forceUpdate();
@@ -767,16 +813,28 @@
       },
       // 鼠标移入活动中心位置
       mouseenterCenter(activity) {
+        if (this.readonly) {
+          return;
+        }
+
         if (!activity.isTool) {
           activity.activeCenter = true;
         }
       },
       // 鼠标移出活动中心位置
       mouseleaveCenter(activity) {
+        if (this.readonly) {
+          return;
+        }
+
         activity.activeCenter = false;
       },
       // 活动中心位置按下鼠标
       mousedownCenter(activity) {
+        if (this.readonly) {
+          return;
+        }
+
         if (activity.activeCenter) {
           // 添加Outcome
           this.isCreatingOutcome = true;
@@ -948,8 +1006,8 @@
             y1: d.fromPoint.y,
             x2: d.toPoint.x,
             y2: d.toPoint.y,
-            markerStart: 'url(#arrowStart)',
-            markerEnd: 'url(#arrowEnd)'
+            markerStart: 'url(#arrowStart_' + this.id + ')',
+            markerEnd: 'url(#arrowEnd_' + this.id + ')'
           });
         } else {
           // 折线
@@ -964,7 +1022,7 @@
               y1: start.y,
               x2: point.x,
               y2: point.y,
-              markerStart: i == 0 ? 'url(#arrowStart)' : null
+              markerStart: i == 0 ? 'url(#arrowStart_' + this.id + ')' : null
             });
 
             i++;
@@ -976,7 +1034,7 @@
             y1: start.y,
             x2: d.toPoint.x,
             y2: d.toPoint.y,
-            markerEnd: 'url(#arrowEnd)'
+            markerEnd: 'url(#arrowEnd_' + this.id + ')'
           });
         }
 
@@ -991,6 +1049,36 @@
           // 折线
           return JSON.parse(outcome.points);
         }
+      },
+      generateRandomString(length) {
+        const characters = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+        let result = '';
+        for (let i = 0; i < length; i++) {
+          const randomIndex = Math.floor(Math.random() * characters.length);
+          result += characters[randomIndex];
+        }
+        return result;
+      },
+      getColor(activity) {
+        if (!this.data.processInst || (this.data.processInst.status != 'InProcess' && this.data.processInst.status != 'Finished')) {
+          return '#fff';
+        }
+
+        let activityInst = this.data.activityInsts.find(item => item.activityID == activity.id);
+
+        if (activityInst == null) {
+          return '#fff';
+        } else if (activityInst.status == 'Pending') {
+          return '#ff9900';
+        } else if (activityInst.status == 'Finished') {
+          return '#8ecb30';
+        } else if (activityInst.status == 'Closed') {
+          return 'gray';
+        } else if (activityInst.status == 'Pass') {
+          return 'gray';
+        }
+
+        return '#fff';
       }
     }
   };

package/src/components/workflow/task-form.vue

@@ -42,6 +42,7 @@
           <Button type="primary" v-if="isRedirectable" custom-icon="fa fa-share" @click="$refs.redirectTaskForm.open()">{{ $t('Front_Btn_Redirect') }}</Button>
           <Button type="primary" v-if="isRecallable" custom-icon="fa fa-reply-all" @click="recall()">{{ $t('Front_Btn_Recall') }}</Button>
           <Button type="primary" v-if="isMessageEnable" custom-icon="fa fa-comment-dots" @click="openMessage()">{{ $t('Front_Btn_Leave_Message') }}</Button>
+          <Button type="info" custom-icon="fa fa-route" @click="$refs.flowChart.open({ processInstID: task.processInstID })">{{ $t('Front_Btn_Process') }}</Button>
           <Button type="info" custom-icon="fa fa-history" @click="$refs.approvalHistoryTable.open({ processInstID: task.processInstID })">{{ $t('Front_Btn_History') }}</Button>
           <Button type="default" custom-icon="fa fa-times" @click="opened = false">{{ $t('Front_Btn_Close') }}</Button>
         </div>
@@ -85,11 +86,13 @@
         <Button type="default" custom-icon="fa fa-times" @click="messageOpened = false">{{ $t('Front_Btn_Close') }}</Button>
       </template>
     </Modal>
+    <flow-chart ref="flowChart" />
   </div>
 </template>
 <script>
   import { markRaw } from 'vue';
   import mixinPage from '../../mixins/page';
+  import flowChart from '../../components/workflow/flow-chart.vue';
   import customModelApi from '../../api/customModel';
   import processInstApi from '../../api/processInst';
   import modelApi from '../../api/model';
@@ -97,7 +100,7 @@
 
   export default {
     mixins: [mixinPage],
-    components: {},
+    components: { flowChart },
     data() {
       return {
         task: null,

package/src/i18n/locale/en-US.js

@@ -1 +1 @@
-import{s as e}from"./lang.js";const t={i:{locale:"en-US",select:{placeholder:"Select",noMatch:"No matching data",loading:"Loading"},table:{noDataText:"No Data",noFilteredDataText:"No filter data",confirmFilter:"Confirm",resetFilter:"Reset",clearFilter:"All",sumText:"Sum"},datepicker:{selectDate:"Select date",selectTime:"Select time",startTime:"Start Time",endTime:"End Time",clear:"Clear",ok:"OK",datePanelLabel:"[mmmm] [yyyy]",month:"Month",month1:"January",month2:"February",month3:"March",month4:"April",month5:"May",month6:"June",month7:"July",month8:"August",month9:"September",month10:"October",month11:"November",month12:"December",year:"Year",weekStartDay:"0",weeks:{sun:"Sun",mon:"Mon",tue:"Tue",wed:"Wed",thu:"Thu",fri:"Fri",sat:"Sat"},months:{m1:"Jan",m2:"Feb",m3:"Mar",m4:"Apr",m5:"May",m6:"Jun",m7:"Jul",m8:"Aug",m9:"Sep",m10:"Oct",m11:"Nov",m12:"Dec"}},transfer:{titles:{source:"Source",target:"Target"},filterPlaceholder:"Search here",notFoundText:"Not Found"},modal:{okText:"OK",cancelText:"Cancel"},poptip:{okText:"OK",cancelText:"Cancel"},page:{prev:"Previous Page",next:"Next Page",total:"Total",item:"item",items:"items",prev5:"Previous 5 Pages",next5:"Next 5 Pages",page:"/page",goto:"Goto",p:""},rate:{star:"Star",stars:"Stars"},time:{before:" ago",after:" after",just:"just now",seconds:" seconds",minutes:" minutes",hours:" hours",days:" days"},tree:{emptyText:"No Data"}}};e(t);export{t as default};
+import{s as e}from"./lang.js";const t={i:{locale:"en-US",select:{placeholder:"Select",noMatch:"No matching data",loading:"Loading"},table:{noDataText:"No Data",noFilteredDataText:"No filter data",confirmFilter:"Confirm",resetFilter:"Reset",clearFilter:"All",sumText:"Sum"},datepicker:{selectDate:"Select date",selectTime:"Select time",startTime:"Start Time",endTime:"End Time",clear:"Clear",ok:"OK",datePanelLabel:"[mmmm] [yyyy]",month:"Month",month1:"January",month2:"February",month3:"March",month4:"April",month5:"May",month6:"June",month7:"July",month8:"August",month9:"September",month10:"October",month11:"November",month12:"December",year:"Year",weekStartDay:"0",weeks:{sun:"Sun",mon:"Mon",tue:"Tue",wed:"Wed",thu:"Thu",fri:"Fri",sat:"Sat"},months:{m1:"Jan",m2:"Feb",m3:"Mar",m4:"Apr",m5:"May",m6:"Jun",m7:"Jul",m8:"Aug",m9:"Sep",m10:"Oct",m11:"Nov",m12:"Dec"}},transfer:{titles:{source:"Source",target:"Target"},filterPlaceholder:"Search here",notFoundText:"Not Found"},modal:{okText:"OK",cancelText:"Cancel"},poptip:{okText:"OK",cancelText:"Cancel"},page:{prev:"Previous Page",next:"Next Page",total:"Total",item:"item",items:"items",prev5:"Previous 5 Pages",next5:"Next 5 Pages",page:"/page",goto:"Goto",p:""},rate:{star:"Star",stars:"Stars"},time:{before:" ago",after:" after",just:"just now",seconds:" seconds",minutes:" minutes",hours:" hours",days:" days"},tree:{emptyText:"No Data"}}};e(t);export{t as default};

package/src/i18n/locale/lang.js

@@ -1 +1 @@
-const e=typeof window!="undefined";function n(i){e&&typeof window.viewuiplus!="undefined"&&("langs"in viewuiplus||(viewuiplus.langs={}),viewuiplus.langs[i.i.locale]=i)}export{n as s};
+const e=typeof window!="undefined";function n(i){e&&typeof window.viewuiplus!="undefined"&&("langs"in viewuiplus||(viewuiplus.langs={}),viewuiplus.langs[i.i.locale]=i)}export{n as s};

package/src/i18n/locale/zh-CN.js

@@ -1 +1 @@
-import{s as e}from"./lang.js";const t={i:{locale:"zh-CN",select:{placeholder:"\u8BF7\u9009\u62E9",noMatch:"\u65E0\u5339\u914D\u6570\u636E",loading:"\u52A0\u8F7D\u4E2D"},table:{noDataText:"\u6682\u65E0\u6570\u636E",noFilteredDataText:"\u6682\u65E0\u7B5B\u9009\u7ED3\u679C",confirmFilter:"\u7B5B\u9009",resetFilter:"\u91CD\u7F6E",clearFilter:"\u5168\u90E8",sumText:"\u5408\u8BA1"},datepicker:{selectDate:"\u9009\u62E9\u65E5\u671F",selectTime:"\u9009\u62E9\u65F6\u95F4",startTime:"\u5F00\u59CB\u65F6\u95F4",endTime:"\u7ED3\u675F\u65F6\u95F4",clear:"\u6E05\u7A7A",ok:"\u786E\u5B9A",datePanelLabel:"[yyyy\u5E74] [m\u6708]",month:"\u6708",month1:"1 \u6708",month2:"2 \u6708",month3:"3 \u6708",month4:"4 \u6708",month5:"5 \u6708",month6:"6 \u6708",month7:"7 \u6708",month8:"8 \u6708",month9:"9 \u6708",month10:"10 \u6708",month11:"11 \u6708",month12:"12 \u6708",year:"\u5E74",weekStartDay:"0",weeks:{sun:"\u65E5",mon:"\u4E00",tue:"\u4E8C",wed:"\u4E09",thu:"\u56DB",fri:"\u4E94",sat:"\u516D"},months:{m1:"1\u6708",m2:"2\u6708",m3:"3\u6708",m4:"4\u6708",m5:"5\u6708",m6:"6\u6708",m7:"7\u6708",m8:"8\u6708",m9:"9\u6708",m10:"10\u6708",m11:"11\u6708",m12:"12\u6708"}},transfer:{titles:{source:"\u6E90\u5217\u8868",target:"\u76EE\u7684\u5217\u8868"},filterPlaceholder:"\u8BF7\u8F93\u5165\u641C\u7D22\u5185\u5BB9",notFoundText:"\u5217\u8868\u4E3A\u7A7A"},modal:{okText:"\u786E\u5B9A",cancelText:"\u53D6\u6D88"},poptip:{okText:"\u786E\u5B9A",cancelText:"\u53D6\u6D88"},page:{prev:"\u4E0A\u4E00\u9875",next:"\u4E0B\u4E00\u9875",total:"\u5171",item:"\u6761",items:"\u6761",prev5:"\u5411\u524D 5 \u9875",next5:"\u5411\u540E 5 \u9875",page:"\u6761/\u9875",goto:"\u8DF3\u81F3",p:"\u9875"},rate:{star:"\u661F",stars:"\u661F"},time:{before:"\u524D",after:"\u540E",just:"\u521A\u521A",seconds:"\u79D2",minutes:"\u5206\u949F",hours:"\u5C0F\u65F6",days:"\u5929"},tree:{emptyText:"\u6682\u65E0\u6570\u636E"}}};e(t);export{t as default};
+import{s as e}from"./lang.js";const t={i:{locale:"zh-CN",select:{placeholder:"\u8BF7\u9009\u62E9",noMatch:"\u65E0\u5339\u914D\u6570\u636E",loading:"\u52A0\u8F7D\u4E2D"},table:{noDataText:"\u6682\u65E0\u6570\u636E",noFilteredDataText:"\u6682\u65E0\u7B5B\u9009\u7ED3\u679C",confirmFilter:"\u7B5B\u9009",resetFilter:"\u91CD\u7F6E",clearFilter:"\u5168\u90E8",sumText:"\u5408\u8BA1"},datepicker:{selectDate:"\u9009\u62E9\u65E5\u671F",selectTime:"\u9009\u62E9\u65F6\u95F4",startTime:"\u5F00\u59CB\u65F6\u95F4",endTime:"\u7ED3\u675F\u65F6\u95F4",clear:"\u6E05\u7A7A",ok:"\u786E\u5B9A",datePanelLabel:"[yyyy\u5E74] [m\u6708]",month:"\u6708",month1:"1 \u6708",month2:"2 \u6708",month3:"3 \u6708",month4:"4 \u6708",month5:"5 \u6708",month6:"6 \u6708",month7:"7 \u6708",month8:"8 \u6708",month9:"9 \u6708",month10:"10 \u6708",month11:"11 \u6708",month12:"12 \u6708",year:"\u5E74",weekStartDay:"0",weeks:{sun:"\u65E5",mon:"\u4E00",tue:"\u4E8C",wed:"\u4E09",thu:"\u56DB",fri:"\u4E94",sat:"\u516D"},months:{m1:"1\u6708",m2:"2\u6708",m3:"3\u6708",m4:"4\u6708",m5:"5\u6708",m6:"6\u6708",m7:"7\u6708",m8:"8\u6708",m9:"9\u6708",m10:"10\u6708",m11:"11\u6708",m12:"12\u6708"}},transfer:{titles:{source:"\u6E90\u5217\u8868",target:"\u76EE\u7684\u5217\u8868"},filterPlaceholder:"\u8BF7\u8F93\u5165\u641C\u7D22\u5185\u5BB9",notFoundText:"\u5217\u8868\u4E3A\u7A7A"},modal:{okText:"\u786E\u5B9A",cancelText:"\u53D6\u6D88"},poptip:{okText:"\u786E\u5B9A",cancelText:"\u53D6\u6D88"},page:{prev:"\u4E0A\u4E00\u9875",next:"\u4E0B\u4E00\u9875",total:"\u5171",item:"\u6761",items:"\u6761",prev5:"\u5411\u524D 5 \u9875",next5:"\u5411\u540E 5 \u9875",page:"\u6761/\u9875",goto:"\u8DF3\u81F3",p:"\u9875"},rate:{star:"\u661F",stars:"\u661F"},time:{before:"\u524D",after:"\u540E",just:"\u521A\u521A",seconds:"\u79D2",minutes:"\u5206\u949F",hours:"\u5C0F\u65F6",days:"\u5929"},tree:{emptyText:"\u6682\u65E0\u6570\u636E"}}};e(t);export{t as default};

package/src/pages/template/processPage.vue

@@ -82,6 +82,14 @@
         >
           {{ $t('Front_Btn_Cancel') }}
         </Button>
+        <Button
+          type="info"
+          v-if="$refs.form && $refs.form.data && $refs.form.data.application && $refs.form.data.application.processInstID"
+          custom-icon="fa fa-route"
+          @click="$refs.flowChart.open({ processInstID: $refs.form.data.application.processInstID })"
+        >
+          {{ $t('Front_Btn_Process') }}
+        </Button>
         <Button
           type="info"
           v-if="$refs.form && $refs.form.data && $refs.form.data.application && $refs.form.data.application.processInstID"
@@ -139,6 +147,14 @@
         >
           发表意见
         </Button>
+        <Button
+          type="info"
+          v-if="$refs.showForm && $refs.showForm.data && $refs.showForm.data.application && $refs.showForm.data.application.processInstID"
+          custom-icon="fa fa-route"
+          @click="$refs.flowChart.open({ processInstID: $refs.showForm.data.application.processInstID })"
+        >
+          {{ $t('Front_Btn_Process') }}
+        </Button>
         <Button
           type="info"
           v-if="$refs.showForm && $refs.showForm.data && $refs.showForm.data.application && $refs.showForm.data.application.processInstID"
@@ -182,6 +198,7 @@
         <Button type="default" custom-icon="fa fa-times" @click="messageOpened = false">{{ $t('Front_Btn_Close') }}</Button>
       </template>
     </Modal>
+    <flow-chart ref="flowChart" />
   </div>
 </template>
 <script>
@@ -190,12 +207,13 @@
   import applicationApi from '../../api/application';
   import processInstApi from '../../api/processInst';
   import mixinPage from '../../mixins/page';
+  import flowChart from '../../components/workflow/flow-chart.vue';
   import { mapActions } from 'vuex';
 
   export default {
     // name: this.$route.name,
     mixins: [mixinPage],
-    components: {},
+    components: { flowChart },
     data() {
       return {
         filter: {},

package/src/setting.js

@@ -189,6 +189,8 @@ const Setting = {
    * 加密配置
    * */
   encrypt: {
+    // 是否开启密码加密，开启后，登录、修改密码等操作，都需要进行密码加密处理
+    passwordEncrypt: true,
     // 公钥
     publicKey: `-----BEGIN PUBLIC KEY-----
     MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC6q617CxtIUoK2qzxUFDpzpLnx