jobsys-explore 4.2.16 → 4.2.18

package/.changeset/stupid-wombats-count.md

@@ -0,0 +1,5 @@
+---
+"jobsys-explore": patch
+---
+
+add directive

package/.changeset/twenty-dolls-fix.md

@@ -0,0 +1,5 @@
+---
+"jobsys-explore": patch
+---
+
+exuploader fixed disabled

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # jobsys-explore
 
+## 4.2.18
+
+### Patch Changes
+
+- datetime and pagination search
+- empty zero
+- e
+- add directive
+- exuploader fixed disabled
+
+## 4.2.17
+
+### Patch Changes
+
+- datetime and pagination search
+- empty zero
+- e
+- exuploader fixed disabled
+
 ## 4.2.16
 
 ### Patch Changes

package/components/form/ExSelect.jsx

@@ -3,7 +3,7 @@ import PickerWrapper, { pickerSlots } from "./PickerWrapper.jsx"
 import { Button, Picker, Search } from "vant"
 import { defaultFieldProps, defaultOptionsProps } from "../utils"
 import { useFetch } from "../../hooks"
-import { cloneDeep, find, isArray, isFunction, isString } from "lodash-es"
+import { cloneDeep, find, isArray, isFunction, isNumber, isString } from "lodash-es"
 
 /**
  * ExSelect 下拉选择
@@ -113,7 +113,7 @@ export default defineComponent({
 			options = options.map((option) => {
 				if (isArray(option)) {
 					return option.map((op) => {
-						return isString(op) ? { value: op, label: op, text: op } : { text: op.label, ...op }
+						return isString(op) || isNumber(op) ? { value: op, label: op, text: op } : { text: op.label, ...op }
 					})
 				}
 

package/components/search/ExSearch.jsx

@@ -98,7 +98,7 @@ export default defineComponent({
 				value = isFunction(item.defaultValue) ? item.defaultValue() : item.defaultValue
 			}
 
-			if (item.type === "date" && !value) {
+			if ((item.type === "date" || item.type === "datetime") && !value) {
 				return null
 			}
 
@@ -120,6 +120,7 @@ export default defineComponent({
 			props.columns.forEach((item) => {
 				form[item.key] = searchItemDefaultValue(item)
 			})
+			console.log(props.columns, form)
 			state.queryForm = form
 		}
 

package/components/uploader/ExUploader.jsx

@@ -243,9 +243,9 @@ export default defineComponent({
 					accetp={props.accept}
 					uploadText={props.uploadText}
 					uploadIcon={props.uploadIcon}
-					disblaed={props.disabled}
+					disabled={props.disabled}
 					readonly={props.readonly}
-					deletable={!props.readonly}
+					deletable={!(props.readonly || props.disabled)}
 					showUpload={!props.readonly && !props.disabled}
 					afterRead={onSubmit}
 					onOversize={onOversize}

package/components/utils.js

@@ -1,4 +1,4 @@
-import { cloneDeep, isFunction, isString } from "lodash-es"
+import { cloneDeep, isFunction, isNumber, isString } from "lodash-es"
 import { watch } from "vue"
 import { useCache, useFetch } from "../hooks"
 
@@ -118,7 +118,7 @@ export const prepareOptions = (options) => {
 		if (op.children?.length) {
 			op.children = prepareOptions(op.children)
 		}
-		return isString(op) ? { value: op, label: op, text: op } : { text: op.label, ...op }
+		return isString(op) || isNumber(op) ? { value: op, label: op, text: op } : { text: op.label, ...op }
 	})
 	return options
 }

package/directives/auth.js

@@ -0,0 +1,113 @@
+/**
+ * v-auth="'permissions1'"
+ * v-auth:all="['clickPermissions',['permission1', 'permission2']]"
+ * v-auth:any="['clickPermissions',['permission1', 'permission2']]"
+ * v-auth:none="['clickPermissions',['permission1', 'permission2']]"
+ * @type {*[]}
+ */
+
+let defaultPermissions = []
+
+const authDirective = {
+	beforeMount(el, binding) {
+		let { value } = binding
+		const { arg } = binding
+
+		if (!value) {
+			return
+		}
+
+		if (typeof value === "string" || value instanceof String) {
+			value = [value]
+		}
+
+		let [permissions, myPermissions] = value
+
+		if (!myPermissions) {
+			myPermissions = defaultPermissions
+		}
+
+		if (typeof permissions === "string" || permissions instanceof String) {
+			permissions = [permissions]
+		}
+
+		// arg: 'any' 任何一个, 'all' 全部都有，默认, 'none' 都没有
+
+		if (arg === undefined || arg === "all") {
+			if (!permissions.every((p) => myPermissions.includes(p))) {
+				el.style.display = "none"
+			}
+		} else if (arg === "any") {
+			if (!permissions.some((p) => myPermissions.includes(p))) {
+				el.style.display = "none"
+			}
+		} else if (arg === "none") {
+			if (permissions.some((p) => myPermissions.includes(p))) {
+				el.style.display = "none"
+			}
+		}
+	},
+}
+
+/**
+ * 初始化权限集合
+ * @param permissions
+ */
+export function setDefaultPermissions(permissions) {
+	defaultPermissions = permissions
+}
+
+function auth(value, arg) {
+	if (!value) {
+		return true
+	}
+
+	if (typeof value === "string" || value instanceof String) {
+		value = [value]
+	}
+
+	let [permissions, myPermissions] = value
+
+	if (!myPermissions) {
+		myPermissions = defaultPermissions
+	}
+
+	if (typeof permissions === "string" || permissions instanceof String) {
+		permissions = [permissions]
+	}
+
+	// arg: 'any' 任何一个, 'all' 全部都有，默认, 'none' 都没有
+
+	if (arg === undefined || arg === "all") {
+		if (!permissions.every((p) => myPermissions.includes(p))) {
+			return false
+		}
+	} else if (arg === "any") {
+		if (!permissions.some((p) => myPermissions.includes(p))) {
+			return false
+		}
+	} else if (arg === "none") {
+		if (permissions.some((p) => myPermissions.includes(p))) {
+			return false
+		}
+	}
+	return true
+}
+
+export default {
+	/**
+	 *
+	 * @param app
+	 * @param {Object} [options]
+	 * @param {Object} [options.defaultPermissions]
+	 */
+	install(app, options) {
+		app.directive("auth", authDirective)
+		app.config.globalProperties.$auth = auth
+		app.provide("auth", auth)
+
+		if (options && options.defaultPermissions) {
+			setDefaultPermissions(options.defaultPermissions)
+		}
+	},
+}

