xs-common-plugins 1.4.9 → 1.4.11

package/.idea/modules.xml

@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/xs-common-plugins.iml" filepath="$PROJECT_DIR$/.idea/xs-common-plugins.iml" />
-    </modules>
-  </component>
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/xs-common-plugins.iml" filepath="$PROJECT_DIR$/.idea/xs-common-plugins.iml" />
+    </modules>
+  </component>
 </project>

package/.idea/vcs.xml

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
 </project>

package/.idea/workspace.xml

@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AutoImportSettings">
+    <option name="autoReloadType" value="SELECTIVE" />
+  </component>
+  <component name="ChangeListManager">
+    <list default="true" id="18da8823-8844-430e-8765-342a5b83382e" name="更改" comment="feat(common): 添加弹窗ESC关闭功能并优化OSS服务&#10;&#10;- 在popup函数中新增closeOnPressEscape参数，默认值为false&#10;- 将closeOnPressEscape参数传递给对话框配置&#10;- 优化OSS服务中的getOssToken函数，防止重复请求&#10;- 添加getIng变量控制请求状态&#10;- 在请求完成后重置getIng状态&#10;- 更新版本号从1.4.10到1.4.11" />
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="ProjectColorInfo">{
+  &quot;associatedIndex&quot;: 3
+}</component>
+  <component name="ProjectId" id="34JyttMh1dkF7QtKVN47OnvRO5X" />
+  <component name="ProjectViewState">
+    <option name="autoscrollFromSource" value="true" />
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;ModuleVcsDetector.initialDetectionPerformed&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager.252&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.typescript.service.memoryLimit.init&quot;: &quot;true&quot;,
+    &quot;com.intellij.ml.llm.matterhorn.ej.ui.settings.DefaultAutoModeForALLUsers.v1&quot;: &quot;true&quot;,
+    &quot;com.intellij.ml.llm.matterhorn.ej.ui.settings.DefaultModelSelectionForGA.v1&quot;: &quot;true&quot;,
+    &quot;git-widget-placeholder&quot;: &quot;master&quot;,
+    &quot;javascript.preferred.runtime.type.id&quot;: &quot;node&quot;,
+    &quot;junie.onboarding.icon.badge.shown&quot;: &quot;true&quot;,
+    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
+    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
+    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
+    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
+    &quot;nodejs_interpreter_path&quot;: &quot;node&quot;,
+    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;settings.nodejs&quot;,
+    &quot;to.speed.mode.migration.done&quot;: &quot;true&quot;,
+    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
+  }
+}</component>
+  <component name="SharedIndexes">
+    <attachedChunks>
+      <set>
+        <option value="bundled-js-predefined-d6986cc7102b-9b0f141eb926-JavaScript-WS-253.31033.133" />
+      </set>
+    </attachedChunks>
+  </component>
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="默认任务">
+      <changelist id="18da8823-8844-430e-8765-342a5b83382e" name="更改" comment="" />
+      <created>1760946186247</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1760946186247</updated>
+      <workItem from="1760946187282" duration="11000" />
+      <workItem from="1760946201677" duration="480000" />
+      <workItem from="1760946687182" duration="513000" />
+      <workItem from="1761553442925" duration="579000" />
+      <workItem from="1766645463827" duration="4000" />
+      <workItem from="1766654268352" duration="129000" />
+      <workItem from="1768291265910" duration="1000" />
+      <workItem from="1772155854565" duration="773000" />
+    </task>
+    <task id="LOCAL-00001" summary="fix(table): 更新单元格分析逻辑以正确处理括号- 替换正则表达式检测为 includes 方法检测括号和 null&#10;- 确保只在包含成对括号且不含 null 时才匹配&#10;&#10;chore: 升级版本号至 1.4.9">
+      <option name="closed" value="true" />
+      <created>1760946269455</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1760946269455</updated>
+    </task>
+    <task id="LOCAL-00002" summary="fix(table): 更新单元格分析逻辑以正确处理括号- 替换正则表达式检测为 includes 方法检测括号和 null&#10;- 确保只在包含成对括号且不含 null 时才匹配&#10;&#10;chore: 升级版本号至 1.4.9">
+      <option name="closed" value="true" />
+      <created>1761554010562</created>
+      <option name="number" value="00002" />
+      <option name="presentableId" value="LOCAL-00002" />
+      <option name="project" value="LOCAL" />
+      <updated>1761554010562</updated>
+    </task>
+    <task id="LOCAL-00003" summary="feat(common): 添加弹窗ESC关闭功能并优化OSS服务&#10;&#10;- 在popup函数中新增closeOnPressEscape参数，默认值为false&#10;- 将closeOnPressEscape参数传递给对话框配置&#10;- 优化OSS服务中的getOssToken函数，防止重复请求&#10;- 添加getIng变量控制请求状态&#10;- 在请求完成后重置getIng状态&#10;- 更新版本号从1.4.10到1.4.11">
+      <option name="closed" value="true" />
+      <created>1772155919495</created>
+      <option name="number" value="00003" />
+      <option name="presentableId" value="LOCAL-00003" />
+      <option name="project" value="LOCAL" />
+      <updated>1772155919495</updated>
+    </task>
+    <option name="localTasksCounter" value="4" />
+    <servers />
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="3" />
+  </component>
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="TAB_STATES">
+      <map>
+        <entry key="MAIN">
+          <value>
+            <State />
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
+  <component name="VcsManagerConfiguration">
+    <MESSAGE value="fix(table): 更新单元格分析逻辑以正确处理括号- 替换正则表达式检测为 includes 方法检测括号和 null" />
+    <MESSAGE value="fix(table): 更新单元格分析逻辑以正确处理括号- 替换正则表达式检测为 includes 方法检测括号和 null&#10;- 确保只在包含成对括号且不含 null 时才匹配&#10;&#10;chore: 升级版本号至 1.4.9" />
+    <MESSAGE value="feat(common): 添加弹窗ESC关闭功能并优化OSS服务&#10;&#10;- 在popup函数中新增closeOnPressEscape参数，默认值为false&#10;- 将closeOnPressEscape参数传递给对话框配置&#10;- 优化OSS服务中的getOssToken函数，防止重复请求&#10;- 添加getIng变量控制请求状态&#10;-" />
+    <MESSAGE value="feat(common): 添加弹窗ESC关闭功能并优化OSS服务&#10;&#10;- 在popup函数中新增closeOnPressEscape参数，默认值为false&#10;- 将closeOnPressEscape参数传递给对话框配置&#10;- 优化OSS服务中的getOssToken函数，防止重复请求&#10;- 添加getIng变量控制请求状态&#10;- 在请求完成后重置getIng状态&#10;- 更新版本号从1.4.10到1.4.11" />
+    <option name="LAST_COMMIT_MESSAGE" value="feat(common): 添加弹窗ESC关闭功能并优化OSS服务&#10;&#10;- 在popup函数中新增closeOnPressEscape参数，默认值为false&#10;- 将closeOnPressEscape参数传递给对话框配置&#10;- 优化OSS服务中的getOssToken函数，防止重复请求&#10;- 添加getIng变量控制请求状态&#10;- 在请求完成后重置getIng状态&#10;- 更新版本号从1.4.10到1.4.11" />
+  </component>
+</project>

