@pisell/common 1.0.57 → 1.0.59

package/.fatherrc.ts

@@ -1,7 +1,7 @@
-import { defineConfig } from 'father';
-
-export default defineConfig({
-  // more father config: https://github.com/umijs/father/blob/master/docs/config.md
-  esm: { output: 'es' },
-  cjs: { output: 'lib' },
-});
+import { defineConfig } from 'father';
+
+export default defineConfig({
+  // more father config: https://github.com/umijs/father/blob/master/docs/config.md
+  esm: { output: 'es' },
+  cjs: { output: 'lib' },
+});

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @pisell/common
 
+## 1.0.59
+
+### Patch Changes
+
+- Updated dependencies [f341d62bb]
+  - @pisell/utils@1.0.58
+
+## 1.0.58
+
+### Patch Changes
+
+- Updated dependencies [b2454da56]
+- Updated dependencies [f3d720331]
+  - @pisell/utils@1.0.57
+
 ## 1.0.57
 
 ### Patch Changes

package/README.md

@@ -1,3 +1,3 @@
-# @pisell/common
-
+# @pisell/common
+
 pisell使用的通用组件库

package/es/index.d.ts

@@ -1,2 +1,2 @@
-declare const _default: {};
-export default _default;
+declare const _default: {};
+export default _default;

package/es/script/aws/index.js

@@ -15,12 +15,12 @@ var __dirname = process.cwd();
 var s3Client = null;
 var bucketName = '';
 
-/*******
- * @title: 初始化
- * @description:
- * @return {*}
- * @Author: zhiwei.Wang
- * @Date: 2023-11-24 14:05
+/*******
+ * @title: 初始化
+ * @description:
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2023-11-24 14:05
  */
 var init = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(directory) {
@@ -118,12 +118,12 @@ var uploadFile = /*#__PURE__*/function () {
   };
 }();
 
-/*******
- * @title: 递归上传文件夹内容
- * @description:
- * @return {*}
- * @Author: zhiwei.Wang
- * @Date: 2023-11-24 14:06
+/*******
+ * @title: 递归上传文件夹内容
+ * @description:
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2023-11-24 14:06
  */
 export var uploadFolderContents = /*#__PURE__*/function () {
   var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(directory) {
@@ -187,12 +187,12 @@ export var uploadFolderContents = /*#__PURE__*/function () {
   };
 }();
 
-/*******
- * @title: 上传资源到oss
- * @description:
- * @return {*}
- * @Author: zhiwei.Wang
- * @Date: 2023-11-24 14:04
+/*******
+ * @title: 上传资源到oss
+ * @description:
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2023-11-24 14:04
  */
 export var uploadStaticToOSS = /*#__PURE__*/function () {
   var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(directory) {

package/es/script/constants/index.js

@@ -53,6 +53,11 @@ var outPathMap = {
     prod: '../data/release/project/docs',
     release: '../data/release/project/docs',
     pre: '../data/release/project/docs'
+  },
+  saas_shop_pos: {
+    prod: '../data/release/project/saas_shop_pos',
+    release: '../data/release/project/saas_shop_pos',
+    pre: '../data/release/project/saas_shop_pos'
   }
 };
 var isSsrMap = {
@@ -65,7 +70,8 @@ var isSsrMap = {
   saas_admin: false,
   saas_shop: false,
   saas_kds: false,
-  saas_ads: false
+  saas_ads: false,
+  saas_shop_pos: false
 };
 var checkPackages = ['@pisell/date-picker', '@pisell/lowcode-renderer', '@pisell/common', '@pisell/utils', '@pisell/materials'];
 export { outPathMap, isSsrMap, checkPackages };

package/es/script/package.json

@@ -1,4 +1,4 @@
-{
-  "name": "script",
-  "type": "module"
-}
+{
+  "name": "script",
+  "type": "module"
+}

package/es/script/release/index.js

@@ -35,10 +35,10 @@ var selectProject = function selectProject() {
   }]);
 };
 
