eoss-ui 0.4.82 → 0.4.84

package/packages/form/src/main.vue

@@ -71,10 +71,10 @@
                         class="es-collapse-title-handler"
                       >
                         <es-label
+                          v-if="item.label"
                           :contents="item.label"
                           :event="item.label.event"
                           :events="item.label.events"
-                          v-if="item.label"
                         ></es-label>
                         <span v-if="item.text || item.type === 'text'">{{
                           item.text || item.contents
@@ -246,7 +246,8 @@
                         v-if="
                           item.showLabel !== false &&
                           item.type !== 'table' &&
-                          showLabel
+                          showLabel &&
+                          item.label
                         "
                         :contents="item.label"
                         :event="item.label.event"
@@ -1183,7 +1184,8 @@
                     v-if="
                       item.showLabel !== false &&
                       item.type !== 'table' &&
-                      showLabel
+                      showLabel &&
+                      item.label
                     "
                     :contents="item.label"
                     :event="item.label.event"
@@ -1983,10 +1985,10 @@
                     </template>
                     <div v-else :key="index" class="es-collapse-title-handler">
                       <es-label
+                        v-if="item.label"
                         :contents="item.label"
                         :event="item.label.event"
                         :events="item.label.events"
-                        v-if="item.label"
                       ></es-label>
                       <span v-if="item.text || item.type === 'text'">{{
                         item.text || item.contents
@@ -2148,7 +2150,8 @@
                       v-if="
                         item.showLabel !== false &&
                         item.type !== 'table' &&
-                        showLabel
+                        showLabel &&
+                        item.label
                       "
                       :contents="item.label"
                       :event="item.label.event"
@@ -3037,7 +3040,8 @@
                   v-if="
                     item.showLabel !== false &&
                     item.type !== 'table' &&
-                    showLabel
+                    showLabel &&
+                    item.label
                   "
                   :contents="item.label"
                   :event="item.label.event"

package/packages/form/src/table.vue

@@ -110,12 +110,12 @@
                 :rowspan="item.labelRow"
               >
                 <es-label
+                  v-if="item.type !== 'table' && item.label"
                   :contents="item.label"
                   :event="item.label.event"
                   :events="item.label.events"
                   :plain="item.plain"
                   :rules="item.rules"
-                  v-if="item.type !== 'table'"
                 ></es-label>
               </td>
               <td

package/packages/layout/src/item.vue

@@ -76,30 +76,41 @@ export default {
     console.log(this.position);
   },
   mounted() {
-    console.log(this.$parent.$el.offsetWidth);
+    console.log(interact.feedback);
     this.interaction = interact(this.$refs.move);
     this.interaction.draggable({
+      // modifiers: [
+      //   interact.modifiers.restrictRect({
+      //     restriction: 'parent',
+      //     endOnly: false
+      //   })
+      // ],
+      // listeners: {
+      //   start: (event) => {
+      //     this.dragging = true;
+      //     console.log(event.type, event.target, 111);
+      //   },
+      //   move: (event) => {
+      //     this.position.x += event.dx;
+      //     this.position.y += event.dy;
+      //     event.target.style.transform = `translate(${this.position.x}px, ${this.position.y}px)`;
+      //   },
+      //   end: (event) => {
+      //     this.dragging = false;
+      //     console.log(event.type, event.target, 222);
+      //   }
+      // }
+      inertia: true,
+      //autoScroll: { container: '.container' },
+      listeners: [interact.feedback.pointers()],
       modifiers: [
-        interact.modifiers.restrictRect({
-          restriction: 'parent',
-          endOnly: false
-        })
-      ],
-      listeners: {
-        start: (event) => {
-          this.dragging = true;
-          console.log(event.type, event.target, 111);
-        },
-        move: (event) => {
-          this.position.x += event.dx;
-          this.position.y += event.dy;
-          event.target.style.transform = `translate(${this.position.x}px, ${this.position.y}px)`;
-        },
-        end: (event) => {
-          this.dragging = false;
-          console.log(event.type, event.target, 222);
-        }
-      }
+        interact.modifiers.restrict({
+          restriction: 'html',
+          elementRect: { left: 0, top: 0, right: 1, bottom: 1 }
+        }),
+        interact.modifiers.transform(),
+        interact.modifiers.spring()
+      ]
     });
     this.interaction.resizable({
       modifiers: [

package/src/config/api.js

@@ -82,7 +82,7 @@ export const mainDetail = '/config/configLayoutTheme/detail';
 // export const toStartFlow = '/api/mecp/v1/mecpItask/toStartFlow.json';
 export const toStartFlow = '/bpm/bpmBackend/toStartFlow';
 // 暂存数据
-export const tempSave = '/bpm/task/taskHandle/tempSave.dhtml';
+export const tempSave = '/oa/task/taskHandle/tempSave.dhtml';
 // 获取常用意见
 // /oa/commonOpinionsManager/getOpinionsList.dhtml  /api/v1/mecpIpending/commonOpion.json
 // /api/v1/mecpIpending/commonOpion.json
@@ -101,18 +101,18 @@ export const deleteCommonOpion = '/oa/commonOpinionsManager/delete.dhtml';
 //   '/api/mecp/v1/mecpItask/getProcessDefList.json';
 export const getProcessDefList = '/bpm/bpmBackend/toStartFlowIndex';
 // 获取下步办理人 /api/mecp/v1/mecpItask/getNodeInfo.json
-export const getNodeInfo = '/bpm/task/taskHandle/getNodeInfo.dhtml';
+export const getNodeInfo = '/oa/task/taskHandle/getNodeInfo.dhtml';
 
 // 系统消息
 // 通知方式
 export const findCodeValues = '/bpm/bpmCommon/findCodeValues';
 export const findSysParam = '/bpm/bpmCommon/findSysParam';
 export const findSysCodes =
-  '/bpm/task/taskHandle/getDefaultNotificationType.dhtml';
+  '/oa/task/taskHandle/getDefaultNotificationType.dhtml';
 
 // 获取通知消息
 export const getNotificationMsg =
-  '/bpm/task/taskHandle/getNotificationMsg.dhtml';
+  '/oa/task/taskHandle/getNotificationMsg.dhtml';
 // 获取审核页面数据
 export const getHandleInfoHtml = '/bpm/bpmBackend/toTaskHandleIndex.dhtml';
 // export const getHandleInfoHtml =
@@ -120,11 +120,11 @@ export const getHandleInfoHtml = '/bpm/bpmBackend/toTaskHandleIndex.dhtml';
 // 获取节点信息(获取节点属性及办理人)
 // export const getNodeInfoHtml = '/api/mecp/v1/mecpItask/getNodeInfoHtml.json';
 // 提交办理
-export const taskHandleHtml = '/bpm/task/taskHandle/taskHandle.dhtml';
+export const taskHandleHtml = '/oa/task/taskHandle/taskHandle.dhtml';
 // 获取流程图
 export const getView = '/bpm/service/diagram/view.html';
 // 开始流程
-export const register = '/bpm/task/taskHandle/startFlow.dhtml';
+export const register = '/oa/task/taskHandle/startFlow.dhtml';
 // 获取流程列表
 export const pendedhistoryList = '/api/v1/mecpIpending/pendedhistoryList.json';
 // 获取审核按钮信息
@@ -151,7 +151,7 @@ export const endFlowHtml = '/bpm/task/taskHandle/endFlow.dhtml';
 // 获取用户信息
 // export const findUserBaseInfos = '/api/v1/mecpSys/findUserBaseInfo.dhtml';
 // 搜索用户信息
-export const handleInfo = '/bpm/task/taskHandle/handleInfo.dhtml';
+export const handleInfo = '/oa/task/taskHandle/handleInfo.dhtml';
 // 获取当前用户信息
 export const loginUserInfo = '/bpm/bpmCommon/loginUserInfo';
 
@@ -161,9 +161,9 @@ export const wss = window.wss || '/main2/ws';
 export const topic = '/user/topic/all';
 // 流程预设
 export const getPresetCustomInfo =
-  '/bpm/task/taskHandle/getPresetCustomInfo.dhtml';
+  '/oa/task/taskHandle/getPresetCustomInfo.dhtml';
 // 办理人预设
-export const getPresetNodeInfo = '/bpm/task/taskHandle/getPresetNodeInfo.dhtml';
+export const getPresetNodeInfo = '/oa/task/taskHandle/getPresetNodeInfo.dhtml';
 // 获取转办页面数据
 export const toTaskTransferIndex = '/bpm/bpmBackend/toTaskTransferIndex';
 // 转办提交按钮
@@ -195,12 +195,12 @@ export const taskTakeAdvice = '/bpm/task/taskHandle/taskTakeAdvice.dhtml';
 export const toTaskStartDraft = '/bpm/bpmBackend/totaskStartDraft';
 
 // 稿件递送提交接口
-// export const taskStartDraft = '/bpm/task/taskHandle/taskStartDraft.dhtml';
+// export const taskStartDraft = '/oa/task/taskHandle/taskStartDraft.dhtml';
 export const taskStartDraft = '/archives/task/taskHandle/taskStartDraft.dhtml';
 // 复核
 export const toTaskReview = '/bpm/bpmBackend/toTaskReview';
 // 复核提交
-export const taskReview = '/bpm/task/taskHandle/taskReview.dhtml';
+export const taskReview = '/oa/task/taskHandle/taskReview.dhtml';
 // 联合用印
 export const toTaskUnionSeal = '/bpm/bpmBackend/toTaskUnionSeal';
 // 联合用印提交

package/src/index.js

@@ -117,7 +117,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '0.4.82',
+  version: '0.4.84',
   install,
   Button,
   ButtonGroup,

package/src/utils/util.js

@@ -43,6 +43,8 @@ import { MessageBox, Loading } from 'eoss-element';
  * @param {Boolean} [mix = false] - 是否混合传参
  * @param {Boolean} [defaults = false] - 是否传入默认参数userId
  * @param {Object} [loading] - loading加载对象
+ * @param {String} [publicKey] - sm2加密公钥
+ * @param {Array} [secret] - 要加密的字段属性名称，默认所有
  **/
 // 请求
 const pendingRequest = new Map();
@@ -66,7 +68,9 @@ const ajax = function ({
   format = true,
   mix = false,
   defaults = false,
-  loading
+  loading,
+  publicKey,
+  secret
 }) {
   let header = headers || {};
   if (!method) {
@@ -336,15 +340,60 @@ const ajax = function ({
   if (!Object.prototype.hasOwnProperty.call(params, 'userId') && userId && defaults) {
     params.userId = getStorage('userId');
   }
-  if (!mix && method === 'get') {
-    data = {};
-  }
-  if (method === 'post') {
-    if (!mix) {
+  if (!mix) {
+    if (method === 'get') {
+      data = {};
+    } else {
       params = {};
     }
-    if (format && !header['content-type']) {
-      data = qs.stringify(data);
+  }
+  if (publicKey) {
+    if (Object.keys(params).length) {
+      if (secret && Array.isArray(secret) && secret.length) {
+        secret.forEach(item => {
+          if (Object.prototype.hasOwnProperty.call(params, item) && params[item] !== '' && params[item] !== null) {
+            params[item] = esmEncrypt({
+              data: params[item],
+              key: publicKey
+            });
+          }
+        });
+      } else {
+        for (let i in params) {
+          if (params[i] !== '' && params[i] !== null) {
+            params[i] = esmEncrypt({
+              data: params[i],
+              key: publicKey
+            });
+          }
+        }
+      }
+    }
+    if (Object.keys(data).length) {
+      if (secret && Array.isArray(secret) && secret.length) {
+        secret.forEach(item => {
+          if (Object.prototype.hasOwnProperty.call(data, item) && data[item] !== '' && data[item] !== null) {
+            data[item] = esmEncrypt({
+              data: data[item],
+              key: publicKey
+            });
+          }
+        });
+      } else {
+        for (let i in data) {
+          if (data[i] !== '' && data[i] !== null) {
+            data[i] = esmEncrypt({
+              data: data[i],
+              key: publicKey
+            });
+          }
+        }
+      }
+    }
+  }
+  if (method === 'post' && format) {
+    data = qs.stringify(data);
+    if (!header['content-type']) {
       header['content-type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
     }
   }