package/.idea/xs-common-plugins.iml

@@ -1,12 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/temp" />
-      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
-      <excludeFolder url="file://$MODULE_DIR$/tmp" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
 </module>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xs-common-plugins",
-  "version": "1.4.9",
+  "version": "1.4.11",
   "description": "向上公共代码部分",
   "author": "祝玲云 <1902733517@qq.com>",
   "main": "index.js",

package/src/common/common.js

@@ -249,7 +249,7 @@ common.confirm = (that, message, title, callBack) => {
  */
 common.popup = (options) => {
 	if (!options) return;
-	const { title, component, srcData, width, showButton, callBack, props, dialogCfg } = common.clone(options);
+	const { title, component, srcData, width, showButton, callBack, props, dialogCfg,closeOnPressEscape = false } = common.clone(options);
 	if (!component) return;
 
 	const div = document.createElement("div");
@@ -352,6 +352,7 @@ common.popup = (options) => {
 					callBack,
 					props,
 					dialogCfg,
+					closeOnPressEscape
 				},
 			});
 		},
@@ -590,4 +591,41 @@ common.getLabelList = (that, prop, url, query) => {
         that[prop] = res.data
     })
 }
+
+common.checkRows2 = async (that, row, title, prop = "id", check = true) => {
+	if(row.length == 0) {
+		common.message(that, `请选择数据`, 'error');
+		return false;
+	}
+	if(check) {
+		try {
+			return prop ? row.map(item => item[prop]) : row
+		} catch (error) {
+			return false
+		}
+	} else {
+		return true
+	}
+}
+
+common.checkStatus = async (that, row, title, prop = "status", check = true) => {
+	if(row.length == 0) {
+		//common.message(that, `请选择数据`, 'error');
+		return false;
+	}
+	if(check) {
+		try {
+			//await common.confirm(that, `您确定进行${title}操作`, '操作提醒')
+			return prop ? row.map(item => item[prop]) : row
+		} catch (error) {
+			return false
+		}
+	} else {
+		return true
+	}
+}
+
+
+
+
 export default common