package/directives/index.js

@@ -0,0 +1,4 @@
+import auth, { setDefaultPermissions } from "./auth"
+
+export { auth, setDefaultPermissions }
+//export * from "./auth"

package/dist/directives.cjs

@@ -0,0 +1,2 @@
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});let o=[];const a={beforeMount(e,n){let{value:i}=n;const{arg:t}=n;if(!i)return;(typeof i=="string"||i instanceof String)&&(i=[i]);let[s,f]=i;f||(f=o),(typeof s=="string"||s instanceof String)&&(s=[s]),t===void 0||t==="all"?s.every(r=>f.includes(r))||(e.style.display="none"):t==="any"?s.some(r=>f.includes(r))||(e.style.display="none"):t==="none"&&s.some(r=>f.includes(r))&&(e.style.display="none")}};function u(e){o=e}function l(e,n){if(!e)return!0;(typeof e=="string"||e instanceof String)&&(e=[e]);let[i,t]=e;if(t||(t=o),(typeof i=="string"||i instanceof String)&&(i=[i]),n===void 0||n==="all"){if(!i.every(s=>t.includes(s)))return!1}else if(n==="any"){if(!i.some(s=>t.includes(s)))return!1}else if(n==="none"&&i.some(s=>t.includes(s)))return!1;return!0}const c={install(e,n){e.directive("auth",a),e.config.globalProperties.$auth=l,e.provide("auth",l),n&&n.defaultPermissions&&u(n.defaultPermissions)}};exports.auth=c;exports.setDefaultPermissions=u;
+//# sourceMappingURL=directives.cjs.map

