resolver-egretimp-plus 0.1.88 → 0.1.90

package/dist/web/index.js.LICENSE.txt

@@ -19,6 +19,13 @@
  * @license  MIT
  */
 
+/*!
+ * clipboard.js v2.0.11
+ * https://clipboardjs.com/
+ *
+ * Licensed MIT © Zeno Rocha
+ */
+
 /*! https://mths.be/punycode v1.4.1 by @mathias */
 
 /*! ieee754. BSD-3-Clause License. Feross Aboukhadijeh <https://feross.org/opensource> */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "resolver-egretimp-plus",
-  "version": "0.1.88",
+  "version": "0.1.90",
   "description": "交付体验渲染",
   "main": "./dist/web/index.js",
   "module": "./dist/web/index.js",
@@ -57,6 +57,7 @@
     "webpack-cli": "^5.1.4"
   },
   "dependencies": {
-    "@popperjs/core": "^2.11.8"
+    "@popperjs/core": "^2.11.8",
+    "clipboard": "^2.0.11"
   }
 }

package/src/bpm/bpmInstance.js

@@ -1,4 +1,3 @@
-import { isPromise } from '../utils'
 import { ready } from './udc-sdk-esm/cjs'
 
 export const SUBMIT_TYPE = {
@@ -37,6 +36,8 @@ export const MESSAGE_TYPE = {
 export let bpmInstance = null
 
 export class Bpm {
+  commonActionKey = 'common'
+  showCopyModalCb = null
   params = {}
   bpmConfigs = {
     // getDetailReq, // 保存成功之后获取详情传递的数据
@@ -82,7 +83,37 @@ export class Bpm {
           return async (ret) => {
             const { saveAfter } = this.bpmConfigs
             this.saveResponse = ret
+            // ======= 刚开始保存的弹框复制单号逻辑 ===== start======
+            const { copyModal, lang, calcShowCopyModal } = this.params
             try {
+              const tipMsgPath = calcShowCopyModal(ret, eventData)
+              if (tipMsgPath) {
+                const { submitType } = eventData
+                this.showCopyModalCb = () => {
+                  const msgSubmit = lang?.value?.indexOf('zh') > -1 ? '提交成功' : 'Submit Success'
+                  const msgSave = lang?.value?.indexOf('zh') > -1 ? '保存成功' : 'Save Success'
+                  const isSubmit = [SUBMIT_TYPE.SEND, SUBMIT_TYPE.SUBMIT, SUBMIT_TYPE.AGREE].includes(submitType)
+                  const successMsg = isSubmit ? msgSubmit : msgSave
+                  this.showCopyModalCb = null
+
+                  return new Promise(resolve => {
+                    copyModal?.({
+                      lang: lang?.value,
+                      type: 'check',
+                      showcopy: true,
+                      copytype: lang?.value?.indexOf('zh') > -1 ? '申请单号' : 'Application No.',
+                      copymsg: tipMsgPath,
+                      showCancle: false,
+                      msg: successMsg,
+                      handleOk: async () => {
+                        resolve(true)
+                      }
+                    })
+                  })
+                }
+              }
+            // ======= 刚开始保存的弹框复制单号逻辑 ===== end======
+
               await saveAfter?.(ret, eventData)
             } catch (error) {
               console.error('saveAfter error, error:', error)
@@ -148,6 +179,9 @@ export class Bpm {
     if (MESSAGE_TYPE.GET_FORM_DATA === messageType) {
       // 如果有传入这个类型操作，就用传递进来的这个操作
       let action = this.actions?.[submitType]?.formAction
+      if (!action) {
+        action = this.actions?.[this.commonActionKey]?.formAction
+      }
       if (!action) {
         action = this.getDefaultAction(eventData)
       }
@@ -174,8 +208,12 @@ export class Bpm {
       let closeFlag = true
       closeFlag = ![SUBMIT_TYPE.PROCESS_SHOW, SUBMIT_TYPE.BACK, SUBMIT_TYPE.DRAFT_HANDLE].includes(submitType)
       
+      await this.showCopyModalCb?.()
       // 如果有传入这个类型操作，就用传递进来的这个操作
       let action = this.actions?.[submitType]?.successAction
+      if (!action) {
+        action = this.actions?.[this.commonActionKey]?.successAction
+      }
       if (!action) {
         action = this.getDefaultAction(eventData)
       }
@@ -242,7 +280,7 @@ export class Bpm {
         case SUBMIT_TYPE.SEND:
         case SUBMIT_TYPE.SUBMIT:
         case SUBMIT_TYPE.AGREE:
-          return async (eventData) => {
+          return async () => {
             const { validate, toSave, getDetail } = this.nativeMethods
             const valid = await validate(eventData)
             if (valid) {
@@ -261,7 +299,7 @@ export class Bpm {
         case SUBMIT_TYPE.GIVE:
         case SUBMIT_TYPE.DRAFT_HANDLE:
         case SUBMIT_TYPE.MULTI_COOPERATE:
-          return async (eventData) => {
+          return async () => {
             const actionType = eventData?.bpmInfo?.actionType
             const { toSave, getDetail } = this.nativeMethods
             if (!actionType) {

package/src/components/helper/eventOrchestration.js

@@ -430,22 +430,22 @@ export function openDailg({
   // 定义的弹框打开前钩子
   const configBeforeOpenDialog = compConfig?.beforeOpenDialog
   const paramsBeforeOpenDialog = beforeOpenDialog
-  if (configBeforeOpenDialog || paramsBeforeOpenDialog) {
-    beforeOpenDialog = async (...arg) => {
-      bpmInstance?.changeSlide?.(false)
-      let beforeOpenDialogRet = true
-      if (paramsBeforeOpenDialog) {
-        beforeOpenDialogRet = paramsBeforeOpenDialog?.(...arg)
-      }
-      const beforeOpenDialogRetValid = await beforeOpenDialogRet
-      if (beforeOpenDialogRetValid === false) {
-        return false
-      }
-      if (configBeforeOpenDialog) {
-        return configBeforeOpenDialog?.(...arg)
-      } else {
-        return true
-      }
+  // if (configBeforeOpenDialog || paramsBeforeOpenDialog) {
+  // }
+  beforeOpenDialog = async (...arg) => {
+    bpmInstance?.changeSlide?.(false)
+    let beforeOpenDialogRet = true
+    if (paramsBeforeOpenDialog) {
+      beforeOpenDialogRet = paramsBeforeOpenDialog?.(...arg)
+    }
+    const beforeOpenDialogRetValid = await beforeOpenDialogRet
+    if (beforeOpenDialogRetValid === false) {
+      return false
+    }
+    if (configBeforeOpenDialog) {
+      return configBeforeOpenDialog?.(...arg)
+    } else {
+      return true
     }
   }
   let beforeOpenDialogRet = true
@@ -480,12 +480,12 @@ export function openDailg({
     // 打开弹框-确认后的钩子
     const configAfterOpenDialog = compConfig?.afterOpenDialog
     const paramsAfterOpenDialog = afterOpenDialog
-    if (configAfterOpenDialog || paramsAfterOpenDialog) {
-      afterOpenDialog = async (...arg) => {
-        bpmInstance?.changeSlide?.(true)
-        paramsAfterOpenDialog?.(...arg)
-        configAfterOpenDialog?.(...arg)
-      }
+    // if (configAfterOpenDialog || paramsAfterOpenDialog) {
+    // }
+    afterOpenDialog = async (...arg) => {
+      bpmInstance?.changeSlide?.(true)
+      paramsAfterOpenDialog?.(...arg)
+      configAfterOpenDialog?.(...arg)
     }
     afterOpenDialog && afterOpenDialog({
       dynamicMapComp,

package/src/components/modal/index.js

@@ -0,0 +1,9 @@
+import { render, createVNode } from 'vue';
+import modalObj from './modal.vue'
+export const copyModal = (props = {}) => {
+  const container = document.createElement('div')
+  const vnode = createVNode(modalObj, props);
+  render(vnode, container);
+  const instance = vnode.component;
+  document.body.appendChild(container);
+}

package/src/components/modal/modal.scss

@@ -0,0 +1,195 @@
+.warning-modal {
+    .warning-modal-backdrop {
+        position: fixed;
+        top: 0;
+        right: 0;
+        bottom: 0;
+        left: 0;
+        z-index: 106000;
+        background-color: #000;
+        transition: all .3s;
+        opacity: 0.5;
+        visibility: initial;
+    }
+
+    .warning-modal {
+
+        position: fixed;
+        top: 0;
+        right: 0;
+        bottom: 0;
+        left: 0;
+        display: block;
+        z-index: 106000;
+        outline: 0;
+
+        .warning-modal-dialog {
+            position: relative;
+            width: 900px;
+            margin: 100px auto;
+            -webkit-transform: translate(0);
+            transform: translate(0);
+
+            .warning-modal-content {
+                .warning-icon {
+                    i.aid::before {
+                        color: #3271FE;
+                    }
+                }
+
+                .waring-btn {
+
+                    span,
+                    div {
+                        &:first-child {
+                            background-color: #D0D3D6 !important;
+                        }
+                    }
+
+                    .yes:last-child {
+                        background-color: #3271FE !important;
+                    }
+                }
+            }
+
+        }
+
+        .warning-tips {
+            width: 400px;
+        }
+
+        .warning-modal-content {
+            height: auto;
+            position: relative;
+            display: -webkit-box;
+            display: -ms-flexbox;
+            display: flex;
+            -webkit-box-orient: vertical;
+            -webkit-box-direction: normal;
+            -ms-flex-direction: column;
+            flex-direction: column;
+            background-color: #fff;
+            background-clip: padding-box;
+            border-radius: 4px;
+            box-shadow: 0 2px 10px 0 rgba(0, 0, 0, .1);
+            outline: 0;
+            max-width: calc(100vw - 30px*2);
+            max-height: calc(100vh - 30px*2);
+
+            .warning-icon {
+                width: 100%;
+                height: auto;
+                text-align: center;
+                padding: 40px 0px 0px 0px;
+
+                i {
+                    font-size: 80px;
+                    color: #3271FE;
+                    padding-bottom: 10px;
+                }
+
+                p {
+                    font-size: 24px;
+                    color: #3271FE;
+                }
+            }
+
+            .waring-cnt {
+                width: 100%;
+                height: auto;
+                text-align: center;
+                border-radius: 0 0 0 4px;
+                cursor: pointer;
+
+                p {
+                    font-size: 18px;
+                    margin-bottom: 0rem;
+
+                    span:first-child {
+                        color: #455155;
+                        opacity: 0.6;
+                    }
+
+                    span:last-child {
+                        color: #455155;
+                        opacity: 0.9;
+                    }
+                }
+            }
+
+            .waring-btn {
+                width: 100%;
+                overflow: hidden;
+                margin-top: 20px;
+                cursor: pointer;
+
+                span {
+                    display: inline-block;
+                    width: 100%;
+                    float: left;
+                    height: 50px;
+                    line-height: 50px;
+                    text-align: center;
+                    font-size: 18px;
+                }
+
+                .no {
+                    background: #E5E8E8;
+                    border-bottom-left-radius: 4px;
+                }
+
+                .yes {
+                    background: #3271FE;
+                    color: #fff;
+                    border-bottom-right-radius: 4px;
+
+                }
+            }
+
+            .reject-btn {
+                margin-top: 0px !important;
+
+                span {
+                    width: 50%;
+                }
+            }
+        }
+    }
+
+    .warning-modal-close {
+        padding: 10px 10px 0px 0px;
+    }
+}
+
+._copymodal {
+    .waring-cnt {
+        word-break: break-word;
+    }
+
+    .maxheight {
+        max-height: 500px;
+        overflow-y: auto;
+    }
+
+    .copycontent-l {
+        padding-right: 15px;
+    }
+
+    .copycontent-r {
+        color: rgb(255, 128, 0) !important;
+        max-width: 70%;
+        word-break: break-word;
+    }
+
+    .copycontent {
+        display: flex;
+        justify-content: center;
+        cursor: pointer;
+        font-size: 18px;
+    }
+}
+
+.yes {
+    white-space: nowrap;
+    overflow: hidden;
+}

package/src/components/modal/modal.vue

@@ -0,0 +1,201 @@
+<template>
+  <div v-if="modal" class="warning-modal _copymodal">
+    <div class="warning-modal-backdrop" />
+    <div class="warning-modal">
+      <div class="warning-modal-dialog warning-tips">
+        <div class="warning-modal-content">
+          <div class="warning-icon" style="padding-top: 15px">   
+            <el-icon  v-if="type == 'alert'"><WarningFilled /></el-icon>
+            <el-icon  v-if="type == 'check'"><SuccessFilled /></el-icon>         
+            <el-icon v-if="type == 'help'"><QuestionFilled /></el-icon> 
+          </div>
+          <div v-if="msg" class="waring-cnt maxheight">
+            <p style="padding: 15px">
+              <span>{{ msg }}</span>
+            </p>
+          </div>
+          <div v-else class="waring-cnt" v-html="msgHtml" />
+          <div v-if="showcopy" class="copycontent">
+            <span class="copycontent-l">{{ copytype }}</span>
+            <el-tooltip :content="copytip || (lang === 'zh-CN' ? '点击复制单号' : 'Copy by clicking the order number')">
+              <span class="copycontent-r" @click="copyClicked(copymsg)" :data-clipboard-text="copymsg">{{
+                copymsg
+              }}</span>
+            </el-tooltip>
+          </div>
+          <div v-if="endMsg" class="waring-cnt">
+            <p style="padding: 15px">
+              <span>{{ endMsg }}</span>
+            </p>
+          </div>
+          <div v-if="endMsgHtml" class="waring-cnt" v-html="endMsgHtml" />
+          <div
+            v-if="messageShow"
+            class="copycontent"
+            style="display: block; padding: 0 5%"
+          >
+            <span>{{ firstMsg }} {{ copytype }}</span>
+            <el-tooltip :content="copytip || (lang === 'zh-CN' ? '点击复制单号' : 'Copy by clicking the order number')">
+              <span class="copycontent-r" @click="copyClicked(copymsg)" :data-clipboard-text="copymsg">{{
+                copymsg
+              }}</span>
+            </el-tooltip>
+            <span>{{ lastMsg }}</span>
+          </div>
+          <div v-if="showCancle" class="waring-btn">
+            <span
+              class="yes"
+              style="background-color: #999; border-bottom-right-radius: 0;width: 50%;"
+              @click="handleNo"
+            >{{ cancleText || (lang === 'zh-CN' ? '取消' : 'Cancel') }}</span>
+            <span class="yes" @click="handleYes" style="width: 50%;">{{ okText || (lang === 'zh-CN' ? '确定' : 'Confirm') }}</span>
+          </div>
+          <div v-else class="waring-btn">
+            <span class="yes" @click="handleYes">{{ okText || (lang === 'zh-CN' ? '确定' : 'Confirm') }}</span>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup >
+import { WarningFilled, SuccessFilled, QuestionFilled } from '@element-plus/icons-vue'
+import { ElIcon ,ElMessage } from 'element-plus'
+</script>
+
+<script >
+import { ref } from 'vue'
+import Clipboard from 'clipboard'
+
+const customAlert = ref(null)
+
+export default {
+  props: {
+    lang: {
+      type: String,
+      default: 'zh-CN'
+    },
+    msg: {
+      type: String,
+      default: ''
+    },
+    type: {
+      type: String,
+      default: 'alert'
+    },
+    firstMsg: {
+      type: String,
+      default: ''
+    },
+    lastMsg: {
+      type: String,
+      default: ''
+    },
+    endMsg: {
+      type: String,
+      default: ''
+    },
+    endMsgHtml: {
+      type: String,
+      default: ''
+    },
+    msgHtml: {
+      type: String,
+      default: ''
+    },
+    showCancle: {
+      type: Boolean,
+      default: true
+    },
+    cancleText: {
+      type: String,
+      default: '',
+    },
+    okText: {
+      type: String,
+      default: '',
+    },
+    copytip: {
+      type: String,
+      default: ''
+    },
+    successtext: {
+      type: String,
+      default: '',
+    },
+    handleCancle: {
+      type: Function
+    },
+    handleOk: {
+      type: Function
+    },
+    showcopy: {
+      type: Boolean,
+      default: false
+    },
+    messageShow: {
+      type: Boolean,
+      default: false
+    },
+    copytype: {
+      type: String,
+      default: ''
+    },
+    copymsg: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      modal: false
+    }
+  },
+  watch: {
+    modal(val) {
+      if (!val) {
+        let parent = (customAlert.value && customAlert.value['parentNode']) || null
+        if (customAlert.value && document.body.contains(parent) && parent) {
+          document.body.removeChild(parent)
+        }
+      }
+    }
+  },
+  created() {
+    this.modal = true
+  },
+    unmounted() {
+      let parent = (customAlert.value && customAlert.value['parentNode']) || null
+      if (customAlert.value && document.body.contains(parent) && parent) {
+        document.body.removeChild(parent)
+      }
+  },
+  methods: {
+    async copyClicked(val) {
+      let clipboard = new Clipboard(".copycontent-r");
+      clipboard.on('success', e => {
+        ElMessage({
+          message: this.successtext || (this.lang === 'zh-CN' ? '复制成功' : 'Copy success'),
+          type: 'success',
+        })
+        clipboard.destroy()
+      })
+      clipboard.on('error', e => {
+        clipboard.destroy()
+      })
+    },
+    handleNo() {
+      this.handleCancle && this.handleCancle()
+      this.modal = false
+    },
+    handleYes() {
+      this.handleOk && this.handleOk()
+      this.modal = false
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+    @use "./modal.scss";
+</style>

package/src/components/packages-web/CustomComponentPlain.vue

@@ -28,6 +28,11 @@ const props = defineProps({
     type: [String, Number],
     default: ''
   },
+  // 金额显示的分割，默认‘,’
+  moneySeg: {
+    type: [String],
+    default: ','
+  },
   min: {
     type: Number,
     default: -Infinity
@@ -173,7 +178,8 @@ function formatValue(value) {
     return value
   }
   if (value === null || isNaN(value)) return ''
-  let val = parseFloat(value)
+  let val = `${value}`.replace(props.moneySeg, '')
+  val = parseFloat(val)
   if (isNaN(val)) {
     return ''
   }
@@ -190,7 +196,7 @@ function formatValue(value) {
   }
   const parts = `${val}`.split('.')
   
-  parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ',')
+  parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, props.moneySeg)
   
   // 添加货币符号
   const formatted = parts.join('.')

package/src/components/packages-web/CustomComponentSelectEmployees.vue

@@ -102,6 +102,7 @@ const initSelEmployee = async () => {
       placeholder: lang?.value?.indexOf('zh') > -1 ? props.placeholder : props.placeholderEn,
       // disabled: props.disabled,
       onSelectedChange: (data, arr) => {
+        console.log('onSelectedChange===:', data, arr)
         emit('change', data, arr, props)
         modelValue.value = data?.join(separator.value) || ''
       },

package/src/index.jsx

@@ -85,6 +85,10 @@ export default {
       type: [Object, Function],
       default: () => null
     },
+    copyModal: {
+      type: [Object, Function],
+      default: () => null
+    },
     openChildDialogInstance: {
       type: [Function],
       default: () => {
@@ -192,6 +196,10 @@ export default {
     bpmBtnPosition: {
       type: Number,
       default: 3
+    },
+    showCopyModal: {
+      // 传递给致远的参数
+      type: [Function],
     }
   },
   emits: ['update:modelValue', 'rootStoreChange'],
@@ -401,7 +409,10 @@ export default {
           validate,
           dynamicMapComp,
           toExecuteLoadServices,
-          bpmSubmitBtn: props.bpmSubmitBtn
+          bpmSubmitBtn: props.bpmSubmitBtn,
+          calcShowCopyModal: props.showCopyModal, // 是否要开启刚开始保存之后弹框提示编码功能
+          copyModal: props.copyModal,
+          lang: toRef(props, 'lang'),
         })
         bpmInstance?.insertBtn?.(props.bpmBtns, props.bpmBtnPosition)
       }

package/src/resolver-H5.vue

@@ -18,6 +18,10 @@ const props = defineProps({
     default: () => CmiToast
     // default: () => null
   },
+  copyModal: {
+    type: [Object, Function],
+    default: () => copyModal
+  },
   confirmInstance: {
     type: [Object, Function],
     default: () => {
@@ -75,6 +79,7 @@ defineExpose({
     v-bind="attrs"
     :isH5="true" :getNativeComps="getNativeComps"
     :messageInstance="props.messageInstance"
+    :copyModal="props.copyModal"
     :confirmInstance="props.confirmInstance"
     :openChildDialogInstance="props.openChildDialogInstance"
     :loadingInstance="props.loadingInstance"