package/src/components/CheckBox_Cmp/index.vue

@@ -1,59 +1,59 @@
-<template>
-	<div class="checkbox-wrap">
-		<el-checkbox-group v-model="checkList" @change="handleChecked">
-			<el-checkbox v-for="(item, index) in checkSourceList" :key="index" :label="item.Id">{{ item.Text }}</el-checkbox>
-		</el-checkbox-group>
-	</div>
-</template>
-<script>
-export default {
-	props: {
-		value: [String, Number],
-		sourceData: {
-			type: Array,
-			default: () => []
-		}
-	},
-	data() {
-		return {
-			checkSourceList: this.sourceData,
-			checkList: [],
-			selfValue: this.value
-		}
-	},
-	watch: {
-		value: {
-			immediate: true,
-			handler(val) {
-				this.selfValue = val
-				this.checkList = []
-				this.backFill()
-			}
-		}
-	},
-	methods: {
-		handleChecked(val) {
-			let count = 0
-			val.forEach(item => {
-				this.checkSourceList.forEach(_item => {
-					if (item == _item.Id) {
-						count += item
-					}
-				})
-			})
-			this.$emit('input', count)
-		},
-		backFill() {
-			const _this = this
-			const arr = this.checkSourceList.map(item => {
-				return item.Id
-			})
-			arr.forEach((item, index) => {
-				if ((_this.selfValue & item) > 0) {
-					this.checkList.push(this.checkSourceList[index].Id)
-				}
-			})
-		}
-	}
-}
-</script>
+<template>
+	<div class="checkbox-wrap">
+		<el-checkbox-group v-model="checkList" @change="handleChecked">
+			<el-checkbox v-for="(item, index) in checkSourceList" :key="index" :label="item.Id">{{ item.Text }}</el-checkbox>
+		</el-checkbox-group>
+	</div>
+</template>
+<script>
+export default {
+	props: {
+		value: [String, Number],
+		sourceData: {
+			type: Array,
+			default: () => []
+		}
+	},
+	data() {
+		return {
+			checkSourceList: this.sourceData,
+			checkList: [],
+			selfValue: this.value
+		}
+	},
+	watch: {
+		value: {
+			immediate: true,
+			handler(val) {
+				this.selfValue = val
+				this.checkList = []
+				this.backFill()
+			}
+		}
+	},
+	methods: {
+		handleChecked(val) {
+			let count = 0
+			val.forEach(item => {
+				this.checkSourceList.forEach(_item => {
+					if (item == _item.Id) {
+						count += item
+					}
+				})
+			})
+			this.$emit('input', count)
+		},
+		backFill() {
+			const _this = this
+			const arr = this.checkSourceList.map(item => {
+				return item.Id
+			})
+			arr.forEach((item, index) => {
+				if ((_this.selfValue & item) > 0) {
+					this.checkList.push(this.checkSourceList[index].Id)
+				}
+			})
+		}
+	}
+}
+</script>

