ztxkutils 2.10.66-20 → 2.10.66-22

package/dist/fileOperation.js

@@ -14,12 +14,12 @@ function downloadFile(apiUrl, fileId, fileName, otherOption) {
     fileId = encodeFileIdByDownload(fileId);
     var xhr = new XMLHttpRequest();
     var token = '';
-    var addWaterMark = 'true';
+    var addWaterMark = 'false';
     if (typeof otherOption === 'object') {
         token = getToken() || (otherOption === null || otherOption === void 0 ? void 0 : otherOption.authToken);
         addWaterMark = (otherOption === null || otherOption === void 0 ? void 0 : otherOption.addWaterMark)
             ? otherOption === null || otherOption === void 0 ? void 0 : otherOption.addWaterMark
-            : 'true';
+            : 'false';
     }
     else {
         token = getToken() || otherOption;
@@ -30,7 +30,7 @@ function downloadFile(apiUrl, fileId, fileName, otherOption) {
     var isLegalWaterMark = typeof addWaterMark === 'boolean' ||
         addWaterMark === 'true' ||
         addWaterMark === 'false';
-    xhr.open('GET', _apiUrl + "/api/zmdms-resource/oss/endpoint/download-file/" + fileId + "?Zmdms-Auth=bearer " + token + "&addWaterMark=" + (isLegalWaterMark ? addWaterMark : true), true);
+    xhr.open('GET', _apiUrl + "/api/zmdms-resource/oss/endpoint/download-file/" + fileId + "?Zmdms-Auth=bearer " + token + "&addWaterMark=" + (isLegalWaterMark ? addWaterMark : false), true);
     xhr.responseType = 'blob';
     xhr.onload = function () {
         if (xhr.status === 200 || xhr.status === 201) {
@@ -51,7 +51,7 @@ function downloadFile(apiUrl, fileId, fileName, otherOption) {
 function downloadFileCallBack(apiUrl, fileId, fileName, otherOption) {
     // 给附件id加密
     fileId = encodeFileIdByDownload(fileId);
-    var _a = otherOption || {}, authToken = _a.authToken, callbackAfter = _a.callbackAfter, callbackError = _a.callbackError, _b = _a.addWaterMark, addWaterMark = _b === void 0 ? true : _b;
+    var _a = otherOption || {}, authToken = _a.authToken, callbackAfter = _a.callbackAfter, callbackError = _a.callbackError, _b = _a.addWaterMark, addWaterMark = _b === void 0 ? false : _b;
     var xhr = new XMLHttpRequest();
     var token = getToken() || authToken;
     var _apiUrl = apiUrl.endsWith('/')
@@ -60,7 +60,7 @@ function downloadFileCallBack(apiUrl, fileId, fileName, otherOption) {
     var isLegalWaterMark = typeof addWaterMark === 'boolean' ||
         addWaterMark === 'true' ||
         addWaterMark === 'false';
-    xhr.open('GET', _apiUrl + "/api/zmdms-resource/oss/endpoint/download-file/" + fileId + "?Zmdms-Auth=bearer " + token + "&addWaterMark=" + (isLegalWaterMark ? addWaterMark : true), true);
+    xhr.open('GET', _apiUrl + "/api/zmdms-resource/oss/endpoint/download-file/" + fileId + "?Zmdms-Auth=bearer " + token + "&addWaterMark=" + (isLegalWaterMark ? addWaterMark : false), true);
     xhr.responseType = 'blob';
     xhr.onload = function () {
         if (xhr.status === 200 || xhr.status === 201) {
@@ -91,7 +91,7 @@ function downloadFileCallBack(apiUrl, fileId, fileName, otherOption) {
 function batchDownloadFileCallBack(apiUrl, fileIds, fileNames, otherOption) {
     // 给附件id加密
     fileIds = encodeFileIdByDownload(fileIds);
-    var _a = otherOption || {}, authToken = _a.authToken, zipName = _a.zipName, _b = _a.addWaterMark, addWaterMark = _b === void 0 ? true : _b, callbackAfter = _a.callbackAfter, callbackError = _a.callbackError;
+    var _a = otherOption || {}, authToken = _a.authToken, zipName = _a.zipName, _b = _a.addWaterMark, addWaterMark = _b === void 0 ? false : _b, callbackAfter = _a.callbackAfter, callbackError = _a.callbackError;
     var xhr = new XMLHttpRequest();
     var token = getToken() || authToken;
     var _apiUrl = apiUrl.endsWith('/')
@@ -126,7 +126,7 @@ function batchDownloadFileCallBack(apiUrl, fileIds, fileNames, otherOption) {
         addWaterMark === 'true' ||
         addWaterMark === 'false';
     // 不传附件名
-    xhr.send("attachIds=" + fileIds + "&zipName=" + zipName + "&addWaterMark=" + (isLegalWaterMark ? addWaterMark : true));
+    xhr.send("attachIds=" + fileIds + "&zipName=" + zipName + "&addWaterMark=" + (isLegalWaterMark ? addWaterMark : false));
     // xhr.send(
     //   `attachIds=${fileIds}&fileNames=${fileNames}&zipName=${zipName}&addWaterMark=${addWaterMark}`
     // );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ztxkutils",
-  "version": "2.10.66-20",
+  "version": "2.10.66-22",
   "description": "",
   "main": "./dist/index.js",
   "module": "./dist/index.js",

package/zti18n-cli/bin/index.js

@@ -1,3 +1,3 @@
-#!/usr/bin/env node
-
-require('../');
+#!/usr/bin/env node
+
+require('../');

package/zti18n-cli/index.js

@@ -1,23 +1,23 @@
-const program = require('./src');
-const initFileConf = require('./src/command/initFileConf');
-
-program
-  .command('init')
-  .alias('i')
-  .description('init locales conf')
-  .option('--vue', 'init for vue project')
-  .action(function (options) {
-    initFileConf(options.vue);
-  })
-  .on('--help', function () {
-    console.log('  Examples:');
-    console.log();
-    console.log('    $ zti18n init -c ./config/prod.config.js');
-    console.log();
-  });
-
-program.command('*').action(function (cmd) {
-  console.log('unknown command "%s"', cmd);
-});
-
-program.parse(process.argv);
+const program = require('./src');
+const initFileConf = require('./src/command/initFileConf');
+
+program
+  .command('init')
+  .alias('i')
+  .description('init locales conf')
+  .option('--vue', 'init for vue project')
+  .action(function (options) {
+    initFileConf(options.vue);
+  })
+  .on('--help', function () {
+    console.log('  Examples:');
+    console.log();
+    console.log('    $ zti18n init -c ./config/prod.config.js');
+    console.log();
+  });
+
+program.command('*').action(function (cmd) {
+  console.log('unknown command "%s"', cmd);
+});
+
+program.parse(process.argv);

package/zti18n-cli/src/command/convert.js

@@ -1,17 +1,17 @@
-const {
-  transformReactIntlToReactIntlUniversal,
-} = require('../../../zti18n-core');
-const mergeOptions = require('../utils/mergeOptions');
-const log = require('../utils/log');
-
-module.exports = function doConvertToReactIntlUniversal(programOption) {
-  const options = mergeOptions(programOption, ['entry', 'exclude', 'locales']);
-
-  if (!options.entry) {
-    log.error('\n · 使用 -e [path] 或 --entry [path] 命令增加待转换的源码目录');
-    log.error(" · 或在配置文件中设置 'entry' 字段\n");
-    process.exit(2);
-  }
-
-  transformReactIntlToReactIntlUniversal(options);
-};
+const {
+  transformReactIntlToReactIntlUniversal,
+} = require('../../../zti18n-core');
+const mergeOptions = require('../utils/mergeOptions');
+const log = require('../utils/log');
+
+module.exports = function doConvertToReactIntlUniversal(programOption) {
+  const options = mergeOptions(programOption, ['entry', 'exclude', 'locales']);
+
+  if (!options.entry) {
+    log.error('\n · 使用 -e [path] 或 --entry [path] 命令增加待转换的源码目录');
+    log.error(" · 或在配置文件中设置 'entry' 字段\n");
+    process.exit(2);
+  }
+
+  transformReactIntlToReactIntlUniversal(options);
+};

package/zti18n-cli/src/command/convert2.js

@@ -1,35 +1,35 @@
-const fs = require('fs');
-const { transformReactIntlUniveralToDi18n } = require('../../../zti18n-core');
-const mergeOptions = require('../utils/mergeOptions');
-const log = require('../utils/log');
-
-module.exports = function doConvert(programOption) {
-  const options = mergeOptions(programOption, ['entry', 'exclude', 'locales']);
-
-  if (!options.entry) {
-    log.error('no entry is specified');
-    process.exit(2);
-  }
-
-  if (Array.isArray(options.entry)) {
-    if (!Array.isArray(options.output)) {
-      log.error('output should be array too, since entry is array');
-      process.exit(2);
-    }
-
-    if (options.output.length !== options.entry.length) {
-      log.error('output length are not equal to entry length');
-      process.exit(2);
-    }
-  }
-
-  if (options.output) {
-    [].concat(options.output).forEach((outputDir) => {
-      if (!fs.existsSync(outputDir)) {
-        fs.mkdirSync(outputDir);
-      }
-    });
-  }
-
-  return transformReactIntlUniveralToDi18n(options);
-};
+const fs = require('fs');
+const { transformReactIntlUniveralToDi18n } = require('../../../zti18n-core');
+const mergeOptions = require('../utils/mergeOptions');
+const log = require('../utils/log');
+
+module.exports = function doConvert(programOption) {
+  const options = mergeOptions(programOption, ['entry', 'exclude', 'locales']);
+
+  if (!options.entry) {
+    log.error('no entry is specified');
+    process.exit(2);
+  }
+
+  if (Array.isArray(options.entry)) {
+    if (!Array.isArray(options.output)) {
+      log.error('output should be array too, since entry is array');
+      process.exit(2);
+    }
+
+    if (options.output.length !== options.entry.length) {
+      log.error('output length are not equal to entry length');
+      process.exit(2);
+    }
+  }
+
+  if (options.output) {
+    [].concat(options.output).forEach((outputDir) => {
+      if (!fs.existsSync(outputDir)) {
+        fs.mkdirSync(outputDir);
+      }
+    });
+  }
+
+  return transformReactIntlUniveralToDi18n(options);
+};

package/zti18n-cli/src/command/initFileConf.js

@@ -1,133 +1,133 @@
-const glob = require('glob');
-const fs = require('fs');
-const path = require('path');
-const inquirer = require('inquirer');
-const prettier = require('prettier');
-const FileConf = require('../conf/FileConf');
-const reactOptions = require('../utils/reactOptions');
-const vueOptions = require('../utils/vueOptions');
-const log = require('../utils/log');
-
-function getLocaleFiles({ path, exclude }) {
-  return glob.sync(`${path}/**/*.json`, {
-    ignore: (exclude || []).map((e) => `${path}/${e}`),
-  });
-}
-
-async function doInquire() {
-  // 1. whether overwrite?
-  let configExist = true;
-  try {
-    fs.accessSync('./zti18n.config.js');
-  } catch (e) {
-    configExist = false;
-  }
-
-  if (configExist) {
-    const ans = await inquirer.prompt([
-      {
-        name: 'overwrite',
-        type: 'confirm',
-        message: '配置文件 zti18n.config.js 已存在，是否覆盖？',
-      },
-    ]);
-
-    if (!ans.overwrite) process.exit(0);
-  }
-
-  // 2. first i18n?
-  let ans = await inquirer.prompt([
-    {
-      name: 'firstI18n',
-      type: 'confirm',
-      message: '是否初次国际化？',
-    },
-    {
-      name: 'localePath',
-      type: 'input',
-      message: '请输入现有国际化资源路径：',
-      when(answers) {
-        return !answers.firstI18n;
-      },
-    },
-  ]);
-
-  return ans;
-}
-
-module.exports = async function initFileConf(isVue) {
-  const answers = await doInquire();
-  const { localePath = 'locales', firstI18n } = answers;
-
-  const defaultOptions = isVue ? vueOptions : reactOptions;
-  const options = {
-    ...defaultOptions,
-    localeConf: { type: 'file', folder: localePath },
-  };
-
-  // 配置信息写入文件
-  fs.writeFileSync(
-    './zti18n.config.js',
-    prettier.format('module.exports = ' + JSON.stringify(options), {
-      parser: 'babel',
-      singleQuote: true,
-      trailingComma: 'es5',
-    }),
-    'utf8'
-  );
-
-  let createTasks = [];
-  const confService = new FileConf(options.localeConf.folder);
-
-  if (!firstI18n) {
-    // 非首次国际化，本地代码中已有国际化资源
-    const locales = getLocaleFiles({ path: localePath });
-
-    // 读取国际化资源
-    const data = locales.map((element) => {
-      // TODO: 支持国际化资源为 js 文件的情况，目前只支持为 json 文件。
-      const json = fs.readFileSync(element, {
-        encoding: 'utf-8',
-      });
-
-      // 使用现有文件名为语言 key
-      const key = path.parse(element).name;
-
-      return {
-        key,
-        value: JSON.parse(json),
-        confName: key,
-      };
-    });
-
-    createTasks = data.map(({ confName, value, key }) => {
-      let commentValue = {};
-      if (key !== options.primaryLocale) {
-        commentValue = data.find((d) => d.key === options.primaryLocale).value;
-      }
-      return confService.createConf(confName, value, commentValue, key);
-    });
-  } else {
-    // 首次国际化，只需要创建配置
-    createTasks = options.supportedLocales.map((key) => {
-      const value = { TBD: 'TBD' }; // 创建配置时，必须要有一个 k/V
-      const confName = key; // 初始化时，先创建测试环境的配置
-      return confService.createConf(confName, value, {}, key);
-    });
-  }
-
-  const createTaskResults = await Promise.all(createTasks);
-  log.success('[done] conf created');
-  console.log(createTaskResults);
-
-  // 将已有国际化资源的配置发布
-  if (!firstI18n) {
-    const publishTasks = options.supportedLocales.map((key) => {
-      return confService.publishConf(`${key}-test`);
-    });
-
-    const publishTaskResults = await Promise.all(publishTasks);
-    log.success('[done] conf published');
-    console.log(publishTaskResults);
-  }
-};
+const glob = require('glob');
+const fs = require('fs');
+const path = require('path');
+const inquirer = require('inquirer');
+const prettier = require('prettier');
+const FileConf = require('../conf/FileConf');
+const reactOptions = require('../utils/reactOptions');
+const vueOptions = require('../utils/vueOptions');
+const log = require('../utils/log');
+
+function getLocaleFiles({ path, exclude }) {
+  return glob.sync(`${path}/**/*.json`, {
+    ignore: (exclude || []).map((e) => `${path}/${e}`),
+  });
+}
+
+async function doInquire() {
+  // 1. whether overwrite?
+  let configExist = true;
+  try {
+    fs.accessSync('./zti18n.config.js');
+  } catch (e) {
+    configExist = false;
+  }
+
+  if (configExist) {
+    const ans = await inquirer.prompt([
+      {
+        name: 'overwrite',
+        type: 'confirm',
+        message: '配置文件 zti18n.config.js 已存在，是否覆盖？',
+      },
+    ]);
+
+    if (!ans.overwrite) process.exit(0);
+  }
+
+  // 2. first i18n?
+  let ans = await inquirer.prompt([
+    {
+      name: 'firstI18n',
+      type: 'confirm',
+      message: '是否初次国际化？',
+    },
+    {
+      name: 'localePath',
+      type: 'input',
+      message: '请输入现有国际化资源路径：',
+      when(answers) {
+        return !answers.firstI18n;
+      },
+    },
+  ]);
+
+  return ans;
+}
+
+module.exports = async function initFileConf(isVue) {
+  const answers = await doInquire();
+  const { localePath = 'locales', firstI18n } = answers;
+
+  const defaultOptions = isVue ? vueOptions : reactOptions;
+  const options = {
+    ...defaultOptions,
+    localeConf: { type: 'file', folder: localePath },
+  };
+
+  // 配置信息写入文件
+  fs.writeFileSync(
+    './zti18n.config.js',
+    prettier.format('module.exports = ' + JSON.stringify(options), {
+      parser: 'babel',
+      singleQuote: true,
+      trailingComma: 'es5',
+    }),
+    'utf8'
+  );
+
+  let createTasks = [];
+  const confService = new FileConf(options.localeConf.folder);
+
+  if (!firstI18n) {
+    // 非首次国际化，本地代码中已有国际化资源
+    const locales = getLocaleFiles({ path: localePath });
+
+    // 读取国际化资源
+    const data = locales.map((element) => {
+      // TODO: 支持国际化资源为 js 文件的情况，目前只支持为 json 文件。
+      const json = fs.readFileSync(element, {
+        encoding: 'utf-8',
+      });
+
+      // 使用现有文件名为语言 key
+      const key = path.parse(element).name;
+
+      return {
+        key,
+        value: JSON.parse(json),
+        confName: key,
+      };
+    });
+
+    createTasks = data.map(({ confName, value, key }) => {
+      let commentValue = {};
+      if (key !== options.primaryLocale) {
+        commentValue = data.find((d) => d.key === options.primaryLocale).value;
+      }
+      return confService.createConf(confName, value, commentValue, key);
+    });
+  } else {
+    // 首次国际化，只需要创建配置
+    createTasks = options.supportedLocales.map((key) => {
+      const value = { TBD: 'TBD' }; // 创建配置时，必须要有一个 k/V
+      const confName = key; // 初始化时，先创建测试环境的配置
+      return confService.createConf(confName, value, {}, key);
+    });
+  }
+
+  const createTaskResults = await Promise.all(createTasks);
+  log.success('[done] conf created');
+  console.log(createTaskResults);
+
+  // 将已有国际化资源的配置发布
+  if (!firstI18n) {
+    const publishTasks = options.supportedLocales.map((key) => {
+      return confService.publishConf(`${key}-test`);
+    });
+
+    const publishTaskResults = await Promise.all(publishTasks);
+    log.success('[done] conf published');
+    console.log(publishTaskResults);
+  }
+};

package/zti18n-cli/src/command/publish.js

@@ -1,24 +1,24 @@
-const path = require('path');
-const mergeOptions = require('../utils/mergeOptions');
-const log = require('../utils/log');
-
-module.exports = async function publish(programOption, env = '') {
-  const options = mergeOptions(programOption, ['locales']);
-
-  let confService = null;
-  if (options.localeConf.type === 'file') {
-    const FileConf = require('../conf/FileConf');
-    confService = new FileConf(options.locales);
-  } else {
-    const Conf = require(path.join(process.cwd(), options.localeConf.path));
-    confService = new Conf(options.localeConf);
-  }
-
-  const publishTasks = options.supportedLocales.map((key) => {
-    return confService.publishConf(`${key}-${env}`);
-  });
-
-  const publishTaskResults = await Promise.all(publishTasks);
-  log.success('[done] conf published');
-  console.log(publishTaskResults);
-};
+const path = require('path');
+const mergeOptions = require('../utils/mergeOptions');
+const log = require('../utils/log');
+
+module.exports = async function publish(programOption, env = '') {
+  const options = mergeOptions(programOption, ['locales']);
+
+  let confService = null;
+  if (options.localeConf.type === 'file') {
+    const FileConf = require('../conf/FileConf');
+    confService = new FileConf(options.locales);
+  } else {
+    const Conf = require(path.join(process.cwd(), options.localeConf.path));
+    confService = new Conf(options.localeConf);
+  }
+
+  const publishTasks = options.supportedLocales.map((key) => {
+    return confService.publishConf(`${key}-${env}`);
+  });
+
+  const publishTaskResults = await Promise.all(publishTasks);
+  log.success('[done] conf published');
+  console.log(publishTaskResults);
+};

package/zti18n-cli/src/conf/BaseConf.js

@@ -1,21 +1,21 @@
-module.exports = class BaseConf {
-  createService() {
-    return Promise.resolve(true);
-  }
-
-  createConf() {
-    throw new Error('`createConf` must be overrided');
-  }
-
-  updateConf() {
-    throw new Error('`updateConf` must be overrided');
-  }
-
-  getConf() {
-    throw new Error('`getConf` must be overrided');
-  }
-
-  publishConf() {
-    return Promise.resolve(true);
-  }
-};
+module.exports = class BaseConf {
+  createService() {
+    return Promise.resolve(true);
+  }
+
+  createConf() {
+    throw new Error('`createConf` must be overrided');
+  }
+
+  updateConf() {
+    throw new Error('`updateConf` must be overrided');
+  }
+
+  getConf() {
+    throw new Error('`getConf` must be overrided');
+  }
+
+  publishConf() {
+    return Promise.resolve(true);
+  }
+};