package/dist/directives.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"directives.cjs","sources":["../directives/auth.js"],"sourcesContent":["/**\r\n * v-auth=\"'permissions1'\"\r\n * v-auth:all=\"['clickPermissions',['permission1', 'permission2']]\"\r\n * v-auth:any=\"['clickPermissions',['permission1', 'permission2']]\"\r\n * v-auth:none=\"['clickPermissions',['permission1', 'permission2']]\"\r\n * @type {*[]}\r\n */\r\n\r\nlet defaultPermissions = []\r\n\r\nconst authDirective = {\r\n\tbeforeMount(el, binding) {\r\n\t\tlet { value } = binding\r\n\t\tconst { arg } = binding\r\n\r\n\t\tif (!value) {\r\n\t\t\treturn\r\n\t\t}\r\n\r\n\t\tif (typeof value === \"string\" || value instanceof String) {\r\n\t\t\tvalue = [value]\r\n\t\t}\r\n\r\n\t\tlet [permissions, myPermissions] = value\r\n\r\n\t\tif (!myPermissions) {\r\n\t\t\tmyPermissions = defaultPermissions\r\n\t\t}\r\n\r\n\t\tif (typeof permissions === \"string\" || permissions instanceof String) {\r\n\t\t\tpermissions = [permissions]\r\n\t\t}\r\n\r\n\t\t// arg: 'any' 任何一个, 'all' 全部都有，默认, 'none' 都没有\r\n\r\n\t\tif (arg === undefined || arg === \"all\") {\r\n\t\t\tif (!permissions.every((p) => myPermissions.includes(p))) {\r\n\t\t\t\tel.style.display = \"none\"\r\n\t\t\t}\r\n\t\t} else if (arg === \"any\") {\r\n\t\t\tif (!permissions.some((p) => myPermissions.includes(p))) {\r\n\t\t\t\tel.style.display = \"none\"\r\n\t\t\t}\r\n\t\t} else if (arg === \"none\") {\r\n\t\t\tif (permissions.some((p) => myPermissions.includes(p))) {\r\n\t\t\t\tel.style.display = \"none\"\r\n\t\t\t}\r\n\t\t}\r\n\t},\r\n}\r\n\r\n/**\r\n * 初始化权限集合\r\n * @param permissions\r\n */\r\nexport function setDefaultPermissions(permissions) {\r\n\tdefaultPermissions = permissions\r\n}\r\n\r\nfunction auth(value, arg) {\r\n\tif (!value) {\r\n\t\treturn true\r\n\t}\r\n\r\n\tif (typeof value === \"string\" || value instanceof String) {\r\n\t\tvalue = [value]\r\n\t}\r\n\r\n\tlet [permissions, myPermissions] = value\r\n\r\n\tif (!myPermissions) {\r\n\t\tmyPermissions = defaultPermissions\r\n\t}\r\n\r\n\tif (typeof permissions === \"string\" || permissions instanceof String) {\r\n\t\tpermissions = [permissions]\r\n\t}\r\n\r\n\t// arg: 'any' 任何一个, 'all' 全部都有，默认, 'none' 都没有\r\n\r\n\tif (arg === undefined || arg === \"all\") {\r\n\t\tif (!permissions.every((p) => myPermissions.includes(p))) {\r\n\t\t\treturn false\r\n\t\t}\r\n\t} else if (arg === \"any\") {\r\n\t\tif (!permissions.some((p) => myPermissions.includes(p))) {\r\n\t\t\treturn false\r\n\t\t}\r\n\t} else if (arg === \"none\") {\r\n\t\tif (permissions.some((p) => myPermissions.includes(p))) {\r\n\t\t\treturn false\r\n\t\t}\r\n\t}\r\n\treturn true\r\n}\r\n\r\nexport default {\r\n\t/**\r\n\t *\r\n\t * @param app\r\n\t * @param {Object} [options]\r\n\t * @param {Object} [options.defaultPermissions]\r\n\t */\r\n\tinstall(app, options) {\r\n\t\tapp.directive(\"auth\", authDirective)\r\n\t\tapp.config.globalProperties.$auth = auth\r\n\t\tapp.provide(\"auth\", auth)\r\n\r\n\t\tif (options && options.defaultPermissions) {\r\n\t\t\tsetDefaultPermissions(options.defaultPermissions)\r\n\t\t}\r\n\t},\r\n}\r\n"],"names":["defaultPermissions","authDirective","el","binding","value","arg","permissions","myPermissions","p","setDefaultPermissions","auth","auth$1","app","options"],"mappings":"gFAQA,IAAIA,EAAqB,CAAE,EAE3B,MAAMC,EAAgB,CACrB,YAAYC,EAAIC,EAAS,CACxB,GAAI,CAAE,MAAAC,CAAK,EAAKD,EAChB,KAAM,CAAE,IAAAE,CAAG,EAAKF,EAEhB,GAAI,CAACC,EACJ,QAGG,OAAOA,GAAU,UAAYA,aAAiB,UACjDA,EAAQ,CAACA,CAAK,GAGf,GAAI,CAACE,EAAaC,CAAa,EAAIH,EAE9BG,IACJA,EAAgBP,IAGb,OAAOM,GAAgB,UAAYA,aAAuB,UAC7DA,EAAc,CAACA,CAAW,GAKvBD,IAAQ,QAAaA,IAAQ,MAC3BC,EAAY,MAAOE,GAAMD,EAAc,SAASC,CAAC,CAAC,IACtDN,EAAG,MAAM,QAAU,QAEVG,IAAQ,MACbC,EAAY,KAAME,GAAMD,EAAc,SAASC,CAAC,CAAC,IACrDN,EAAG,MAAM,QAAU,QAEVG,IAAQ,QACdC,EAAY,KAAME,GAAMD,EAAc,SAASC,CAAC,CAAC,IACpDN,EAAG,MAAM,QAAU,OAGrB,CACF,EAMO,SAASO,EAAsBH,EAAa,CAClDN,EAAqBM,CACtB,CAEA,SAASI,EAAKN,EAAOC,EAAK,CACzB,GAAI,CAACD,EACJ,MAAO,IAGJ,OAAOA,GAAU,UAAYA,aAAiB,UACjDA,EAAQ,CAACA,CAAK,GAGf,GAAI,CAACE,EAAaC,CAAa,EAAIH,EAYnC,GAVKG,IACJA,EAAgBP,IAGb,OAAOM,GAAgB,UAAYA,aAAuB,UAC7DA,EAAc,CAACA,CAAW,GAKvBD,IAAQ,QAAaA,IAAQ,OAChC,GAAI,CAACC,EAAY,MAAOE,GAAMD,EAAc,SAASC,CAAC,CAAC,EACtD,MAAO,WAEEH,IAAQ,OAClB,GAAI,CAACC,EAAY,KAAME,GAAMD,EAAc,SAASC,CAAC,CAAC,EACrD,MAAO,WAEEH,IAAQ,QACdC,EAAY,KAAME,GAAMD,EAAc,SAASC,CAAC,CAAC,EACpD,MAAO,GAGT,MAAO,EACR,CAEA,MAAeG,EAAA,CAOd,QAAQC,EAAKC,EAAS,CACrBD,EAAI,UAAU,OAAQX,CAAa,EACnCW,EAAI,OAAO,iBAAiB,MAAQF,EACpCE,EAAI,QAAQ,OAAQF,CAAI,EAEpBG,GAAWA,EAAQ,oBACtBJ,EAAsBI,EAAQ,kBAAkB,CAEjD,CACF"}