package/src/utils/ossService.js

@@ -1,69 +1,76 @@
-import OSS from 'ali-oss'
-import { requestApi as axios } from 'xs-request'
-import store from '../store/index'
-import { getLocalStorage } from '@/utils/localStorage'
-import { getConfig } from '@/utils/global-config'
-
-let ossCfg = {}
-
-// 去哪个服务下 获取 token 信息
-function getOssToken() {
-	return axios
-		.get('@commng/UserCur/Oss/Config/' + getConfig('CLIENT_ID'))
-		.then(({ data }) => {
-			let timestamp = new Date().getTime()
-			ossCfg.region = data.ossEndpoint
-			ossCfg.bucket = data.bucketName
-			ossCfg.accessKeyId = data.stsAccessKeyId
-			ossCfg.accessKeySecret = data.stsAccessKeySecret
-			ossCfg.stsToken = data.stsSecurityToken
-			ossCfg.baseDir = data.baseDir
-			ossCfg.timeout = timestamp + data.durationSeconds * 1000
-			store.commit('oss/SET_OSS', ossCfg)
-			return ossCfg
-		})
-		.catch(err => {
-			console.log('获取Token错误', err)
-		})
-}
-
-//自动刷新token
-const initOssToken = function (time) {
-	setTimeout(() => {
-		getOssToken()
-	}, time)
-}
-
-// 从 vuex 中 获取初始化值
-const initToken = async function () {
-	ossCfg = store.getters.ossCfg
-	let timestamp = new Date().getTime()
-	// 有效期内不发送获取token 请求
-	let endTime = ossCfg.timeout - timestamp - 1000 * 60 // 提前1分钟刷新
-	initOssToken(endTime)
-	if (ossCfg.region && ossCfg.timeout > timestamp) {
-		return Promise.resolve(ossCfg)
-	}
-	return getOssToken()
-}
-
-const newFileName = function (id = getConfig('CLIENT_ID'), userid = getLocalStorage('userProfile').id) {
-	let dt = new Date()
-	let y = dt.getFullYear()
-	let m = dt.getMonth() + 1 < 10 ? '0' + (dt.getMonth() + 1) : dt.getMonth() + 1
-	let d = dt.getDate() < 10 ? '0' + dt.getDate() : dt.getDate()
-	return `${ossCfg.baseDir}/${userid}/${y}${m}${d}/${id}_${dt.getTime()}` // 定义唯一的文件名
-}
-
-const ossService = {
-	token: ossCfg,
-	initToken,
-	newFileName,
-	_ossClient: null,
-	getOssClient() {
-		this._ossClient = new OSS(ossCfg)
-		return this._ossClient
-	}
-}
-
-export default ossService
+import OSS from 'ali-oss'
+import { requestApi as axios } from 'xs-request'
+import store from '../store/index'
+import { getLocalStorage } from '@/utils/localStorage'
+import { getConfig } from '@/utils/global-config'
+
+let ossCfg = {}
+
+let getIng = null
+
+// 去哪个服务下 获取 token 信息
+function getOssToken() {
+	if (getIng) return getIng
+	getIng = axios
+		.get('@commng/UserCur/Oss/Config/' + getConfig('CLIENT_ID'))
+		.then(({ data }) => {
+			let timestamp = new Date().getTime()
+			ossCfg.region = data.ossEndpoint
+			ossCfg.bucket = data.bucketName
+			ossCfg.accessKeyId = data.stsAccessKeyId
+			ossCfg.accessKeySecret = data.stsAccessKeySecret
+			ossCfg.stsToken = data.stsSecurityToken
+			ossCfg.baseDir = data.baseDir
+			ossCfg.timeout = timestamp + data.durationSeconds * 1000
+			store.commit('oss/SET_OSS', ossCfg)
+			return ossCfg
+		})
+		.catch(err => {
+			console.log('获取Token错误', err)
+		}).finally(() => {
+			getIng = null
+		})
+
+	return getIng
+}
+
+//自动刷新token
+const initOssToken = function(time) {
+	setTimeout(() => {
+		getOssToken()
+	}, time)
+}
+
+// 从 vuex 中 获取初始化值
+const initToken = async function() {
+	ossCfg = store.getters.ossCfg
+	let timestamp = new Date().getTime()
+	// 有效期内不发送获取token 请求
+	let endTime = ossCfg.timeout - timestamp - 1000 * 60 // 提前1分钟刷新
+	initOssToken(endTime)
+	if (ossCfg.region && ossCfg.timeout > timestamp) {
+		return Promise.resolve(ossCfg)
+	}
+	return getOssToken()
+}
+
+const newFileName = function(id = getConfig('CLIENT_ID'), userid = getLocalStorage('userProfile').id) {
+	let dt = new Date()
+	let y = dt.getFullYear()
+	let m = dt.getMonth() + 1 < 10 ? '0' + (dt.getMonth() + 1) : dt.getMonth() + 1
+	let d = dt.getDate() < 10 ? '0' + dt.getDate() : dt.getDate()
+	return `${ossCfg.baseDir}/${userid}/${y}${m}${d}/${id}_${dt.getTime()}` // 定义唯一的文件名
+}
+
+const ossService = {
+	token: ossCfg,
+	initToken,
+	newFileName,
+	_ossClient: null,
+	getOssClient() {
+		this._ossClient = new OSS(ossCfg)
+		return this._ossClient
+	}
+}
+
+export default ossService

