resolver-egretimp-plus 0.1.90 → 0.1.92

package/src/components/modal/modal.vue

@@ -1,201 +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";
+<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-H5/CmiPicker.vue

@@ -181,14 +181,15 @@ function filterChange(e) {
 }
 .filter-header-wrap {
   display: flex;
-  justify-content: space-between;
+  justify-content: flex-start;
   align-items: center;
   width: 100%;
   .filte-title {
     max-width: 50%;
   }
   .filter-input {
-    max-width: 50%;
+    flex: 1;
+    margin-left: 16px;
   }
 }
 </style>

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

@@ -54,7 +54,7 @@ const value = computed({
     if (isNaN(Number(modeValue.value))) {
       return modeValue.value
     } else {
-      if (datePickerProps.valueFormat === 'timestamp' || `${modeValue.value}`.length >= 13) {
+      if (datePickerProps.value.valueFormat === 'timestamp' || `${modeValue.value}`.length >= 13) {
         return Number(modeValue.value)
       }
       return modeValue.value
@@ -71,6 +71,9 @@ watch(value, () => {
 })
 
 const disabledDate = (date) => {
+  if (datePickerProps.value?.disabledDate?.(date)) {
+    return true
+  }
   const currentDateStr = dayjs(date).format('YYYY-MM-DD')
   const currentDateUnix = dayjs(currentDateStr).unix()
   if (props.min) {

package/src/index.jsx

@@ -413,6 +413,7 @@ export default {
           calcShowCopyModal: props.showCopyModal, // 是否要开启刚开始保存之后弹框提示编码功能
           copyModal: props.copyModal,
           lang: toRef(props, 'lang'),
+          messageInstance: props.messageInstance,
         })
         bpmInstance?.insertBtn?.(props.bpmBtns, props.bpmBtnPosition)
       }

package/src/resolver-H5.vue

@@ -20,7 +20,7 @@ const props = defineProps({
   },
   copyModal: {
     type: [Object, Function],
-    default: () => copyModal
+    default: () => null
   },
   confirmInstance: {
     type: [Object, Function],

package/src/utils/render.jsx

@@ -975,10 +975,26 @@ function createFormLable(config, lang = 'zh') {
   }
   return (
     <div title={lang.indexOf('zh') > -1 ? (config.labelZh || config.metaNameZh) : (config.labelEn || config.metaNameEn)} class="custom-label">
-      <span class="custom-label-content" style={config.labelStyle} onClick={() => config.onLabelClick && config.onLabelClick?.(config)}>
+      <span
+        onMouseenter={(e) => labelMouseEnenter(e, config, lang)}
+        onMouseout={() => config._labelShowTip = false}
+        class="custom-label-content" style={config.labelStyle}
+        onClick={() => config.onLabelClick && config.onLabelClick?.(config)}
+      >
         {required ? <span style="color: #f5222d; margin-right: 3px">*</span> : null}
         <span>{lang.indexOf('zh') > -1 ? (config.labelZh || config.metaNameZh) : (config.labelEn || config.metaNameEn)}</span>
       </span>
+      {
+        config._labelShowTip ? 
+          <ElTooltip
+            placement="top"
+            visible={config._labelShowTip && !!config._triggerRef}
+            content={lang.indexOf('zh') > -1 ? (config.labelZh || config.metaNameZh) : (config.labelEn || config.metaNameEn)}
+            virtualTriggering
+            virtualRef={config._triggerRef}
+          ></ElTooltip>
+          : null
+      }
       {
         config.hintFlag == '1' ? (
           <ElTooltip popper-class="poppper-class" effect="dark" content={lang.indexOf('zh') > -1 ? config.hintContentZh : config.hintContentEn} placement="top">
@@ -1074,3 +1090,26 @@ export function getComponentSolt({
   }
   return {}
 }
+
+function labelMouseEnenter(e, config, lang) {
+  const innerText = lang.indexOf('zh') > -1 ? (config.labelZh || config.metaNameZh) : (config.labelEn || config.metaNameEn)
+  // obj为鼠标移入时的事件对象
+  // currentwidth 为文本在页面中所占的宽度，创建标签，加入到页面，获取currentwidth,最后
+  let TemporaryTag = document.createElement('span');
+  TemporaryTag.innerText = innerText
+  TemporaryTag.className = 'getTextWidth'
+  document.querySelector('body').appendChild(TemporaryTag)
+  let currentWidth = document.querySelector('.getTextWidth').offsetWidth
+  document.querySelector(".getTextWidth").remove()
+  // cellwidth为表格容器的宽度
+  // 当文本宽度小于|等于容器宽度两倍时，代表文本显示未超过两行
+  // 当前宽度小于等于(两倍单元格宽度)时，显示提示信息为假;否则，显示提示信息为真。
+  const cellWidth = e.target.offsetWidth
+  if (currentWidth <= (2 * cellWidth)) {
+    config._labelShowTip = false
+    config._triggerRef = null
+  } else {
+    config._labelShowTip = true
+    config._triggerRef = e.target
+  }
+}