element-less 0.0.34 → 0.0.36

package/{index-BXNbms34.js → index-CVdPovF2.js}

@@ -1632,8 +1632,7 @@ const defaultConfig = {
     name: "MenuName",
     action: "ActionType",
     icon: "ImageUrl",
-    buttonColor: "ButtonColor",
-    buttonType: "ButtonType",
+    color: "ButtonColor",
     group: "Fold",
     url: "TargetUrl",
     areaName: "AreaName",
@@ -1731,20 +1730,19 @@ const utils = {
   },
   getMenuConfig() {
     return {
-      $idField: globalConfig.menu["id"],
-      $actionField: globalConfig.menu["action"],
-      $nameField: globalConfig.menu["name"],
-      $actionTypeField: globalConfig.menu["actionType"],
-      $areaField: globalConfig.menu["areaName"],
-      $controllerField: globalConfig.menu["controllerName"],
-      $iconField: globalConfig.menu["icon"],
-      $urlField: globalConfig.menu["url"],
-      $buttonColorField: globalConfig.menu["buttonColor"],
-      $buttonTypeField: globalConfig.menu["buttonType"],
-      $groupField: globalConfig.menu["group"],
-      $confirmField: globalConfig.menu["confirmField"],
-      $confirmPasswordField: globalConfig.menu["confirmPasswordField"],
-      $visibleField: globalConfig.menu["visible"]
+      $idField: globalConfig.menu.id,
+      $nameField: globalConfig.menu.name,
+      $actionTypeField: globalConfig.menu.action,
+      $actionField: globalConfig.menu.actionName,
+      $areaField: globalConfig.menu.areaName,
+      $controllerField: globalConfig.menu.controllerName,
+      $iconField: globalConfig.menu.icon,
+      $urlField: globalConfig.menu.url,
+      $colorField: globalConfig.menu.color,
+      $groupField: globalConfig.menu.group,
+      $confirmField: globalConfig.menu.confirmField,
+      $confirmPasswordField: globalConfig.menu.confirmPasswordField,
+      $visibleField: globalConfig.menu.visible
     };
   },
   getTableConfig() {
@@ -15308,8 +15306,7 @@ const _sfc_main$1j = /* @__PURE__ */ defineComponent({
     const iconFieldname = menuConfig.$iconField;
     const actionFieldname = menuConfig.$actionField;
     const actionTypeFieldname = menuConfig.$actionTypeField;
-    const buttonColorFieldname = menuConfig.$buttonColorField;
-    const buttonTypeFieldname = menuConfig.$buttonTypeField;
+    const colorFieldname = menuConfig.$colorField;
     const groupFieldname = menuConfig.$groupField;
     const saveDataLoading = ref(false);
     const isTableEdit = ref(false);
@@ -15343,11 +15340,11 @@ const _sfc_main$1j = /* @__PURE__ */ defineComponent({
       menuData.length = 0;
       menuData.push(...val);
       menuData.forEach((ele) => ele.IsLoading = false);
-      if (menuData.length && menuData.filter((ele) => ele[groupFieldname]).length) {
+      if (menuData.length && groupFieldname && menuData.filter((ele) => ele[groupFieldname]).length) {
         lastMenuData.length = 0;
-        lastMenuData.push(...menuData.filter((ele) => ele[buttonTypeFieldname] == "Search" || ele[buttonTypeFieldname] == "Back"));
+        lastMenuData.push(...menuData.filter((ele) => ele[actionTypeFieldname] == "Search" || ele[actionTypeFieldname] == "Back"));
         foldMenuData.length = 0;
-        foldMenuData.push(...utils.dtGroupBy(menuData.filter((ele) => ele[buttonTypeFieldname] != "Search" && ele[buttonTypeFieldname] != "Back"), "FoldName", "SortIndex"));
+        foldMenuData.push(...utils.dtGroupBy(menuData.filter((ele) => ele[actionTypeFieldname] != "Search" && ele[actionTypeFieldname] != "Back"), "FoldName", "SortIndex"));
         let noFoldMenus = foldMenuData.find((ele) => ele.key == "");
         if (noFoldMenus) {
           menuData.length = 0;
@@ -15397,9 +15394,11 @@ const _sfc_main$1j = /* @__PURE__ */ defineComponent({
     }
     function triggerPowerMenu(menuID) {
       if (props.data) {
-        var currPowerMenu = props.data.find((ele) => ele[actionFieldname] === menuID || ele[idFieldname] == menuID);
+        var currPowerMenu = props.data.find((ele) => actionFieldname && ele[actionFieldname] === menuID || idFieldname && ele[idFieldname] == menuID);
         if (currPowerMenu && container) {
-          container.$menuCommand(currPowerMenu);
+          container.$menuCommand(currPowerMenu).then((res) => {
+            emits2("callback", res);
+          });
         }
       }
     }
@@ -15447,12 +15446,12 @@ const _sfc_main$1j = /* @__PURE__ */ defineComponent({
         createElementVNode("div", _hoisted_2$W, [
           (openBlock(true), createElementBlock(Fragment, null, renderList(menuData, (menu) => {
             return openBlock(), createBlock(_component_el_button, mergeProps({
-              type: menu[unref(buttonColorFieldname)],
+              type: unref(colorFieldname) && menu[unref(colorFieldname)],
               icon: menu[unref(iconFieldname)] ? menu[unref(iconFieldname)].replace("el-icon-", "") : "",
               ref_for: true
             }, _ctx.$attrs, {
               key: menu[unref(idFieldname)],
-              "native-type": menu[unref(actionFieldname)] == "Search" || menu[unref(actionFieldname)] == "Save" ? "submit" : "button",
+              "native-type": menu[unref(actionTypeFieldname)] == "Search" || menu[unref(actionTypeFieldname)] == "Save" ? "submit" : "button",
               loading: menu.IsLoading,
               onClick: ($event) => menuCommand(menu)
             }), createSlots({
@@ -15523,10 +15522,10 @@ const _sfc_main$1j = /* @__PURE__ */ defineComponent({
           renderSlot(_ctx.$slots, "default"),
           (openBlock(true), createElementBlock(Fragment, null, renderList(lastMenuData, (menu) => {
             return openBlock(), createBlock(_component_el_button, mergeProps({
-              type: menu[unref(buttonColorFieldname)],
+              type: unref(colorFieldname) && menu[unref(colorFieldname)],
               key: menu[unref(idFieldname)],
               icon: menu[unref(iconFieldname)] ? menu[unref(iconFieldname)].replace("el-icon-", "") : "",
-              "native-type": menu[unref(actionFieldname)] == "Search" || menu[unref(actionFieldname)] == "Save" ? "submit" : "button",
+              "native-type": menu[unref(actionTypeFieldname)] == "Search" || menu[unref(actionTypeFieldname)] == "Save" ? "submit" : "button",
               ref_for: true
             }, _ctx.$attrs, {
               loading: menu.IsLoading,
@@ -37476,7 +37475,7 @@ const _sfc_main$19 = /* @__PURE__ */ defineComponent({
     const tagID = "els-container" + utils.shortid();
     const { ctx } = getCurrentInstance();
     const { $codeField, $messageField, $success, $eventData } = utils.getApiConfig();
-    const { $actionField, $confirmField, $confirmPasswordField, $urlField } = utils.getMenuConfig();
+    const { $actionTypeField, $confirmField, $confirmPasswordField, $urlField } = utils.getMenuConfig();
     const elsPageStore = ref({
       validates: [],
       queryForms: [],
@@ -37624,13 +37623,13 @@ const _sfc_main$19 = /* @__PURE__ */ defineComponent({
     }
     function elsMenuCommand(menu) {
       return new Promise((resolve2, reject) => {
-        switch (menu[$actionField]) {
+        switch (menu[$actionTypeField]) {
           case "Save":
             menu.IsLoading = true;
-            if (menu[$confirmField] && !menu[$confirmPasswordField]) {
+            if ($confirmField && $confirmPasswordField && menu[$confirmField] && !menu[$confirmPasswordField]) {
               menu.IsLoading = true;
               ElMessageBox.confirm(menu[$confirmField]).then((res) => {
-                save(menu[$urlField]).then(() => {
+                $urlField && save(menu[$urlField]).then(() => {
                   resolve2({ menu, res });
                   menu.IsLoading = false;
                 }).catch((err) => {
@@ -37640,7 +37639,7 @@ const _sfc_main$19 = /* @__PURE__ */ defineComponent({
               }).catch(() => {
                 menu.IsLoading = false;
               });
-            } else if (menu[$confirmField] && menu[$confirmPasswordField]) {
+            } else if ($confirmField && $confirmPasswordField && menu[$confirmField] && menu[$confirmPasswordField]) {
               ElMessageBox.prompt(`请输入密码${menu.IsShowPassword ? `【${menu[$confirmPasswordField]}】` : ""}`, menu[$confirmField], {
                 confirmButtonText: "确定",
                 cancelButtonText: "取消",
@@ -37651,7 +37650,7 @@ const _sfc_main$19 = /* @__PURE__ */ defineComponent({
                 },
                 inputErrorMessage: "密码错误"
               }).then(() => {
-                save(menu[$urlField]).then((res) => {
+                $urlField && save(menu[$urlField]).then((res) => {
                   resolve2({ menu, res });
                   menu.IsLoading = false;
                 }).catch((err) => {
@@ -37662,7 +37661,7 @@ const _sfc_main$19 = /* @__PURE__ */ defineComponent({
                 reject(err);
               });
             } else {
-              save(menu[$urlField]).then((res) => {
+              $urlField && save(menu[$urlField]).then((res) => {
                 menu.IsLoading = false;
                 resolve2({ menu, res });
               }).catch((err) => {
@@ -37672,11 +37671,11 @@ const _sfc_main$19 = /* @__PURE__ */ defineComponent({
             }
             break;
           case "Drawer":
-            drawerUrl.value = menu[$urlField];
+            drawerUrl.value = $urlField ? menu[$urlField] : "";
             drawerVisible.value = true;
             break;
           case "Dialog":
-            dialogUrl.value = menu[$urlField];
+            dialogUrl.value = $urlField ? menu[$urlField] : "";
             dialogVisible.value = true;
             break;
           case "Target":
@@ -37686,10 +37685,10 @@ const _sfc_main$19 = /* @__PURE__ */ defineComponent({
                 ele.cacheQueryState();
               });
             }
-            window.location.href = menu[$urlField];
+            window.location.href = $urlField ? menu[$urlField] : "";
             break;
           case "TargetBlank":
-            window.open(menu[$urlField]);
+            $urlField && window.open(menu[$urlField]);
             break;
           case "Select":
             const currSelectData = {};
@@ -37697,10 +37696,10 @@ const _sfc_main$19 = /* @__PURE__ */ defineComponent({
               let keyData = ele.getTableSelectionWithQuery(props.selectMenuPostQuery);
               Object.assign(currSelectData, keyData);
             });
-            if (menu[$confirmField] && !menu[$confirmPasswordField]) {
+            if ($confirmField && $confirmPasswordField && menu[$confirmField] && !menu[$confirmPasswordField]) {
               menu.IsLoading = true;
               ElMessageBox.confirm(menu[$confirmField]).then((_) => {
-                menu[$urlField].post(currSelectData).then((res) => {
+                $urlField && menu[$urlField].post(currSelectData).then((res) => {
                   menu.IsLoading = false;
                   resolve2({ menu, res });
                   if (!res) {
@@ -37716,7 +37715,7 @@ const _sfc_main$19 = /* @__PURE__ */ defineComponent({
                 menu.IsLoading = false;
                 inject(err);
               });
-            } else if (menu[$confirmField] && menu[$confirmPasswordField]) {
+            } else if ($confirmField && $confirmPasswordField && menu[$confirmField] && menu[$confirmPasswordField]) {
               ElMessageBox.prompt(`请输入密码${menu.IsShowPassword ? `【${menu[$confirmPasswordField]}】` : ""}`, menu[$confirmField], {
                 confirmButtonText: "确定",
                 cancelButtonText: "取消",
@@ -37728,7 +37727,7 @@ const _sfc_main$19 = /* @__PURE__ */ defineComponent({
                 inputErrorMessage: "密码错误"
               }).then(() => {
                 menu.IsLoading = true;
-                menu[$urlField].post(currSelectData).then((res) => {
+                $urlField && menu[$urlField].post(currSelectData).then((res) => {
                   menu.IsLoading = false;
                   resolve2({ menu, res });
                   if (!res) {
@@ -37745,7 +37744,7 @@ const _sfc_main$19 = /* @__PURE__ */ defineComponent({
               });
             } else {
               menu.IsLoading = true;
-              menu[$urlField].post(currSelectData).then((res) => {
+              $urlField && menu[$urlField].post(currSelectData).then((res) => {
                 menu.IsLoading = false;
                 resolve2({ menu, res });
                 if (!res) {
@@ -37760,7 +37759,7 @@ const _sfc_main$19 = /* @__PURE__ */ defineComponent({
             }
             break;
           case "Export":
-            if (menu[$urlField] && menu[$urlField].split("?")[0]) {
+            if ($urlField && menu[$urlField] && menu[$urlField].split("?")[0]) {
               menu.IsLoading = true;
               menu[$urlField].post((res) => {
                 menu.IsLoading = false;
@@ -38428,7 +38427,7 @@ const _sfc_main$17 = /* @__PURE__ */ defineComponent({
   emits: /* @__PURE__ */ mergeModels(["removeItem"], ["update:children"]),
   setup(__props, { emit: __emit }) {
     const DynamicDesignerInnerItem = defineAsyncComponent(() => {
-      return import("./innerItem-oVhiu6eJ.js");
+      return import("./innerItem-DNfx6E_k.js");
     });
     const { getValue: getValue2 } = useProps();
     const tagID = getValue2("tagID");
@@ -39278,10 +39277,10 @@ const _sfc_main$15 = /* @__PURE__ */ defineComponent({
   emits: ["update:modelValue"],
   setup(__props, { expose: __expose, emit: __emit }) {
     const DynamicRenderInner = defineAsyncComponent(() => {
-      return import("./inner-7tCDHP4a.js").then((n) => n.i);
+      return import("./inner-BDnobVSc.js").then((n) => n.i);
     });
     const DynamicRenderForm = defineAsyncComponent(() => {
-      return import("./inner-7tCDHP4a.js").then((n) => n.f);
+      return import("./inner-BDnobVSc.js").then((n) => n.f);
     });
     const props = __props;
     const { getValue: getValue2, setValue, formNodeProps } = useProps(props);
@@ -39511,10 +39510,10 @@ const _sfc_main$14 = /* @__PURE__ */ defineComponent({
   emits: ["update:modelValue"],
   setup(__props, { expose: __expose, emit: __emit }) {
     const DynamicRenderInnerAsync = defineAsyncComponent(() => {
-      return import("./inner-7tCDHP4a.js").then((n) => n.i);
+      return import("./inner-BDnobVSc.js").then((n) => n.i);
     });
     const DynamicRenderFormAsync = defineAsyncComponent(() => {
-      return import("./inner-7tCDHP4a.js").then((n) => n.f);
+      return import("./inner-BDnobVSc.js").then((n) => n.f);
     });
     const props = __props;
     const { getValue: getValue2, setValue, formNodeProps } = useProps(props);
@@ -44323,31 +44322,31 @@ let AceEditor$1 = class AceEditor extends TBaseFormItem {
     __publicField(this, "editor", ref());
     onMounted(() => {
       if (props.language === "json") {
-        const currModule = import("./mode-json-Chpf6R8h.js").then((n) => n.m);
+        const currModule = import("./mode-json-B0STKklb.js").then((n) => n.m);
         currModule.then((res) => {
           ace.config.setModuleUrl("ace/mode/json", res);
           this.init();
         });
       } else if (props.language === "javascript") {
-        const currModule = import("./mode-javascript-Cy4e6XSt.js").then((n) => n.m);
+        const currModule = import("./mode-javascript-CZUeei18.js").then((n) => n.m);
         currModule.then((res) => {
           ace.config.setModuleUrl("ace/mode/javascript", res);
           this.init();
         });
       } else if (props.language === "csharp") {
-        const currModule = import("./mode-csharp-2uFK_Xfk.js").then((n) => n.m);
+        const currModule = import("./mode-csharp-vMzHNnHT.js").then((n) => n.m);
         currModule.then((res) => {
           ace.config.setModuleUrl("ace/mode/csharp", res);
           this.init();
         });
       } else if (props.language === "mysql") {
-        const currModule = import("./mode-mysql-B5NfPqi0.js").then((n) => n.m);
+        const currModule = import("./mode-mysql-B3BgfxrU.js").then((n) => n.m);
         currModule.then((res) => {
           ace.config.setModuleUrl("ace/mode/mysql", res);
           this.init();
         });
       } else if (props.language === "css") {
-        const currModule = import("./mode-css--MzwaiJV.js").then((n) => n.m);
+        const currModule = import("./mode-css-DKPqDVd1.js").then((n) => n.m);
         currModule.then((res) => {
           ace.config.setModuleUrl("ace/mode/css", res);
           this.init();