package/dist/directives.js

@@ -0,0 +1,46 @@
+let o = [];
+const u = {
+  beforeMount(e, n) {
+    let { value: i } = n;
+    const { arg: t } = n;
+    if (!i)
+      return;
+    (typeof i == "string" || i instanceof String) && (i = [i]);
+    let [s, f] = i;
+    f || (f = o), (typeof s == "string" || s instanceof String) && (s = [s]), t === void 0 || t === "all" ? s.every((r) => f.includes(r)) || (e.style.display = "none") : t === "any" ? s.some((r) => f.includes(r)) || (e.style.display = "none") : t === "none" && s.some((r) => f.includes(r)) && (e.style.display = "none");
+  }
+};
+function a(e) {
+  o = e;
+}
+function l(e, n) {
+  if (!e)
+    return !0;
+  (typeof e == "string" || e instanceof String) && (e = [e]);
+  let [i, t] = e;
+  if (t || (t = o), (typeof i == "string" || i instanceof String) && (i = [i]), n === void 0 || n === "all") {
+    if (!i.every((s) => t.includes(s)))
+      return !1;
+  } else if (n === "any") {
+    if (!i.some((s) => t.includes(s)))
+      return !1;
+  } else if (n === "none" && i.some((s) => t.includes(s)))
+    return !1;
+  return !0;
+}
+const c = {
+  /**
+   *
+   * @param app
+   * @param {Object} [options]
+   * @param {Object} [options.defaultPermissions]
+   */
+  install(e, n) {
+    e.directive("auth", u), e.config.globalProperties.$auth = l, e.provide("auth", l), n && n.defaultPermissions && a(n.defaultPermissions);
+  }
+};
+export {
+  c as auth,
+  a as setDefaultPermissions
+};
+//# sourceMappingURL=directives.js.map