package/.idea/inspectionProfiles/Project_Default.xml

@@ -1,42 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="CssInvalidPropertyValue" enabled="false" level="ERROR" enabled_by_default="false" />
-    <inspection_tool class="HtmlRequiredAltAttribute" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="HtmlUnknownAttribute" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="myValues">
-        <value>
-          <list size="3">
-            <item index="0" class="java.lang.String" itemvalue="src" />
-            <item index="1" class="java.lang.String" itemvalue="open-type" />
-            <item index="2" class="java.lang.String" itemvalue="class" />
-          </list>
-        </value>
-      </option>
-      <option name="myCustomValuesEnabled" value="true" />
-    </inspection_tool>
-    <inspection_tool class="HtmlUnknownTag" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="myValues">
-        <value>
-          <list size="13">
-            <item index="0" class="java.lang.String" itemvalue="nobr" />
-            <item index="1" class="java.lang.String" itemvalue="noembed" />
-            <item index="2" class="java.lang.String" itemvalue="comment" />
-            <item index="3" class="java.lang.String" itemvalue="noscript" />
-            <item index="4" class="java.lang.String" itemvalue="embed" />
-            <item index="5" class="java.lang.String" itemvalue="script" />
-            <item index="6" class="java.lang.String" itemvalue="page" />
-            <item index="7" class="java.lang.String" itemvalue="contact-button" />
-            <item index="8" class="java.lang.String" itemvalue="web-view" />
-            <item index="9" class="java.lang.String" itemvalue="block" />
-            <item index="10" class="java.lang.String" itemvalue="scroll-view" />
-            <item index="11" class="java.lang.String" itemvalue="swiper" />
-            <item index="12" class="java.lang.String" itemvalue="swiper-item" />
-          </list>
-        </value>
-      </option>
-      <option name="myCustomValuesEnabled" value="true" />
-    </inspection_tool>
-    <inspection_tool class="JSEqualityComparisonWithCoercion" enabled="false" level="WARNING" enabled_by_default="false" />
-  </profile>
-</component>