-/**
- * @Title: 选择器函数
- * @Describe:
- * @Author: Wzw
+/**
+ * @Title: 选择器函数
+ * @Describe:
+ * @Author: Wzw
  */
 var inquirerResult = function inquirerResult(versionList) {
   return inquirer.prompt([{
@@ -58,10 +58,10 @@ var inquirerResult = function inquirerResult(versionList) {
 // 版本选择时过滤的文件夹
 var ignoreName = ['master', '.git', 'pre-master'];
 
-/**
- * @Title: 获取所选项目的版本号列表
- * @Describe:
- * @Author: Zsj
+/**
+ * @Title: 获取所选项目的版本号列表
+ * @Describe:
+ * @Author: Zsj
  */
 var getVersionList = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {

package/es/script/release/release.js

@@ -10,10 +10,10 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import { isSsrMap, outPathMap } from "../constants/index.js";
 import { connectServer as _connectServer, getServerConfig, releaseProject } from "../utils/index.js";
 
-/**
- * @Title: 执行发布类
- * @Describe:
- * @Author: Zsj
+/**
+ * @Title: 执行发布类
+ * @Describe:
+ * @Author: Zsj
  */
 var Release = /*#__PURE__*/function () {
   function Release(props) {
@@ -31,10 +31,10 @@ var Release = /*#__PURE__*/function () {
     this.isSSR = isSsrMap[this.projectName];
   }
 
-  /**
-   * @Title: 设置连接服务器配置
-   * @Describe:
-   * @Author: Zsj
+  /**
+   * @Title: 设置连接服务器配置
+   * @Describe:
+   * @Author: Zsj
    */
   _createClass(Release, [{
     key: "setConfig",
@@ -68,10 +68,10 @@ var Release = /*#__PURE__*/function () {
       }
       return setConfig;
     }()
-    /**
-     * @Title: 连接服务器
-     * @Describe:
-     * @Author: Zsj
+    /**
+     * @Title: 连接服务器
+     * @Describe:
+     * @Author: Zsj
      */
     )
   }, {
@@ -104,10 +104,10 @@ var Release = /*#__PURE__*/function () {
       }
       return connectServer;
     }()
-    /**
-     * @Title: 执行发布操作
-     * @Describe:
-     * @Author: Zsj
+    /**
+     * @Title: 执行发布操作
+     * @Describe:
+     * @Author: Zsj
      */
     )
   }, {
@@ -137,10 +137,10 @@ var Release = /*#__PURE__*/function () {
       }
       return release;
     }()
-    /**
-     * @Title: 断开服务连接
-     * @Describe:
-     * @Author: Zsj
+    /**
+     * @Title: 断开服务连接
+     * @Describe:
+     * @Author: Zsj
      */
     )
   }, {

package/es/script/uploadCode/index.js

@@ -12,10 +12,10 @@ import Release from "../release/release.js";
 import { getCurrentProjectName, getCurrentUserName, sendWebhook } from "../utils/index.js";
 import UploadCode from "./uploadCode.js";
 // {\"post\":{\"zh_cn\":{\"title\":\"my_pisell_shop release环境开始上传并发布\",\"content\":[[{\"text\":\"发布人:\",\"style\":[\"bold\"]},{\"text\":\"左胜杰\",\"style\":[\"bold\"]}],[{\"text\":\"版本号:\",\"style\":[\"bold\"]},{\"text\":\"1.0.71\",\"style\":[\"bold\"]}]]}}}
-/**
- * @Title: 选择器函数
- * @Describe:
- * @Author: Wzw
+/**
+ * @Title: 选择器函数
+ * @Describe:
+ * @Author: Wzw
  */
 var inquirerResult = function inquirerResult() {
   return inquirer.prompt([
@@ -173,7 +173,7 @@ function _init() {
           if (_fileName === 'admin') {
             _fileName = 'my_pisell_v2';
           }
-          if (['xzero', 'docs', 'saas_admin', 'saas_shop', 'saas_kds', 'saas_ads', 'saas_home'].includes(_fileName)) {
+          if (['xzero', 'docs', 'saas_admin', 'saas_shop', 'saas_shop_pos', 'saas_kds', 'saas_ads', 'saas_home'].includes(_fileName)) {
             _context.next = 42;
             break;
           }
@@ -277,41 +277,41 @@ function _init() {
 }
 export default init;
 
-/**
- *
- * 上传
- * 1. 选择项目 环境等.
- * 2. 打包
- * 3. 打包完成后生成dist文件压缩包
- * 4. 重命名为当前版本号
- * 5. 上传到服务器,并解压. 上传完成
- *
- *
- *
- * 服务器目录结构:
- *
- * project: 所有前端项目
- *
- *     my_pisel_h5: 某个项目文件夹
- *
- *          master: 当前线上环境指向的代码包
- *
- * 					v1.0.0: 某个版本
- *
- *
- * 部署, 此部分可界面化.
- * 1. 将master备份, 把对应版本的代码合并到master内.
- * 2. 重启当前服务
- *
- *
- * 回滚指定版本
- *
- * 1. 将master内文件清空并将某个版本的包解压到master内
- * 2. 重启服务
- *
- * node端需要提供以下接口
- *
- * 1. 获取每个项目的所有版本包名称.
- * 2. 通过 项目 + 版本包名称 将对应的包更新至maser 实现发布
- * 3. 将操作记录写成日志存储.
+/**
+ *
+ * 上传
+ * 1. 选择项目 环境等.
+ * 2. 打包
+ * 3. 打包完成后生成dist文件压缩包
+ * 4. 重命名为当前版本号
+ * 5. 上传到服务器,并解压. 上传完成
+ *
+ *
+ *
+ * 服务器目录结构:
+ *
+ * project: 所有前端项目
+ *
+ *     my_pisel_h5: 某个项目文件夹
+ *
+ *          master: 当前线上环境指向的代码包
+ *
+ * 					v1.0.0: 某个版本
+ *
+ *
+ * 部署, 此部分可界面化.
+ * 1. 将master备份, 把对应版本的代码合并到master内.
+ * 2. 重启当前服务
+ *
+ *
+ * 回滚指定版本
+ *
+ * 1. 将master内文件清空并将某个版本的包解压到master内
+ * 2. 重启服务
+ *
+ * node端需要提供以下接口
+ *
+ * 1. 获取每个项目的所有版本包名称.
+ * 2. 通过 项目 + 版本包名称 将对应的包更新至maser 实现发布
+ * 3. 将操作记录写成日志存储.
  */

package/es/script/uploadCode/uploadCode.js

@@ -14,10 +14,10 @@ import path from 'path';
 import { checkPackages, isSsrMap, outPathMap } from "../constants/index.js";
 import { checkPkgVersion, connectServer as _connectServer, getGitCurrentBranch, getServerConfig, isWorkingTreeClean, serverUnpack as _serverUnpack, serverUpload as _serverUpload } from "../utils/index.js";
 
-/**
- * @Title: 上传代码至服务器类
- * @Describe:
- * @Author: Zsj
+/**
+ * @Title: 上传代码至服务器类
+ * @Describe:
+ * @Author: Zsj
  */
 var UploadCode = /*#__PURE__*/function () {
   function UploadCode(props) {
@@ -42,10 +42,10 @@ var UploadCode = /*#__PURE__*/function () {
     this.outPath = outPathMap[this.projectName][this.env];
   }
 
-  /**
-   * @Title: 设置服务器连接配置
-   * @Describe:
-   * @Author: Zsj
+  /**
+   * @Title: 设置服务器连接配置
+   * @Describe:
+   * @Author: Zsj
    */
   _createClass(UploadCode, [{
     key: "setConfig",
@@ -54,10 +54,10 @@ var UploadCode = /*#__PURE__*/function () {
       return this.serverConfig;
     }
 
-    /**
-     * @Title: 发布前检查环境和参数是否正确
-     * @Describe:
-     * @Author: Zsj
+    /**
+     * @Title: 发布前检查环境和参数是否正确
+     * @Describe:
+     * @Author: Zsj
      */
   }, {
     key: "check",
@@ -119,7 +119,7 @@ var UploadCode = /*#__PURE__*/function () {
                 //   path.join(process.env.HOME, '.ssh', 'id_rsa'),
                 // );
               }
-              if (this.env === 'prod' && ['xzero', 'saas_admin', 'saas_shop', 'saas_kds', 'saas_ads', 'saas_home'].includes(this.projectName)) {
+              if (this.env === 'prod' && ['xzero', 'saas_admin', 'saas_shop', 'saas_shop_pos', 'saas_kds', 'saas_ads', 'saas_home'].includes(this.projectName)) {
                 serverConfig = serverConfigMap.aws.service[this.env];
                 serverConfig.privateKey = fs.readFileSync(serverConfig.privateKey);
               }
@@ -156,10 +156,10 @@ var UploadCode = /*#__PURE__*/function () {
       }
       return check;
     }()
-    /**
-     * @Title: 更新项目中version 并加入changelog
-     * @Describe:
-     * @Author: Zsj
+    /**
+     * @Title: 更新项目中version 并加入changelog
+     * @Describe:
+     * @Author: Zsj
      */
     )
   }, {
@@ -215,10 +215,10 @@ var UploadCode = /*#__PURE__*/function () {
       }
       return updateVersion;
     }()
-    /**
-     * @Title: 根据env执行打包
-     * @Describe:
-     * @Author: Zsj
+    /**
+     * @Title: 根据env执行打包
+     * @Describe:
+     * @Author: Zsj
      */
     )
   }, {
@@ -241,10 +241,10 @@ var UploadCode = /*#__PURE__*/function () {
       }
       return build;
     }()
-    /**
-     * @Title: 压缩dist文件为zip
-     * @Describe:
-     * @Author: Zsj
+    /**
+     * @Title: 压缩dist文件为zip
+     * @Describe:
+     * @Author: Zsj
      */
     )
   }, {
@@ -287,10 +287,10 @@ var UploadCode = /*#__PURE__*/function () {
       }
       return compress;
     }()
-    /**
-     * @Title: 连接服务器
-     * @Describe:
-     * @Author: Zsj
+    /**
+     * @Title: 连接服务器
+     * @Describe:
+     * @Author: Zsj
      */
     )
   }, {
@@ -323,10 +323,10 @@ var UploadCode = /*#__PURE__*/function () {
       }
       return connectServer;
     }()
-    /**
-     * @Title: 本地zip文件上传到服务器
-     * @Describe:
-     * @Author: Zsj
+    /**
+     * @Title: 本地zip文件上传到服务器
+     * @Describe:
+     * @Author: Zsj
      */
     )
   }, {
@@ -357,10 +357,10 @@ var UploadCode = /*#__PURE__*/function () {
       }
       return serverUpload;
     }()
-    /**
-     * @Title: 服务器中解压文件
-     * @Describe:
-     * @Author: Zsj
+    /**
+     * @Title: 服务器中解压文件
+     * @Describe:
+     * @Author: Zsj
      */
     )
   }, {
@@ -391,10 +391,10 @@ var UploadCode = /*#__PURE__*/function () {
       }
       return serverUnpack;
     }()
-    /**
-     * @Title: 删除本地zip文件
-     * @Describe:
-     * @Author: Zsj
+    /**
+     * @Title: 删除本地zip文件
+     * @Describe:
+     * @Author: Zsj
      */
     )
   }, {
@@ -403,10 +403,10 @@ var UploadCode = /*#__PURE__*/function () {
       return $(_templateObject6 || (_templateObject6 = _taggedTemplateLiteral(["rm -rf ", ".zip"])), this.currentVersion);
     }
 
-    /**
-     * @Title: 断开服务连接
-     * @Describe:
-     * @Author: Zsj
+    /**
+     * @Title: 断开服务连接
+     * @Describe:
+     * @Author: Zsj
      */
   }, {
     key: "disconnectServer",

package/es/script/utils/index.js

@@ -15,11 +15,11 @@ import path from 'path';
 import fs from 'fs';
 import ssh2 from 'ssh2';
 
-/**
- * @Title: 项目工作区是否干净
- * @Describe:
- * @Author: Zsj
- * @returns {Promise<boolean>}
+/**
+ * @Title: 项目工作区是否干净
+ * @Describe:
+ * @Author: Zsj
+ * @returns {Promise<boolean>}
  */
 var isWorkingTreeClean = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
@@ -43,9 +43,9 @@ var isWorkingTreeClean = /*#__PURE__*/function () {
   };
 }();
 
-/**
- * 获取当前分支
- * @returns {Promise<*>}
+/**
+ * 获取当前分支
+ * @returns {Promise<*>}
  */
 var getGitCurrentBranch = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
@@ -69,16 +69,18 @@ var getGitCurrentBranch = /*#__PURE__*/function () {
   };
 }();
 