package/dist/directives.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"directives.js","sources":["../directives/auth.js"],"sourcesContent":["/**\r\n * v-auth=\"'permissions1'\"\r\n * v-auth:all=\"['clickPermissions',['permission1', 'permission2']]\"\r\n * v-auth:any=\"['clickPermissions',['permission1', 'permission2']]\"\r\n * v-auth:none=\"['clickPermissions',['permission1', 'permission2']]\"\r\n * @type {*[]}\r\n */\r\n\r\nlet defaultPermissions = []\r\n\r\nconst authDirective = {\r\n\tbeforeMount(el, binding) {\r\n\t\tlet { value } = binding\r\n\t\tconst { arg } = binding\r\n\r\n\t\tif (!value) {\r\n\t\t\treturn\r\n\t\t}\r\n\r\n\t\tif (typeof value === \"string\" || value instanceof String) {\r\n\t\t\tvalue = [value]\r\n\t\t}\r\n\r\n\t\tlet [permissions, myPermissions] = value\r\n\r\n\t\tif (!myPermissions) {\r\n\t\t\tmyPermissions = defaultPermissions\r\n\t\t}\r\n\r\n\t\tif (typeof permissions === \"string\" || permissions instanceof String) {\r\n\t\t\tpermissions = [permissions]\r\n\t\t}\r\n\r\n\t\t// arg: 'any' 任何一个, 'all' 全部都有，默认, 'none' 都没有\r\n\r\n\t\tif (arg === undefined || arg === \"all\") {\r\n\t\t\tif (!permissions.every((p) => myPermissions.includes(p))) {\r\n\t\t\t\tel.style.display = \"none\"\r\n\t\t\t}\r\n\t\t} else if (arg === \"any\") {\r\n\t\t\tif (!permissions.some((p) => myPermissions.includes(p))) {\r\n\t\t\t\tel.style.display = \"none\"\r\n\t\t\t}\r\n\t\t} else if (arg === \"none\") {\r\n\t\t\tif (permissions.some((p) => myPermissions.includes(p))) {\r\n\t\t\t\tel.style.display = \"none\"\r\n\t\t\t}\r\n\t\t}\r\n\t},\r\n}\r\n\r\n/**\r\n * 初始化权限集合\r\n * @param permissions\r\n */\r\nexport function setDefaultPermissions(permissions) {\r\n\tdefaultPermissions = permissions\r\n}\r\n\r\nfunction auth(value, arg) {\r\n\tif (!value) {\r\n\t\treturn true\r\n\t}\r\n\r\n\tif (typeof value === \"string\" || value instanceof String) {\r\n\t\tvalue = [value]\r\n\t}\r\n\r\n\tlet [permissions, myPermissions] = value\r\n\r\n\tif (!myPermissions) {\r\n\t\tmyPermissions = defaultPermissions\r\n\t}\r\n\r\n\tif (typeof permissions === \"string\" || permissions instanceof String) {\r\n\t\tpermissions = [permissions]\r\n\t}\r\n\r\n\t// arg: 'any' 任何一个, 'all' 全部都有，默认, 'none' 都没有\r\n\r\n\tif (arg === undefined || arg === \"all\") {\r\n\t\tif (!permissions.every((p) => myPermissions.includes(p))) {\r\n\t\t\treturn false\r\n\t\t}\r\n\t} else if (arg === \"any\") {\r\n\t\tif (!permissions.some((p) => myPermissions.includes(p))) {\r\n\t\t\treturn false\r\n\t\t}\r\n\t} else if (arg === \"none\") {\r\n\t\tif (permissions.some((p) => myPermissions.includes(p))) {\r\n\t\t\treturn false\r\n\t\t}\r\n\t}\r\n\treturn true\r\n}\r\n\r\nexport default {\r\n\t/**\r\n\t *\r\n\t * @param app\r\n\t * @param {Object} [options]\r\n\t * @param {Object} [options.defaultPermissions]\r\n\t */\r\n\tinstall(app, options) {\r\n\t\tapp.directive(\"auth\", authDirective)\r\n\t\tapp.config.globalProperties.$auth = auth\r\n\t\tapp.provide(\"auth\", auth)\r\n\r\n\t\tif (options && options.defaultPermissions) {\r\n\t\t\tsetDefaultPermissions(options.defaultPermissions)\r\n\t\t}\r\n\t},\r\n}\r\n"],"names":["defaultPermissions","authDirective","el","binding","value","arg","permissions","myPermissions","p","setDefaultPermissions","auth","auth$1","app","options"],"mappings":"AAQA,IAAIA,IAAqB,CAAE;AAE3B,MAAMC,IAAgB;AAAA,EACrB,YAAYC,GAAIC,GAAS;AACxB,QAAI,EAAE,OAAAC,EAAK,IAAKD;AAChB,UAAM,EAAE,KAAAE,EAAG,IAAKF;AAEhB,QAAI,CAACC;AACJ;AAGD,KAAI,OAAOA,KAAU,YAAYA,aAAiB,YACjDA,IAAQ,CAACA,CAAK;AAGf,QAAI,CAACE,GAAaC,CAAa,IAAIH;AAEnC,IAAKG,MACJA,IAAgBP,KAGb,OAAOM,KAAgB,YAAYA,aAAuB,YAC7DA,IAAc,CAACA,CAAW,IAKvBD,MAAQ,UAAaA,MAAQ,QAC3BC,EAAY,MAAM,CAACE,MAAMD,EAAc,SAASC,CAAC,CAAC,MACtDN,EAAG,MAAM,UAAU,UAEVG,MAAQ,QACbC,EAAY,KAAK,CAACE,MAAMD,EAAc,SAASC,CAAC,CAAC,MACrDN,EAAG,MAAM,UAAU,UAEVG,MAAQ,UACdC,EAAY,KAAK,CAACE,MAAMD,EAAc,SAASC,CAAC,CAAC,MACpDN,EAAG,MAAM,UAAU;AAAA,EAGrB;AACF;AAMO,SAASO,EAAsBH,GAAa;AAClD,EAAAN,IAAqBM;AACtB;AAEA,SAASI,EAAKN,GAAOC,GAAK;AACzB,MAAI,CAACD;AACJ,WAAO;AAGR,GAAI,OAAOA,KAAU,YAAYA,aAAiB,YACjDA,IAAQ,CAACA,CAAK;AAGf,MAAI,CAACE,GAAaC,CAAa,IAAIH;AAYnC,MAVKG,MACJA,IAAgBP,KAGb,OAAOM,KAAgB,YAAYA,aAAuB,YAC7DA,IAAc,CAACA,CAAW,IAKvBD,MAAQ,UAAaA,MAAQ;AAChC,QAAI,CAACC,EAAY,MAAM,CAACE,MAAMD,EAAc,SAASC,CAAC,CAAC;AACtD,aAAO;AAAA,aAEEH,MAAQ;AAClB,QAAI,CAACC,EAAY,KAAK,CAACE,MAAMD,EAAc,SAASC,CAAC,CAAC;AACrD,aAAO;AAAA,aAEEH,MAAQ,UACdC,EAAY,KAAK,CAACE,MAAMD,EAAc,SAASC,CAAC,CAAC;AACpD,WAAO;AAGT,SAAO;AACR;AAEA,MAAeG,IAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAOd,QAAQC,GAAKC,GAAS;AACrB,IAAAD,EAAI,UAAU,QAAQX,CAAa,GACnCW,EAAI,OAAO,iBAAiB,QAAQF,GACpCE,EAAI,QAAQ,QAAQF,CAAI,GAEpBG,KAAWA,EAAQ,sBACtBJ,EAAsBI,EAAQ,kBAAkB;AAAA,EAEjD;AACF;"}