@bagelink/vue 0.0.276 → 0.0.280

package/dist/index.mjs

@@ -17176,7 +17176,7 @@ const _sfc_main$C = /* @__PURE__ */ defineComponent({
   }
 });
 const _hoisted_1$G = { class: "full-nav" };
-const _hoisted_2$y = { class: "nav-scroll" };
+const _hoisted_2$z = { class: "nav-scroll" };
 const _hoisted_3$p = { class: "nav-links-wrapper" };
 const _hoisted_4$j = { class: "tooltip" };
 const _hoisted_5$g = { class: "bot-buttons-wrapper" };
@@ -17211,7 +17211,7 @@ const _sfc_main$B = /* @__PURE__ */ defineComponent({
           })
         ], 32),
         createElementVNode("div", _hoisted_1$G, [
-          createElementVNode("div", _hoisted_2$y, [
+          createElementVNode("div", _hoisted_2$z, [
             createElementVNode("div", _hoisted_3$p, [
               (openBlock(true), createElementBlock(Fragment$1, null, renderList(_ctx.links, (link) => {
                 return openBlock(), createBlock(resolveDynamicComponent(link.to ? "router-link" : "div"), {
@@ -17273,7 +17273,7 @@ const _hoisted_1$F = {
   key: 0,
   class: "loading"
 };
-const _hoisted_2$x = {
+const _hoisted_2$y = {
   key: 1,
   class: "bgl_btn-flex"
 };
@@ -17363,7 +17363,7 @@ const _sfc_main$A = /* @__PURE__ */ defineComponent({
         })
       }, {
         default: withCtx(() => [
-          _ctx.loading ? (openBlock(), createElementBlock("div", _hoisted_1$F)) : (openBlock(), createElementBlock("div", _hoisted_2$x, [
+          _ctx.loading ? (openBlock(), createElementBlock("div", _hoisted_1$F)) : (openBlock(), createElementBlock("div", _hoisted_2$y, [
             _ctx.icon ? (openBlock(), createBlock(unref(_sfc_main$C), {
               key: 0,
               icon: _ctx.icon
@@ -17385,7 +17385,7 @@ const _sfc_main$A = /* @__PURE__ */ defineComponent({
 });
 const Btn = /* @__PURE__ */ _export_sfc(_sfc_main$A, [["__scopeId", "data-v-7a7625e7"]]);
 const _hoisted_1$E = { class: "tool-bar" };
-const _hoisted_2$w = { class: "modal-footer mt-3" };
+const _hoisted_2$x = { class: "modal-footer mt-3" };
 const _sfc_main$z = /* @__PURE__ */ defineComponent({
   __name: "Modal",
   props: {
@@ -17440,7 +17440,7 @@ const _sfc_main$z = /* @__PURE__ */ defineComponent({
               }, null, 8, ["label"])) : createCommentVNode("", true)
             ]),
             renderSlot(_ctx.$slots, "default"),
-            createElementVNode("footer", _hoisted_2$w, [
+            createElementVNode("footer", _hoisted_2$x, [
               (openBlock(true), createElementBlock(Fragment$1, null, renderList(_ctx.actions, (action, i2) => {
                 return openBlock(), createBlock(unref(Btn), mergeProps({
                   key: i2,
@@ -17567,7 +17567,7 @@ const _sfc_main$y = /* @__PURE__ */ defineComponent({
 });
 const ModalForm = /* @__PURE__ */ _export_sfc(_sfc_main$y, [["__scopeId", "data-v-dca6fe18"]]);
 const _hoisted_1$D = { class: "accordion-item" };
-const _hoisted_2$v = ["aria-expanded", "aria-controls"];
+const _hoisted_2$w = ["aria-expanded", "aria-controls"];
 const _hoisted_3$o = { class: "accordion-label" };
 const _hoisted_4$i = ["id", "aria-hidden"];
 const _sfc_main$x = /* @__PURE__ */ defineComponent({
@@ -17607,7 +17607,7 @@ const _sfc_main$x = /* @__PURE__ */ defineComponent({
           }, [
             createVNode(unref(_sfc_main$C), { icon: "expand_more" })
           ], 2)
-        ], 8, _hoisted_2$v),
+        ], 8, _hoisted_2$w),
         createVNode(Transition, { name: "expand" }, {
           default: withCtx(() => [
             unref(open) ? (openBlock(), createElementBlock("div", {
@@ -17627,7 +17627,7 @@ const _sfc_main$x = /* @__PURE__ */ defineComponent({
 });
 const AccordionItem = /* @__PURE__ */ _export_sfc(_sfc_main$x, [["__scopeId", "data-v-41718a1b"]]);
 const _hoisted_1$C = { class: "card list-view grid thin" };
-const _hoisted_2$u = { class: "list-header flex gap-3 align-items-top" };
+const _hoisted_2$v = { class: "list-header flex gap-3 align-items-top" };
 const _hoisted_3$n = {
   key: 0,
   class: "bagel-input search-wrap"
@@ -17651,7 +17651,7 @@ const _sfc_main$w = /* @__PURE__ */ defineComponent({
     };
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("div", _hoisted_1$C, [
-        createElementVNode("div", _hoisted_2$u, [
+        createElementVNode("div", _hoisted_2$v, [
           _ctx.enableSearch ? (openBlock(), createElementBlock("div", _hoisted_3$n, [
             withDirectives(createElementVNode("input", {
               placeholder: _ctx.searchPlaceholder,
@@ -17679,7 +17679,7 @@ const _sfc_main$w = /* @__PURE__ */ defineComponent({
   }
 });
 const _hoisted_1$B = { class: "txt16 no-margin ellipsis" };
-const _hoisted_2$t = { class: "txt14 no-margin txtgray ellipsis" };
+const _hoisted_2$u = { class: "txt14 no-margin txtgray ellipsis" };
 const _sfc_main$v = /* @__PURE__ */ defineComponent({
   __name: "ListItem",
   props: {
@@ -17708,7 +17708,7 @@ const _sfc_main$v = /* @__PURE__ */ defineComponent({
               createTextVNode(toDisplayString(_ctx.title) + " ", 1),
               renderSlot(_ctx.$slots, "default")
             ]),
-            createElementVNode("p", _hoisted_2$t, [
+            createElementVNode("p", _hoisted_2$u, [
               createTextVNode(toDisplayString(_ctx.subtitle) + " ", 1),
               renderSlot(_ctx.$slots, "subtitle")
             ])
@@ -17720,7 +17720,7 @@ const _sfc_main$v = /* @__PURE__ */ defineComponent({
   }
 });
 const _hoisted_1$A = { class: "card tabs-top" };
-const _hoisted_2$s = { class: "tabs grid auto-flow-columns fit-content" };
+const _hoisted_2$t = { class: "tabs grid auto-flow-columns fit-content" };
 const _hoisted_3$m = ["onClick"];
 const _sfc_main$u = /* @__PURE__ */ defineComponent({
   __name: "TabbedLayout",
@@ -17759,7 +17759,7 @@ const _sfc_main$u = /* @__PURE__ */ defineComponent({
       }, [
         createElementVNode("div", _hoisted_1$A, [
           renderSlot(_ctx.$slots, "top-section", {}, void 0, true),
-          createElementVNode("div", _hoisted_2$s, [
+          createElementVNode("div", _hoisted_2$t, [
             (openBlock(true), createElementBlock(Fragment$1, null, renderList(_ctx.tabs, (tab) => {
               var _a2;
               return openBlock(), createElementBlock("div", {
@@ -17786,7 +17786,7 @@ const _sfc_main$u = /* @__PURE__ */ defineComponent({
 });
 const TabbedLayout = /* @__PURE__ */ _export_sfc(_sfc_main$u, [["__scopeId", "data-v-09fce741"]]);
 const _hoisted_1$z = { class: "comments-wrap" };
-const _hoisted_2$r = { class: "comment-list" };
+const _hoisted_2$s = { class: "comment-list" };
 const _hoisted_3$l = { class: "comment-top" };
 const _hoisted_4$g = { class: "comment-owner" };
 const _hoisted_5$e = { class: "comment-time" };
@@ -17837,7 +17837,7 @@ const _sfc_main$t = /* @__PURE__ */ defineComponent({
     };
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("div", _hoisted_1$z, [
-        createElementVNode("div", _hoisted_2$r, [
+        createElementVNode("div", _hoisted_2$s, [
           (openBlock(true), createElementBlock(Fragment$1, null, renderList(unref(comments), (comment) => {
             var _a2, _b, _c;
             return openBlock(), createElementBlock("div", {
@@ -17907,7 +17907,7 @@ const _sfc_main$t = /* @__PURE__ */ defineComponent({
 });
 const Comments = /* @__PURE__ */ _export_sfc(_sfc_main$t, [["__scopeId", "data-v-c4b41dc0"]]);
 const _hoisted_1$y = { class: "page-top" };
-const _hoisted_2$q = { class: "top-title" };
+const _hoisted_2$r = { class: "top-title" };
 const _sfc_main$s = /* @__PURE__ */ defineComponent({
   __name: "PageTitle",
   props: {
@@ -17919,7 +17919,7 @@ const _sfc_main$s = /* @__PURE__ */ defineComponent({
   setup(__props) {
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("div", _hoisted_1$y, [
-        createElementVNode("h1", _hoisted_2$q, [
+        createElementVNode("h1", _hoisted_2$r, [
           renderSlot(_ctx.$slots, "default"),
           createTextVNode(" " + toDisplayString(__props.value), 1)
         ])
@@ -17928,7 +17928,7 @@ const _sfc_main$s = /* @__PURE__ */ defineComponent({
   }
 });
 const _hoisted_1$x = { class: "table-list-wrap h-100" };
-const _hoisted_2$p = { class: "infinite-wrapper" };
+const _hoisted_2$q = { class: "infinite-wrapper" };
 const _hoisted_3$k = { class: "row first-row" };
 const _hoisted_4$f = ["onClick"];
 const _hoisted_5$d = { class: "flex" };
@@ -17969,7 +17969,7 @@ const _sfc_main$r = /* @__PURE__ */ defineComponent({
     };
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("div", _hoisted_1$x, [
-        createElementVNode("table", _hoisted_2$p, [
+        createElementVNode("table", _hoisted_2$q, [
           createElementVNode("thead", _hoisted_3$k, [
             (openBlock(true), createElementBlock(Fragment$1, null, renderList(computedSchema.value, (field) => {
               return openBlock(), createElementBlock("th", {
@@ -18062,7 +18062,7 @@ const _hoisted_1$v = {
   key: 0,
   class: "data"
 };
-const _hoisted_2$o = {
+const _hoisted_2$p = {
   key: 0,
   class: "data-row"
 };
@@ -18093,7 +18093,7 @@ const _sfc_main$o = /* @__PURE__ */ defineComponent({
           return openBlock(), createElementBlock(Fragment$1, {
             key: field.id
           }, [
-            unref(iffer)(field, itemData.value) ? (openBlock(), createElementBlock("div", _hoisted_2$o, [
+            unref(iffer)(field, itemData.value) ? (openBlock(), createElementBlock("div", _hoisted_2$p, [
               createElementVNode("div", _hoisted_3$j, toDisplayString((field == null ? void 0 : field.label) || unref(keyToLabel)(field.id)), 1),
               createVNode(unref(_sfc_main$g), {
                 field,
@@ -18208,7 +18208,11 @@ const _sfc_main$k = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const _hoisted_1$t = ["onClick"];
+const _hoisted_1$t = {
+  key: 0,
+  type: "hidden"
+};
+const _hoisted_2$o = ["onClick"];
 const _sfc_main$j = /* @__PURE__ */ defineComponent({
   __name: "ComboBox",
   props: {
@@ -18216,7 +18220,8 @@ const _sfc_main$j = /* @__PURE__ */ defineComponent({
     placeholder: {},
     disabled: { type: Boolean },
     modelValue: {},
-    searchable: { type: Boolean }
+    searchable: { type: Boolean },
+    required: { type: Boolean }
   },
   emits: ["update:modelValue"],
   setup(__props, { emit: __emit }) {
@@ -18285,7 +18290,6 @@ const _sfc_main$j = /* @__PURE__ */ defineComponent({
       }, {
         popper: withCtx(({ hide }) => [
           createVNode(unref(_sfc_main$n), {
-            border: "",
             thin: "",
             class: "combobox-options"
           }, {
@@ -18314,31 +18318,28 @@ const _sfc_main$j = /* @__PURE__ */ defineComponent({
                     key: 0,
                     icon: "check"
                   })) : createCommentVNode("", true)
-                ], 10, _hoisted_1$t);
+                ], 10, _hoisted_2$o);
               }), 128))
             ]),
             _: 2
           }, 1024)
         ]),
         default: withCtx(() => [
-          createVNode(unref(Btn), mergeProps({
+          createElementVNode("button", {
             class: "combobox-btn",
-            border: "",
-            color: "black",
             onClick: toggle
-          }, { "icon.end": unref(open) ? "unfold_less" : "unfold_more" }), {
-            default: withCtx(() => [
-              createTextVNode(toDisplayString(valueToLabel(unref(selectedItem)) || _ctx.placeholder || "Select"), 1)
-            ]),
-            _: 1
-          }, 16)
+          }, [
+            createTextVNode(toDisplayString(valueToLabel(unref(selectedItem)) || _ctx.placeholder || "Select") + " ", 1),
+            createVNode(unref(_sfc_main$C), normalizeProps(guardReactiveProps({ "icon": unref(open) ? "unfold_less" : "unfold_more" })), null, 16)
+          ]),
+          _ctx.required ? (openBlock(), createElementBlock("input", _hoisted_1$t)) : createCommentVNode("", true)
         ]),
         _: 1
       });
     };
   }
 });
-const ComboBox = /* @__PURE__ */ _export_sfc(_sfc_main$j, [["__scopeId", "data-v-59552907"]]);
+const ComboBox = /* @__PURE__ */ _export_sfc(_sfc_main$j, [["__scopeId", "data-v-32f19dd0"]]);
 const _withScopeId$2 = (n2) => (pushScopeId("data-v-fe5af582"), n2 = n2(), popScopeId(), n2);
 const _hoisted_1$s = { class: "bar-chart" };
 const _hoisted_2$n = {
@@ -18647,7 +18648,7 @@ const _sfc_main$g = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const _withScopeId$1 = (n2) => (pushScopeId("data-v-a550ac08"), n2 = n2(), popScopeId(), n2);
+const _withScopeId$1 = (n2) => (pushScopeId("data-v-e8219826"), n2 = n2(), popScopeId(), n2);
 const _hoisted_1$q = ["title"];
 const _hoisted_2$m = /* @__PURE__ */ _withScopeId$1(() => /* @__PURE__ */ createElementVNode("svg", {
   xmlns: "http://www.w3.org/2000/svg",
@@ -18694,13 +18695,15 @@ const _sfc_main$f = /* @__PURE__ */ defineComponent({
           }, null, 8, _hoisted_4$c), [
             [vModelCheckbox, checked.value]
           ]),
-          createTextVNode(" " + toDisplayString(_ctx.label), 1)
+          renderSlot(_ctx.$slots, "label", {}, () => [
+            createTextVNode(toDisplayString(_ctx.label), 1)
+          ], true)
         ])
       ], 10, _hoisted_1$q);
     };
   }
 });
-const CheckInput = /* @__PURE__ */ _export_sfc(_sfc_main$f, [["__scopeId", "data-v-a550ac08"]]);
+const CheckInput = /* @__PURE__ */ _export_sfc(_sfc_main$f, [["__scopeId", "data-v-e8219826"]]);
 function toDate(argument) {
   const argStr = Object.prototype.toString.call(argument);
   if (argument instanceof Date || typeof argument === "object" && argStr === "[object Date]") {
@@ -28763,7 +28766,8 @@ const _sfc_main$c = /* @__PURE__ */ defineComponent({
             required: _ctx.required,
             placeholder: _ctx.placeholder,
             modelValue: seletValue.value,
-            "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => seletValue.value = $event)
+            "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => seletValue.value = $event),
+            "close-on-select": true
           }, _ctx.extraProps), null, 16, ["id", "options", "required", "placeholder", "modelValue"])
         ], 8, _hoisted_2$i)
       ]);

package/dist/plugins/modal.d.ts

@@ -13,7 +13,7 @@ export interface ModalFormOptions {
     title?: string;
     dismissable?: boolean;
     schema: BglFormSchemaT<any> | (() => BglFormSchemaT) | BglFormSchemaT;
-    onSubmit?: (formData: any) => Promise<any>;
+    onSubmit?: (formData: any) => Promise<void>;
     onDelete?: (id: string) => Promise<void>;
     onError?: ((err: any) => void);
     modelValue?: Record<string, any>;

package/dist/plugins/modal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"modal.d.ts","sourceRoot":"","sources":["../../src/plugins/modal.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,YAAY,EACf,MAAM,KAAK,CAAC;AACb,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,KAAK,CAAC;AAClC,OAAO,KAAK,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAGhE,MAAM,WAAW,YAAY;IAC5B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,OAAO,CAAC,EAAE,UAAU,EAAE,CAAC;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,gBAAgB;IAChC,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,MAAM,EAAE,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,cAAc,CAAC,GAAG,cAAc,CAAA;IACrE,QAAQ,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IAC3C,QAAQ,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACzC,OAAO,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,CAAC,CAAC;IAC/B,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACjC,qBAAqB,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,CAAC;CAC3C;AAED,MAAM,WAAW,mBAAmB;IACnC,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACpC,SAAS,EAAE,OAAO,GAAG,WAAW,CAAC;IACjC,YAAY,EAAE,YAAY,GAAG,gBAAgB,CAAA;CAC7C;AACD,MAAM,WAAW,uBAAuB;IACvC,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACpC,SAAS,EAAE,WAAW,CAAC;IACvB,YAAY,EAAE,gBAAgB,CAAA;CAC9B;AACD,MAAM,WAAW,QAAQ;IACxB,SAAS,EAAE,CAAC,OAAO,EAAE,YAAY,EAAE,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,IAAI,CAAC;IACxE,aAAa,EAAE,CAAC,OAAO,EAAE,gBAAgB,EAAE,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,uBAAuB,GAAG,SAAS,CAAC;IAC/G,SAAS,EAAE,CAAC,KAAK,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;CACpC;AAED,eAAO,MAAM,WAAW,EAAE,YAAY,CAAC,QAAQ,CAAmB,CAAC;AAEnE,eAAO,MAAM,QAAQ,QAAO,QAI3B,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,MAyCzB,CAAC"}
+{"version":3,"file":"modal.d.ts","sourceRoot":"","sources":["../../src/plugins/modal.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,YAAY,EACf,MAAM,KAAK,CAAC;AACb,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,KAAK,CAAC;AAClC,OAAO,KAAK,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAGhE,MAAM,WAAW,YAAY;IAC3B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,OAAO,CAAC,EAAE,UAAU,EAAE,CAAC;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,gBAAgB;IAC/B,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,MAAM,EAAE,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,cAAc,CAAC,GAAG,cAAc,CAAA;IACrE,QAAQ,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5C,QAAQ,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACzC,OAAO,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,CAAC,CAAC;IAC/B,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACjC,qBAAqB,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,CAAC;CAC5C;AAED,MAAM,WAAW,mBAAmB;IAClC,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACpC,SAAS,EAAE,OAAO,GAAG,WAAW,CAAC;IACjC,YAAY,EAAE,YAAY,GAAG,gBAAgB,CAAA;CAC9C;AACD,MAAM,WAAW,uBAAuB;IACtC,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACpC,SAAS,EAAE,WAAW,CAAC;IACvB,YAAY,EAAE,gBAAgB,CAAA;CAC/B;AACD,MAAM,WAAW,QAAQ;IACvB,SAAS,EAAE,CAAC,OAAO,EAAE,YAAY,EAAE,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,IAAI,CAAC;IACxE,aAAa,EAAE,CAAC,OAAO,EAAE,gBAAgB,EAAE,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,uBAAuB,GAAG,SAAS,CAAC;IAC/G,SAAS,EAAE,CAAC,KAAK,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;CACrC;AAED,eAAO,MAAM,WAAW,EAAE,YAAY,CAAC,QAAQ,CAAmB,CAAC;AAEnE,eAAO,MAAM,QAAQ,QAAO,QAI3B,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,MAyCzB,CAAC"}