-/**
- * monorepo项目名称
- * @type {string[]}
+/**
+ * monorepo项目名称
+ * @type {string[]}
  */
 var monorepoProjectNameArr = ['admin', 'my_pisell_v2', 'docs'];
 
-/**
- * @Title: 获取本地lm_config.json配置信息
- * @Describe:·
- * @Author: Zsj
+/**
+ * @Title: 获取本地lm_config.json配置信息
+ * @Describe: 从项目根目录读取配置文件，支持错误处理
+ * @Author: Zsj
+ * @param {string} project - 项目名称
+ * @returns {Object} 配置对象
  */
 var getServerConfig = /*#__PURE__*/function () {
   var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(project) {
@@ -110,10 +112,10 @@ var getServerConfig = /*#__PURE__*/function () {
   };
 }();
 
-/**
- * @Title: 连接服务器
- * @Describe:
- * @Author: Zsj
+/**
+ * @Title: 连接服务器
+ * @Describe:
+ * @Author: Zsj
  */
 var connectServer = function connectServer(config) {
   var conn = new ssh2.Client();
@@ -127,10 +129,10 @@ var connectServer = function connectServer(config) {
   });
 };
 
-/**
- * @Title: 文件上传至服务器
- * @Describe:
- * @Author: Zsj
+/**
+ * @Title: 文件上传至服务器
+ * @Describe:
+ * @Author: Zsj
  */
 var serverUpload = function serverUpload(conn, _ref4) {
   var localPath = _ref4.localPath,
@@ -169,10 +171,10 @@ var serverUpload = function serverUpload(conn, _ref4) {
   });
 };
 
