mali-ui-plus 1.1.13 → 1.1.14

package/env/index.js

@@ -184,8 +184,9 @@ function getTransporter () {
   if (!currTransporter) {
     currTransporter = new Promise((resolve, reject) => {
       axios.get(`${apiURL}/emai/getSmtpOptions`).then(res => {
-        const transporter = nodemailer.createTransport(smtpTransport(res.data))
-        resolve(transporter)
+        const smtpOptions = res.data
+        const transporter = nodemailer.createTransport(smtpTransport(smtpOptions))
+        resolve({ transporter, smtpOptions })
       }).catch((e) => {
         console.log('获取邮箱配置失败')
         reject(e)
@@ -197,19 +198,24 @@ function getTransporter () {
 
 function sendMail ({ receivedBy, subject, html }) {
   return new Promise((resolve, reject) => {
-    getTransporter().then((transporter) => {
-      transporter.sendMail({
-        from: 'xuliangzhan@ddscan.cn',
-        to: receivedBy,
-        subject,
-        html
-      }, function (error) {
-        if (error) {
-          reject(error)
-        } else {
-          resolve()
-        }
-      })
+    getTransporter().then(({ transporter, smtpOptions }) => {
+      if (smtpOptions) {
+        transporter.sendMail({
+          from: smtpOptions.auth.user,
+          to: receivedBy,
+          subject,
+          html
+        }, function (error) {
+          if (error) {
+            reject(error)
+          } else {
+            resolve()
+          }
+        })
+      } else {
+        const e = {}
+        reject(e)
+      }
     }).catch((e) => {
       reject(e)
     })
@@ -232,19 +238,27 @@ function sendQyWechatMsg (webhook, params) {
   })
 }
 
+const runSystemName = 'PC端'
+
 function getBuildMsg (description, time) {
   return `
-# <font color="info">${[getCustomName(process.env.VUE_APP_CUSTOM_MODULE), description, '（PC端）'].join('')}</font> 【${getEnvName(process.env.VUE_APP_MODE)}】 开始构建
+# <font color="info">${[getCustomName(process.env.VUE_APP_CUSTOM_MODULE), description].join('')}</font> 开始构建
+>> 平台：<font color="comment">${runSystemName}</font>
+${process.env.VUE_APP_MODE ? `>> 环境：<font color="comment">${getEnvName(process.env.VUE_APP_MODE)}</font>` : ''}
 >> 构建时间：<font color="comment">${XEUtils.toDateString(XEUtils.toStringDate(process.env.VUE_APP_PUBLISH_DATE, 'yyyyMMddHHmmss'), 'yyyy-MM-dd HH:mm:ss')}</font>
 >> 预计用时：<font color="comment">${time || 15}分钟</font>
+${process.env.BUILD_USER ? `>> 操作人：${process.env.BUILD_USER}` : ''}
 <font color="comment">-自动化发版</font>
 `
 }
 
 function getBuildSuccessMsg (description) {
   return `
-# <font color="info">${[getCustomName(process.env.VUE_APP_CUSTOM_MODULE), description, '（PC端）'].join('')}</font> 【${getEnvName(process.env.VUE_APP_MODE)}】 <font color="info">发版成功</font>
->> 部署时间：<font color="comment">${XEUtils.toDateString(XEUtils.toStringDate(process.env.VUE_APP_PUBLISH_DATE, 'yyyyMMddHHmmss'), 'yyyy-MM-dd HH:mm:ss')}</font>
+# <font color="info">${[getCustomName(process.env.VUE_APP_CUSTOM_MODULE), description].join('')}</font> <font color="info">发版成功</font>
+>> 平台：<font color="comment">${runSystemName}</font>
+${process.env.VUE_APP_MODE ? `>> 环境：<font color="comment">${getEnvName(process.env.VUE_APP_MODE)}</font>` : ''}
+${process.env.VUE_APP_PUBLISH_DATE ? `>> 时间：<font color="comment">${XEUtils.toDateString(XEUtils.toStringDate(process.env.VUE_APP_PUBLISH_DATE, 'yyyyMMddHHmmss'), 'yyyy-MM-dd HH:mm:ss')}</font>` : ''}
+${process.env.BUILD_USER ? `>> 操作人：${process.env.BUILD_USER}` : ''}
 ${process.env.VUE_APP_URL ? `>> 访问地址：[${process.env.VUE_APP_URL}](${process.env.VUE_APP_URL})` : ''}
 <font color="comment">-自动化发版</font>
 `

package/lib/mali-ui-plus.common.js

@@ -9643,6 +9643,7 @@ __webpack_require__.d(all_namespaceObject, {
   "config": function() { return config; },
   "formats": function() { return formats; },
   "globalConfs": function() { return globalConfs; },
+  "globalStore": function() { return globalStore; },
   "hooks": function() { return hooks; },
   "install": function() { return install; },
   "interceptor": function() { return interceptor; },
@@ -10092,7 +10093,7 @@ var GlobalConfig = {
 ;// CONCATENATED MODULE: ./node_modules/vxe-table/es/tools/log.js
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("4.5.10", "] ").concat(conf.i18n(message, params));
+  return "[vxe-table v".concat("4.5.11", "] ").concat(conf.i18n(message, params));
 }
 function outLog(type) {
   return function (message, params) {
@@ -11933,11 +11934,12 @@ var VXETableConfig = /** @class */function () {
 var globalConfs = new VXETableConfig();
 var v = 'v4';
 var setup = config;
+var globalStore = {};
 var VXETable = {
   v: v,
-  version: "4.5.10",
+  version: "4.5.11",
   setup: setup,
-  config: config,
+  globalStore: globalStore,
   interceptor: interceptor,
   renderer: renderer,
   commands: commands,
@@ -11947,7 +11949,10 @@ var VXETable = {
   hooks: hooks,
   use: use,
   t: t,
-  _t: _t
+  _t: _t,
+  // 已废弃
+  config: config,
+  globalConfs: globalConfs
 };
 
 
@@ -38950,14 +38955,20 @@ var orderStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_ORDER';
         });
         if (props.autoResize) {
           var resizeOpts = computeResizeleOpts.value;
+          var refreshDelay = resizeOpts.refreshDelay;
           var el = refElem.value;
           var parentEl = tablePrivateMethods.getParentElem();
-          resizeObserver = createResizeEvent(resizeOpts.refreshDelay ? xe_utils_default().throttle(function () {
-            tableMethods.recalculate(true);
-          }, resizeOpts.refreshDelay, {
+          var handleOptimizeResize_1 = refreshDelay ? xe_utils_default().throttle(function () {
+            return tableMethods.recalculate(true);
+          }, refreshDelay, {
             leading: true,
             trailing: true
-          }) : function () {
+          }) : null;
+          resizeObserver = createResizeEvent(handleOptimizeResize_1 ? function () {
+            if (props.autoResize) {
+              requestAnimationFrame(handleOptimizeResize_1);
+            }
+          } : function () {
             if (props.autoResize) {
               tableMethods.recalculate(true);
             }
@@ -40110,8 +40121,8 @@ const VXETablePluginExportXLSX = {
 /* harmony default export */ var plugin_xlsx = (VXETablePluginExportXLSX);
 ;// CONCATENATED MODULE: ./config/index.ts
 
-let mlZIndex = 0;
-const globalStore = {
+let mlZIndex = 1000;
+const config_globalStore = {
   version: 1,
   size: null,
   // 全局仓库标识
@@ -40245,7 +40256,7 @@ const globalStore = {
     amountAlign: ''
   }
 };
-/* harmony default export */ var config_0 = (globalStore);
+/* harmony default export */ var config_0 = (config_globalStore);
 ;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js!./node_modules/ts-loader/index.js??clonedRuleSet-41.use[2]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./components/ml-icon/MlIcon.vue?vue&type=script&lang=ts&setup=true
 
 
@@ -40873,11 +40884,15 @@ const MlTextarea_exports_ = MlTextareavue_type_script_lang_ts_setup_true;
       type: Array,
       default: () => []
     },
+    optionProps: {
+      type: Object,
+      default: () => ({})
+    },
     optionGroups: {
       type: Array,
       default: () => []
     },
-    optionProps: {
+    optionGroupProps: {
       type: Object,
       default: () => ({})
     },
@@ -40952,6 +40967,15 @@ const MlTextarea_exports_ = MlTextareavue_type_script_lang_ts_setup_true;
     const optDisabledField = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
       return optOptions.value.disabled || 'disabled';
     });
+    const gptOptions = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
+      return Object.assign({}, props.optionGroupProps);
+    });
+    const gptLabelField = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
+      return gptOptions.value.label || 'label';
+    });
+    const gptOptionsField = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
+      return gptOptions.value.options || 'options';
+    });
     const updateLabel = () => {
       const item = props.options.find(item => item[optValueField.value] === props.modelValue);
       emit('update:label', item ? item[optLabelField.value] : '');
@@ -41035,10 +41059,10 @@ const MlTextarea_exports_ = MlTextareavue_type_script_lang_ts_setup_true;
         default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(() => [((0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(true), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementBlock)(external_commonjs_vue_commonjs2_vue_root_Vue_.Fragment, null, (0,external_commonjs_vue_commonjs2_vue_root_Vue_.renderList)(__props.optionGroups, (group, gIndex) => {
           return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createBlock)(_component_el_option_group, {
             key: gIndex,
-            label: group.label,
+            label: group[(0,external_commonjs_vue_commonjs2_vue_root_Vue_.unref)(gptLabelField)],
             disabled: group[(0,external_commonjs_vue_commonjs2_vue_root_Vue_.unref)(optDisabledField)]
           }, {
-            default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(() => [((0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(true), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementBlock)(external_commonjs_vue_commonjs2_vue_root_Vue_.Fragment, null, (0,external_commonjs_vue_commonjs2_vue_root_Vue_.renderList)(group.options, (item, oIndex) => {
+            default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(() => [((0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(true), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementBlock)(external_commonjs_vue_commonjs2_vue_root_Vue_.Fragment, null, (0,external_commonjs_vue_commonjs2_vue_root_Vue_.renderList)(group[(0,external_commonjs_vue_commonjs2_vue_root_Vue_.unref)(gptOptionsField)], (item, oIndex) => {
               return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createBlock)(_component_el_option, {
                 key: `${gIndex}_${oIndex}`,
                 value: item[(0,external_commonjs_vue_commonjs2_vue_root_Vue_.unref)(optValueField)],
@@ -61902,7 +61926,7 @@ function index_config(options) {
   return config_0;
 }
 const MaliUI = {
-  version: "1.1.12",
+  version: "1.1.13",
   install: index_install,
   config: index_config,
   renderer: {

package/lib/mali-ui-plus.umd.js

@@ -9653,6 +9653,7 @@ __webpack_require__.d(all_namespaceObject, {
   "config": function() { return config; },
   "formats": function() { return formats; },
   "globalConfs": function() { return globalConfs; },
+  "globalStore": function() { return globalStore; },
   "hooks": function() { return hooks; },
   "install": function() { return install; },
   "interceptor": function() { return interceptor; },
@@ -10102,7 +10103,7 @@ var GlobalConfig = {
 ;// CONCATENATED MODULE: ./node_modules/vxe-table/es/tools/log.js
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("4.5.10", "] ").concat(conf.i18n(message, params));
+  return "[vxe-table v".concat("4.5.11", "] ").concat(conf.i18n(message, params));
 }
 function outLog(type) {
   return function (message, params) {
@@ -11943,11 +11944,12 @@ var VXETableConfig = /** @class */function () {
 var globalConfs = new VXETableConfig();
 var v = 'v4';
 var setup = config;
+var globalStore = {};
 var VXETable = {
   v: v,
-  version: "4.5.10",
+  version: "4.5.11",
   setup: setup,
-  config: config,
+  globalStore: globalStore,
   interceptor: interceptor,
   renderer: renderer,
   commands: commands,
@@ -11957,7 +11959,10 @@ var VXETable = {
   hooks: hooks,
   use: use,
   t: t,
-  _t: _t
+  _t: _t,
+  // 已废弃
+  config: config,
+  globalConfs: globalConfs
 };
 
 
@@ -38960,14 +38965,20 @@ var orderStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_ORDER';
         });
         if (props.autoResize) {
           var resizeOpts = computeResizeleOpts.value;
+          var refreshDelay = resizeOpts.refreshDelay;
           var el = refElem.value;
           var parentEl = tablePrivateMethods.getParentElem();
-          resizeObserver = createResizeEvent(resizeOpts.refreshDelay ? xe_utils_default().throttle(function () {
-            tableMethods.recalculate(true);
-          }, resizeOpts.refreshDelay, {
+          var handleOptimizeResize_1 = refreshDelay ? xe_utils_default().throttle(function () {
+            return tableMethods.recalculate(true);
+          }, refreshDelay, {
             leading: true,
             trailing: true
-          }) : function () {
+          }) : null;
+          resizeObserver = createResizeEvent(handleOptimizeResize_1 ? function () {
+            if (props.autoResize) {
+              requestAnimationFrame(handleOptimizeResize_1);
+            }
+          } : function () {
             if (props.autoResize) {
               tableMethods.recalculate(true);
             }
@@ -40120,8 +40131,8 @@ const VXETablePluginExportXLSX = {
 /* harmony default export */ var plugin_xlsx = (VXETablePluginExportXLSX);
 ;// CONCATENATED MODULE: ./config/index.ts
 
-let mlZIndex = 0;
-const globalStore = {
+let mlZIndex = 1000;
+const config_globalStore = {
   version: 1,
   size: null,
   // 全局仓库标识
@@ -40255,7 +40266,7 @@ const globalStore = {
     amountAlign: ''
   }
 };
-/* harmony default export */ var config_0 = (globalStore);
+/* harmony default export */ var config_0 = (config_globalStore);
 ;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js!./node_modules/ts-loader/index.js??clonedRuleSet-86.use[2]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./components/ml-icon/MlIcon.vue?vue&type=script&lang=ts&setup=true
 
 
@@ -40883,11 +40894,15 @@ const MlTextarea_exports_ = MlTextareavue_type_script_lang_ts_setup_true;
       type: Array,
       default: () => []
     },
+    optionProps: {
+      type: Object,
+      default: () => ({})
+    },
     optionGroups: {
       type: Array,
       default: () => []
     },
-    optionProps: {
+    optionGroupProps: {
       type: Object,
       default: () => ({})
     },
@@ -40962,6 +40977,15 @@ const MlTextarea_exports_ = MlTextareavue_type_script_lang_ts_setup_true;
     const optDisabledField = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
       return optOptions.value.disabled || 'disabled';
     });
+    const gptOptions = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
+      return Object.assign({}, props.optionGroupProps);
+    });
+    const gptLabelField = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
+      return gptOptions.value.label || 'label';
+    });
+    const gptOptionsField = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
+      return gptOptions.value.options || 'options';
+    });
     const updateLabel = () => {
       const item = props.options.find(item => item[optValueField.value] === props.modelValue);
       emit('update:label', item ? item[optLabelField.value] : '');
@@ -41045,10 +41069,10 @@ const MlTextarea_exports_ = MlTextareavue_type_script_lang_ts_setup_true;
         default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(() => [((0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(true), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementBlock)(external_commonjs_vue_commonjs2_vue_root_Vue_.Fragment, null, (0,external_commonjs_vue_commonjs2_vue_root_Vue_.renderList)(__props.optionGroups, (group, gIndex) => {
           return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createBlock)(_component_el_option_group, {
             key: gIndex,
-            label: group.label,
+            label: group[(0,external_commonjs_vue_commonjs2_vue_root_Vue_.unref)(gptLabelField)],
             disabled: group[(0,external_commonjs_vue_commonjs2_vue_root_Vue_.unref)(optDisabledField)]
           }, {
-            default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(() => [((0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(true), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementBlock)(external_commonjs_vue_commonjs2_vue_root_Vue_.Fragment, null, (0,external_commonjs_vue_commonjs2_vue_root_Vue_.renderList)(group.options, (item, oIndex) => {
+            default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(() => [((0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(true), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementBlock)(external_commonjs_vue_commonjs2_vue_root_Vue_.Fragment, null, (0,external_commonjs_vue_commonjs2_vue_root_Vue_.renderList)(group[(0,external_commonjs_vue_commonjs2_vue_root_Vue_.unref)(gptOptionsField)], (item, oIndex) => {
               return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createBlock)(_component_el_option, {
                 key: `${gIndex}_${oIndex}`,
                 value: item[(0,external_commonjs_vue_commonjs2_vue_root_Vue_.unref)(optValueField)],
@@ -61912,7 +61936,7 @@ function index_config(options) {
   return config_0;
 }
 const MaliUI = {
-  version: "1.1.12",
+  version: "1.1.13",
   install: index_install,
   config: index_config,
   renderer: {