resolver-egretimp-plus 0.1.17 → 0.1.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "resolver-egretimp-plus",
-  "version": "0.1.17",
+  "version": "0.1.19",
   "description": "交付体验渲染",
   "main": "./dist/web/index.js",
   "module": "./dist/web/index.js",

package/src/bpm/bpmInstance.js

@@ -62,15 +62,17 @@ export class Bpm {
   }
   setNativeMethods() {
     const { validate: nativeValidate, dynamicMapComp, bpmSubmitBtn, toExecuteLoadServices } = this.params
-    const { getDetailReq, customValidate } = this.bpmConfigs
+    const { getDetailReq, customValidate, saveValidate } = this.bpmConfigs
 
-    const toSave = (cb, eventData) => {
+    const toSave = async (eventData) => {
+      if (saveValidate && typeof saveValidate === 'function') {
+        const saveVliad = await saveValidate()
+        if (!saveVliad) {
+          return
+        }
+      }
       const saveButton = dynamicMapComp[bpmSubmitBtn]
       if (saveButton) {
-        if (!eventData && typeof cb !== 'function') {
-          eventData = cb
-          cb = null
-        }
         const createAfterRequestService = (fn) => {
           return async (ret) => {
             const { saveAfter } = this.bpmConfigs
@@ -85,18 +87,12 @@ export class Bpm {
             }, 0);
           }
         }
-        if (cb && typeof cb === 'function') {
+        return new Promise((resolve) => {
           saveButton?.vm?.click({
-            afterRequestService: createAfterRequestService((ret) => { cb(ret) })
-          })
-        } else {
-          return new Promise((resolve) => {
-            saveButton?.vm?.click({
-              // 保存成功的回调
-              afterRequestService: createAfterRequestService((ret) => { resolve(ret) })
-            })
+            // 保存成功的回调
+            afterRequestService: createAfterRequestService((ret) => { resolve(ret) })
           })
-        }
+        })
       } else {
         messageInstance?.warning?.('no set bpmSubmitBtn, or bpmSubmitBtn is invalid, at preset, bpmSubmitBtn:', props.bpmSubmitBtn)
       }
@@ -320,6 +316,16 @@ export class Bpm {
       })
     })
   }
+  insertBtn(btns, position = 3) {
+    this.getSdkInstance().then((instance) => {
+      console.log('insert btns==:', btns, position)
+      instance?.getCustomApi()?.insertBtnForToolbar({
+        // 按钮插入位置
+        position,
+        btns,
+      })
+    })
+  }
   destroy() {
     window.removeEventListener("message", this.messageListener)
     this.sdkInstance = null

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

@@ -1,7 +1,17 @@
 <template>
   <TabPane v-for="(pageMetaList, $index) in (multiPmPageMetaList || [])" v-bind="{...tabPaneProps}" :key="pageMetaListKeys[pageMetaList.id]" :label="`${lang.indexOf('zh') > -1 ? props.config?.metaNameZh : props.config?.metaNameEn}-${$index}`" :name="`${props.config?.metaCode}-${$index}`">
     <template #label v-if="labelRenderContentFn || pageMetaList.filter(config => config.collapseSlot).length">
-      <component :is="labelRenderContentFn(getLableRenderParams(modelValue?.[$index]))" v-if="labelRenderContentFn"></component>
+      <component
+        v-if="labelRenderContentFn"
+        :is="labelRenderContentFn(
+          getLableRenderParams(
+            modelValue?.[$index],
+            props.activeNames === `${props.config?.metaCode}-${$index}`,
+            multiPmPageMetaList.length,
+            $index
+          )
+        )"
+        ></component>
       <Renderer v-else :modelValue="modelValue?.[$index]" :rowScope="{row: modelValue?.[$index], $index}" @update:modelValues="onUpdateModelValue($event, $index)" :config="pageMetaList.filter(config => config.collapseSlot)"></Renderer>
     </template>
     <ElRow>
@@ -20,6 +30,7 @@ import { h } from 'vue'
 const props = defineProps({
   ...commonPropsType,
   ...ElTabPane.props,
+  activeNames: String,
 })
 
 const modelValue = defineModel()
@@ -100,10 +111,13 @@ const labelRenderContentFn = computed(() => {
     return null
   }
 })
