resolver-egretimp-plus 0.0.302 → 0.1.1

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

@@ -19,9 +19,9 @@ const calcProps = computed(() => {
   if (!ret.layout || typeof ret.layout !== 'string') {
     ret.layout = 'total'
   }
-  if (props.config?.showSizer === '1' || props.config?.showJumper === '1') {
+  if (props.config?.showSizer == '1' || props.config?.showJumper == '1') {
     const layoutArr = ret.layout ? ret.layout.split(',') : []
-    if (props.config?.showSizer === '1') {
+    if (props.config?.showSizer == '1') {
       if (!layoutArr.some(item => item.trim() === 'sizes')) {
         layoutArr.splice(1, 0, 'sizes')
       }
@@ -35,7 +35,7 @@ const calcProps = computed(() => {
     if (!layoutArr.some(item => item.trim() === 'next')) {
       layoutArr.splice(4, 0, 'next')
     }
-    if (props.config?.showJumper === '1') {
+    if (props.config?.showJumper == '1') {
       if (!layoutArr.some(item => item.trim() === 'jumper')) {
         layoutArr.push('jumper')
       }

package/src/components/styles/CustomComponenTable.scss

@@ -1,4 +1,4 @@
-.error-tip-block {
+.error-tip-block,.custom-error-tip-block {
   & + .el-form-item__error {
     position: relative;
   }

package/src/index.jsx

@@ -1,4 +1,4 @@
-import { provide, toRef, watch, computed, ref, defineExpose, reactive, getCurrentInstance, toRaw } from "vue"
+import { provide, toRef, watch, computed, ref, defineExpose, reactive, getCurrentInstance, toRaw, onMounted } from "vue"
 import Renderer from './renderer.jsx'
 // import './style/index.scss'
 import { usePageConfig } from './hooks/pageConfig'
@@ -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 { nextTick } from "vue"
+import { initBpm, SUBMIT_TYPE } from "./bpm/bpmInstance.js"
 // import { RuleExecuter } from "./rulesImp/index.js"
 export default {
   name: 'Resolver',
@@ -151,6 +151,23 @@ export default {
       type: Object,
       default: () => ({})
     },
+    // 是否开启致远功能
+    openBpm: {
+      type: Boolean,
+      default: false
+    },
+    bpmMessage: {
+      type: [Object, Function],
+      default: {}
+    },
+    bpmSubmitBtn: {
+      type: [String],
+      default: ''
+    },
+    bpmActions: {
+      type: [Object],
+      default: {}
+    }
   },
   emits: ['update:modelValue', 'rootStoreChange'],
   setup(props, { emit, attrs, expose }) {
@@ -184,7 +201,7 @@ export default {
       return props.dataLoad || nativeDataLoad.value
     })
     const { initPageConfig, pageConfigRef, mapCompRef, hireRelatMapRulesRef } = usePageConfig()
-    function toExecuteLoadServices(clearFlag, alongLoad) {
+    function toExecuteLoadServices(clearFlag, alongLoad = true) {
       // 触发加载事件执行
       const oldNativeDataload = nativeDataLoad.value
       nativeDataLoad.value = false
@@ -344,6 +361,61 @@ export default {
         emit('update:modelValue', val)
       }
     })
+    onMounted(() => {
+      if (props.openBpm) {
+        function toSave() {
+          return new Promise((resolve) => {
+            const saveButton = dynamicMapComp[props.bpmSubmitBtn]
+            if (saveButton) {
+              // 保存服务绑定在配置的按钮上面，这边直接调用按钮的服务
+              saveButton?.vm?.click({
+                // 保存成功的回调
+                afterRequestService(ret) {
+                  if (ret?.data?.success) {
+                    toExecuteLoadServices(true, true)
+                    resolve(true)
+                  } else {
+                    resolve(false)
+                  }
+                }
+              })
+            }
+          })
+        }
+        function toSubmit() {
+          return new Promise((resolve) => {
+            validate((valid) => {
+              if (valid) {
+                resolve(toSave())
+              } else {
+                resolve(false)
+              }
+            })
+          })
+        }
+        const commonSaveObj = {
+          getForm({ eventData }) {
+            return toSave()
+          }
+        }
+        const commonSubmitObj = {
+          getForm({ eventData }) {
+            const actionType = eventData?.bpmInfo?.actionType
+            if (!actionType) {
+              return toSubmit()
+            }
+          }
+        }
+        const bpmInstance = initBpm(bpmMessage, props.bpmActions)
+        bpmInstance.setDefaultactions({
+          [SUBMIT_TYPE.SEND]: commonSubmitObj,
+          [SUBMIT_TYPE.SUBMIT]: commonSubmitObj,
+          [SUBMIT_TYPE.GIVE]: commonSaveObj,
+          [SUBMIT_TYPE.AGREE]: commonSaveObj,
+          [SUBMIT_TYPE.DRAFT_HANDLE]: commonSaveObj,
+        })
+      }
+    })
     return () => {
       if (!pageConfigRef.value) {
         return null

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

@@ -8,6 +8,7 @@
   .el-collapse {
     --el-collapse-header-height: 22px;
     --el-collapse-header-font-size: 14px;
+    --el-collapse-header-text-color: #1F2329;
     // margin-bottom: var(--prmary-marign);
     .el-collapse-item__header {
       padding-bottom: 12px;

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

@@ -6,3 +6,6 @@
 .el-table th.el-table__cell.is-leaf, .el-table td.el-table__cell{
   border-bottom: 0px;
 }
+.el-table .cell {
+  padding: 0 16px;
+}

package/src/utils/const.js

@@ -93,7 +93,7 @@ export const commonPropsType = {
     type: Boolean,
     default: false,
     getValue(config, props, modelValue) {
-      return config.clearableFlag === '1'
+      return config.clearableFlag == '1'
     }
   },
   // 组件是否必填
@@ -101,7 +101,7 @@ export const commonPropsType = {
     type: Boolean,
     default: false,
     getValue(config, props, modelValue) {
-      return config.requiredFlag === '1'
+      return config.requiredFlag == '1'
     }
   },
   // 组件是否展示必填标识
@@ -175,15 +175,15 @@ export function calcDisable(config, mode) {
     mode === MODE.LOG ?
       (
         config.logAlong || isPatchComponent([FORM_META_TYPE, ...NOT_LOG_EFFECT_TYPE], config) ?
-          config.editFlag === '0' :
+          config.editFlag == '0' :
           true
       ) :
       mode === MODE.DETAIL ?
         (config.detailAlong || isPatchComponent([FORM_META_TYPE, ...NOT_LOG_EFFECT_TYPE], config) ?
-          config.editFlag === '0' :
+          config.editFlag == '0' :
           true
         ) :
-        config.editFlag === '0'
+        config.editFlag == '0'
   return flag
 }
 

package/src/utils/render.jsx

@@ -332,7 +332,7 @@ export function normalConfig({
 
 // 从按钮的服务编排中，获取到按钮中配置的表格中的config，并且绑定表格的分页
 function getTableServices(lcpPageServiceMapVOList = [], { dynamicMapComp, dynamicMapCompKeys, dynamicHireRelat }) {
-  const mixinServiceConfig = lcpPageServiceMapVOList.find(service => service.serviceType === '1')
+  const mixinServiceConfig = lcpPageServiceMapVOList.find(service => service.serviceType == '1')
   const searchServices = lcpPageServiceMapVOList.filter(service => service.transactionType == '1')
   if (searchServices.length) {
     return searchServices.map(service => {
@@ -795,7 +795,7 @@ function getFormItemExtendProps(config, lang, params, compProps) {
 }
 
 function getFormItemRule(config, lang, params, compProps) {
-  const required = config.requiredFlag === '1'
+  const required = config.requiredFlag == '1'
   const onlyRequiredFlag = config.onlyRequiredFlag
   let trigger = ['blur', 'change']
   // 如果是input框并且开启了金额显示
@@ -959,7 +959,7 @@ function normalLabelTipContent(content = '') {
 function createFormLable(config, lang = 'zh') {
   const ElTooltip = resolveComponent('el-tooltip')
   const elIcon = resolveComponent('el-icon')
-  const required = config.requiredFlag === '1' && config.hiddenRequiredFlag != '1'
+  const required = config.requiredFlag == '1' && config.hiddenRequiredFlag != '1'
   const slots = {}
   slots.default = () => {
     return <span class="label-tip"><elIcon size="17">