-/**
- * @Title: 服务器中解压文件
- * @Describe:
- * @Author: Zsj
+/**
+ * @Title: 服务器中解压文件
+ * @Describe:
+ * @Author: Zsj
  */
 var serverUnpack = function serverUnpack(conn, _ref5) {
   var path = _ref5.path,
@@ -204,10 +206,10 @@ var serverUnpack = function serverUnpack(conn, _ref5) {
   });
 };
 
-/**
- * @Title: 选择名称进行发布操作
- * @Describe:
- * @Author: Zsj
+/**
+ * @Title: 选择名称进行发布操作
+ * @Describe:
+ * @Author: Zsj
  */
 var releaseProject = function releaseProject(conn, _ref6) {
   var path = _ref6.path,
@@ -239,10 +241,10 @@ var releaseProject = function releaseProject(conn, _ref6) {
   });
 };
 
-/**
- * @Title: version进行版本号排序
- * @Describe:
- * @Author: Zsj
+/**
+ * @Title: version进行版本号排序
+ * @Describe:
+ * @Author: Zsj
  */
 var versionSort = function versionSort(versionList) {
   return versionList.sort(function (a, b) {
@@ -259,9 +261,9 @@ var versionSort = function versionSort(versionList) {
   });
 };
 
-/**
- * 获取当前主项目名称
- * @returns {*}
+/**
+ * 获取当前主项目名称
+ * @returns {*}
  */
 var getCurrentProjectName = function getCurrentProjectName() {
   return loadJSON(path.join(process.cwd(), './package.json')).name;

package/lib/index.d.ts

@@ -1,2 +1,2 @@
-declare const _default: {};
-export default _default;
+declare const _default: {};
+export default _default;

package/lib/script/constants/index.js

@@ -79,6 +79,11 @@ var outPathMap = {
     prod: "../data/release/project/docs",
     release: "../data/release/project/docs",
     pre: "../data/release/project/docs"
+  },
+  saas_shop_pos: {
+    prod: "../data/release/project/saas_shop_pos",
+    release: "../data/release/project/saas_shop_pos",
+    pre: "../data/release/project/saas_shop_pos"
   }
 };
 var isSsrMap = {
@@ -91,7 +96,8 @@ var isSsrMap = {
   saas_admin: false,
   saas_shop: false,
   saas_kds: false,
-  saas_ads: false
+  saas_ads: false,
+  saas_shop_pos: false
 };
 var checkPackages = [
   "@pisell/date-picker",