-function getLableRenderParams(tabPaneData) {
+function getLableRenderParams(tabPaneData, isActive, total, idx) {
   return {
     config: props.config,
-    tabPaneData
+    tabPaneData,
+    isActive,
+    total,
+    currentIndex: idx
   }
 }
 </script>

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

@@ -24,7 +24,8 @@ const slots = useSlots()
 const props = defineProps({
   ...commonPropsType,
   ...TabPane.props,
-  hidden: [String, Boolean, Number]
+  hidden: [String, Boolean, Number],
+  activeNames: String,
 })
 const attrs = useAttrs()
 
@@ -62,7 +63,8 @@ const labelRenderContent = computed(() => {
 function getLableRenderParams() {
   return {
     config: props.config,
-    tabPaneData: props.refValue.value
+    tabPaneData: props.refValue.value,
+    isActive: props.activeNames === props.config?.metaCode,
   }
 }
 </script>

package/src/components/packages-web/CustomComponentTable.jsx

@@ -157,52 +157,52 @@ export default {
         return config.displayType != DISPLAY_HIDDEN && !(config.width == 0 || config.width == '0px' || config.hidden == '1')
       })?.length
       const nextConfig = nextList.find(config => config.displayType != DISPLAY_HIDDEN)
-      const props =  Object.keys(ElTableColumn.props).reduce((ret, key) => {
+      const retObj =  Object.keys(ElTableColumn.props).reduce((ret, key) => {
         if (hasOwn(config, key)) {
           ret[key] = config[key]
         }
         return ret
       }, {})
       if (config.showOverflowTooltip == '1' || config['show-overflow-tooltip'] == '1') {
-        props['show-overflow-tooltip'] = true
-        props.showOverflowTooltip = true
+        retObj['show-overflow-tooltip'] = true
+        retObj.showOverflowTooltip = true
       } else {
-        props['show-overflow-tooltip'] = false
-        props.showOverflowTooltip = false
+        retObj['show-overflow-tooltip'] = false
+        retObj.showOverflowTooltip = false
       }
-      if (!props.prop) {
-        props.prop = config.metaCode
+      if (!retObj.prop) {
+        retObj.prop = config.metaCode
       }
       if (config.columnWidth) {
-        props.width = config.columnWidth
+        retObj.width = config.columnWidth
       }
-      if (!props.width) {
-        props.minWidth = '160px'
+      if (!retObj.width) {
+        retObj.minWidth = '160px'
       }
-      if (props.width == 0 || props.width == '0px' || config.hidden == '1') {
-        props.className = 'hidden-column'
-        props.width = '1px'
+      if (retObj.width == 0 || retObj.width == '0px' || config.hidden == '1') {
+        retObj.className = 'hidden-column'
+        retObj.width = '1px'
       }
       if (nextConfig && (nextConfig.width == 0 || nextConfig.width == '0px' || nextConfig.hidden == '1')) {
-        props.className = `${props.className || ''} next-hidden-column`
+        retObj.className = `${retObj.className || ''} next-hidden-column`
       }
       if (isEndConfig) {
-        props.className = `${props.className || ''} end-show-column`
+        retObj.className = `${retObj.className || ''} end-show-column`
       }
       if (config.metaType == 'CustomComponentSelectEmployees') {
-        props.className = `${props.className || ''} clear-index`
+        retObj.className = `${retObj.className || ''} clear-index`
       }
       if (
-        isPlainColumn({...config, isColumn: true}, calcDisable(config, props.mode)) &&
+        isPlainColumn({...config, isColumn: true}, calcDisable(config, retObj.mode)) &&
         config.showOverflowTooltip != '0' &&
         config['show-overflow-tooltip'] != '0'
       ) {
-        props['show-overflow-tooltip'] = true
-        props.showOverflowTooltip = true
+        retObj['show-overflow-tooltip'] = true
+        retObj.showOverflowTooltip = true
       }
       if (config.type === 'selection') {
-        const orginSelectable = props.selectable
-        props.selectable = (row, index) => {
+        const orginSelectable = retObj.selectable
+        retObj.selectable = (row, index) => {
           let orginRet = true
           if (orginSelectable && typeof orginSelectable === 'function') {
             orginRet = orginSelectable(row, index, {
@@ -222,7 +222,7 @@ export default {
           return orginRet && parentSelectionsRet
         }
       }
-      return props
+      return retObj
     }
 
     // 获取表格的配置，这边会做一下配置转化，表格中的不需要labelWidth

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

@@ -1,6 +1,6 @@
 <template>
   <Tabs :class="[`tabs-level-${level}`, isHeaderAuto ? 'tabpane-auto-header' : '',  fullBorder ? 'full-border' : '']" v-bind="transTabsProps" v-model="activeNames">
-    <Renderer :config="tabpanes" v-model="props.refValue.value"></Renderer>
+    <Renderer :activeNames="activeNames" :config="tabpanes" v-model="props.refValue.value"></Renderer>
     <template v-for="(_, key) in slots" :key="key" v-slot:[key]="scope">
       <slot :name="key" v-bind="scope"></slot>
     </template>
@@ -19,6 +19,10 @@ const slots = useSlots()
 const props = defineProps({
   ...ElTabs.props,
   ...commonPropsType,
+  showBar: {
+    type: Boolean,
+    default: true
+  },
 })
 const attrs = useAttrs()
 const tabsProps = computed(() => {
@@ -39,24 +43,24 @@ const activeNames = computed({
     const currentCycleTab = tabpanes.value.find(tab => tab.currentCode)
     return (currentTab && currentTab.metaCode)
       || (currentCycleTab && currentCycleTab.currentCode)
-      || (tabpanes.value[0] && (tabpanes.value[0].metaType === 'CustomComponentTabPane' && tabpanes.value[0].metaCode) || (tabpanes.value[0].metaType === 'CustomComponentCycleTabPane' && `${tabpanes.value[0].metaCode}-0`))
+      || tabpanes.value[0] && ((assertMetaType(tabpanes.value[0], 'CustomComponentCycleTabPane') && `${tabpanes.value[0].metaCode}-0`) || (tabpanes.value[0].metaType === 'CustomComponentTabPane' && tabpanes.value[0].metaCode))
   },
   set(val) {
     tabpanes.value.forEach(tab => {
-      if (tab.metaType === 'CustomComponentTabPane') {
+      if (assertMetaType(tab, 'CustomComponentCycleTabPane')) {
+        if (/^cycleTabpane-(\d+)$/.test(val)) {
+          tab.currentCode = val
+        } else {
+          tab.currentCode = ''
+        }
+      } else if (tab.metaType === 'CustomComponentTabPane') {
         if (tab.metaCode === val) {
           tab.defaultShowFlag = '1'
         } else {
           tab.defaultShowFlag = '0'
         }
       }
-      if (tab.metaType === 'CustomComponentCycleTabPane') {
-        if (new RegExp(`^${tab.metaCode}-(\d+)$`).test(val)) {
-          tab.currentCode = val
-        } else {
-          tab.currentCode = ''
-        }
-      }
+      
     })
   }
 })
@@ -64,7 +68,7 @@ const isHeaderAuto = computed(() => {
   return props.config.autoHeader == '1'
 })
 const level = computed(() => {
-  return props.config.level || tabpanes.value.find(tabpane => hasOwn(tabpane, 'level'))?.level || 1
+  return props.config.level ?? tabpanes.value.find(tabpane => hasOwn(tabpane, 'level'))?.level ?? 1
 })
 const transTabsProps = computed(() => {
   const polyProps = level.value == 1 ? {
@@ -76,7 +80,8 @@ const transTabsProps = computed(() => {
   } : {}
   return {
     ...tabsProps.value,
-    ...polyProps
+    ...polyProps,
+    showBar: props.showBar,
   }
 })
 /**
@@ -86,6 +91,10 @@ const fullBorder = computed(() => {
   return tabpanes.value.length === 1 && level.value == 1
 })
 
+function assertMetaType(config, metaType) {
+  return config.renderby === metaType || config.metaType === metaType
+}
+
 defineExpose({
   setActiveTab(tabMetaCode) {
     activeNames.value = tabMetaCode

package/src/components/tabs/src/tab-nav.jsx

@@ -52,6 +52,10 @@ export const tabNavProps = buildProps({
     values: ['card', 'border-card', ''],
     default: '',
   },
+  showBar: {
+    type: Boolean,
+    default: true
+  },
   stretch: Boolean,
 })
 
@@ -379,10 +383,11 @@ const TabNav = defineComponent({
             ns.e('nav-wrap'),
             ns.is('scrollable', !!scrollable.value),
             ns.is(rootTabs.props.tabPosition),
+            !props.showBar ? 'hidden-bar' : ''
           ]}
         >
           {scrollBtn}
-          <div class={ns.e('nav-scroll')} ref={navScroll$}>
+          <div class={[ns.e('nav-scroll')]} ref={navScroll$}>
             <div
               class={[
                 ns.e('nav'),
@@ -399,7 +404,7 @@ const TabNav = defineComponent({
               onKeydown={changeTab}
             >
               {...[
-                !props.type ? (
+                !props.type && props.showBar ? (
                   <TabBar ref={tabBarRef} tabs={[...props.panes]} />
                 ) : null,
                 tabs,

package/src/components/tabs/src/tabs.jsx

@@ -49,6 +49,10 @@ export const tabsProps = buildProps({
     type: Function,
     default: () => true,
   },
+  showBar: {
+    type: Boolean,
+    default: true
+  },
   stretch: Boolean,
 })
 // export type TabsProps = ExtractPropTypes<typeof tabsProps>
@@ -177,6 +181,7 @@ const Tabs = defineComponent({
             ref={nav$}
             currentName={currentName.value}
             editable={props.editable}
+            showBar={props.showBar}
             type={props.type}
             panes={panes.value}
             stretch={props.stretch}
@@ -203,8 +208,8 @@ const Tabs = defineComponent({
           ]}
         >
           {...props.tabPosition !== 'bottom'
-            ? [header, panels]
-            : [panels, header]}
+            ? [panels, header]
+            : [header, panels]}
         </div>
       )
     }

package/src/index.jsx

@@ -7,7 +7,7 @@ import { MODE } from "./utils/const.js"
 import { generateRequester } from "./utils/request.js"
 import { executeLoadServices, resetConfigEventInit } from "./components/helper/resolver.js"
 import { createEmptyCopy, deepMerge } from "./utils/index.js"
-import { initBpm, SUBMIT_TYPE } from "./bpm/bpmInstance.js"
+import { initBpm, SUBMIT_TYPE, bpmInstance } from "./bpm/bpmInstance.js"
 // import { RuleExecuter } from "./rulesImp/index.js"
 export default {
   name: 'Resolver',
@@ -171,6 +171,14 @@ export default {
     bpmConfigs: {
       type: Object,
       default: {}
+    },
+    bpmBtns: {
+      type: Array,
+      default: [],
+    },
+    bpmBtnPosition: {
+      type: Number,
+      default: 3
     }
   },
   emits: ['update:modelValue', 'rootStoreChange'],
@@ -359,6 +367,9 @@ export default {
         return props.requestTraceId
       },
       toExecuteLoadServices,
+      getBpmInstance() {
+        return bpmInstance
+      }
     })
 
     const modelValue = computed({
@@ -377,6 +388,7 @@ export default {
           toExecuteLoadServices,
           bpmSubmitBtn: props.bpmSubmitBtn
         })
+        bpmInstance?.insertBtn?.(props.bpmBtns, props.bpmBtnPosition)
       }
     })
     return () => {

package/src/rules/eventsSupplement.js

@@ -90,7 +90,6 @@ const allInitEvents = {
     const isReplace = /^_replace:/.test(targetObjVal)
     if (isReplace) {
       targetObjVal = replaceDefValue(targetObjVal?.replace(/^_replace:/, ''), {config, dynamicMapComp})
-      
     }
     let val = ''
     try {
@@ -563,7 +562,7 @@ export function runEvent(events, isInit, tabpanelCode, rule) {
     const { eventId } = event
     const eventCode = eventsMap[eventId]
     // const { eventCode } = event
-    console.log('evnet===:', event)
+    console.log('evnet===:', eventCode, event)
     return allInitEvents[eventCode] && allInitEvents[eventCode].call(this, event, isInit, tabpanelCode, rule)
     // return {
     //   eventId,

package/src/theme/element/components/button.scss

@@ -3,6 +3,7 @@
   --el-button-hover-bg-color: #EFF0F1;
   --el-button-text-color: #1F2329;
   --el-font-size-base: 14px;
+  --el-font-weight-primary: 400;
 }
 .el-button--large {
   padding: 8px 12px;

package/src/theme/element/components/index.scss

@@ -23,6 +23,7 @@
   --el-border-color-lighter: #d0d3d6;
   --el-fill-color-lighter: #fafafa;
   --el-fill-color-light: #eff0f1;
+  --el-color-danger: #F54A45;
 
   --prmary-marign-second: 12px;
   --prmary-marign: 16px

package/src/theme/element/components/input.scss

@@ -10,6 +10,7 @@
 }
 
 .el-input__wrapper {
+  padding: 1px 8px;
   .el-input__clear {
     svg path {
       d: path("M 764.288 214.592 L 512 466.88 L 259.712 214.592 a 31.936 31.936 0 0 0 -45.12 45.12 L 466.752 512 L 214.528 764.224 a 31.936 31.936 0 1 0 45.12 45.184 L 512 557.184 l 252.288 252.288 a 31.936 31.936 0 0 0 45.12 -45.12 L 557.12 512.064 l 252.288 -252.352 a 31.936 31.936 0 1 0 -45.12 -45.184 Z")

package/src/theme/element/components/tabs.scss

@@ -3,7 +3,12 @@
 
 .resolver-tabs {
   // 这个是渲染器里面tabs
-  display: block;
+  // display: block;
+}
+.hidden-bar {
+  &::after {
+    display: none;
+  }
 }
 .el-tabs {
   // display: block;
@@ -13,6 +18,10 @@
     padding: var(--prmary-marign-second) var(--prmary-marign) var(--prmary-marign) var(--prmary-marign);
   }
 }
+.el-tabs__item {
+  min-height: var(--el-tabs-header-height);
+  height: unset;
+}
 .tabs-level-1 {
   --el-tabs-header-height: 49px;
   &.full-border {

package/src/theme/element/index.scss

@@ -1,7 +1,7 @@
 @import './components/index.scss';
 * {
   font-family: PingFang SC,sans-serif;
-  font-weight: normal;
+  font-weight: inherit;
 }
 .custom-form-item.hidden-label {
   & > .el-form-item__label {

package/src/utils/valid.js

@@ -18,29 +18,47 @@ function validFailAction(errInfo, dynamicMapComp) {
     let oneKey = errKyes[0]
     const referComps = []
     while (oneKey.indexOf('->') > -1) {
-      const compInfo = dynamicMapComp[oneKey]
-      compInfo && referComps.unshift(compInfo)
+      let idx = -1
+      let code = ''
+      const matchs = oneKey?.match(/^(.+)\[(\d+)\]$/)
+      if (matchs) {
+        idx = parseInt(matchs[2])
+        code = matchs[1]
+      } else {
+        code = oneKey
+      }
+
+      const compInfo = dynamicMapComp[code]
+      compInfo && referComps.unshift({
+        compInfo,
+        cycleIdx: idx
+      })
       oneKey = oneKey?.split('->')?.slice(0, -1)?.join('->') || ''
-      // oneKey = oneKey.replace(/->[^(->)]+$/, '')
-      // oneKey = oneKey.replace(/\[\d+\]$/, '')
     }
     const compInfo = dynamicMapComp[oneKey]
-    compInfo && referComps.unshift(compInfo)
-    referComps.forEach((comp, idx) => {
-      validFail(comp, referComps?.[idx + 1])
+    compInfo && referComps.unshift({
+      compInfo,
+      cycleIdx: -1
+    })
+    referComps.forEach(({compInfo, cycleIdx}) => {
+      validFail(compInfo, cycleIdx)
     })
     // 组件对应的页面展示更新后才能获取到校验住的元素
     setTimeout(() => {
-      const fouceErrEle = document.querySelector('.el-form-item__error')
-      const fouceEle = fouceErrEle.parentElement
-      fouceEle && fouceEle.scrollIntoView({ behavior: 'smooth' })
+      const {compInfo: config} = referComps.pop()
+      const veiwEl = config?.wrapVm?.vnode?.el
+      veiwEl && veiwEl.scrollIntoView({ behavior: 'smooth' })
+
+      // const fouceErrEle = document.querySelector('.el-form-item__error')
+      // const fouceEle = fouceErrEle.parentElement
+      // fouceEle && fouceEle.scrollIntoView({ behavior: 'smooth' })
     }, 200)
   }
 }
 // 校验不通过的时候，需要进行一下组件配置的调整，
 // 标签组件，需要进行聚焦当前页面
 // component组件，需要打开折叠
-function validFail(config, nextConfig) {
+function validFail(config, cycleIdx) {
   const type = config.renderby || config.metaType
   switch (type) {
     case 'CustomComponentTabPane':
@@ -57,8 +75,7 @@ function validFail(config, nextConfig) {
         config.defaultShowFlag = '1'
       }
       if (type === 'CustomComponentCycleTabPane') {
-        const rowIdx = nextConfig?.rowIndex
-        config.currentCode = `${config.metaCode}-${rowIdx}`
+        config.currentCode = `${config.metaCode}-${cycleIdx}`
       }
       break
     case 'CustomComponentCollapse':