resolver-egretimp-plus 0.1.17 → 0.1.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "resolver-egretimp-plus",
-  "version": "0.1.17",
+  "version": "0.1.18",
   "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) })
+            // 保存成功的回调
+            afterRequestService: createAfterRequestService((ret) => { resolve(ret) })
           })
-        } else {
-          return new Promise((resolve) => {
-            saveButton?.vm?.click({
-              // 保存成功的回调
-              afterRequestService: createAfterRequestService((ret) => { resolve(ret) })
-            })
-          })
-        }
+        })
       } else {
         messageInstance?.warning?.('no set bpmSubmitBtn, or bpmSubmitBtn is invalid, at preset, bpmSubmitBtn:', props.bpmSubmitBtn)
       }

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/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/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 {