element-less 0.0.32 → 0.0.34

package/hooks/useSelect.d.ts

@@ -11,6 +11,7 @@ export declare function useSelect(props: any, defaultEmits: any, formNode?: Ref<
     onClickOption: (item: any) => void;
     onCheckAll: (val: any) => void;
     onInverseChange: () => void;
+    readData: () => Promise<unknown> | undefined;
     returnValue: (value: number | string | boolean) => void;
     singleSelectValue: Ref<any>;
     checkAll: Ref<any>;

package/hooks/useTree.d.ts

@@ -13,6 +13,7 @@ export declare function useTree(props: any, dataTree: Ref<any>, defaultEmits: an
     options: Ref<any>;
     defaultCheckedKeys: Ref<any>;
     defaultExpandedKeys: Ref<any>;
+    readData: () => Promise<unknown> | undefined;
     handleAllSelect: (node: any) => void;
     filterNode: (value: any, data: any) => boolean;
     onLoadNode: (node: any, resolve: any) => any;

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

@@ -4186,6 +4186,7 @@ function useSelect(props = {}, defaultEmits, formNode, componentName) {
     onClickOption,
     onCheckAll,
     onInverseChange,
+    readData,
     returnValue: handleReturnValue,
     singleSelectValue,
     checkAll,
@@ -4491,19 +4492,22 @@ function useTree(props = {}, dataTree, defaultEmits, componentName) {
       });
     });
   }
+  function toTreeDataWithNoParent(data) {
+    return data.map((ele) => {
+      return {
+        id: ele[currIdField.value],
+        label: ele[props.labelField],
+        value: ele[props.valueField],
+        disabled: props.disabledField ? ele[props.disabledField] : false,
+        children: ele.children ? toTreeDataWithNoParent(ele.children) : [],
+        sourceData: ele
+      };
+    });
+  }
   function toTreeData() {
     var groups = [];
     if (!props.parentIdField) {
-      options.value = optionData.value.map((ele) => {
-        return {
-          id: ele[currIdField.value],
-          label: ele[props.labelField],
-          value: ele[props.valueField],
-          disabled: props.disabledField ? ele[props.disabledField] : false,
-          children: ele.children ? ele.children : [],
-          sourceData: ele
-        };
-      });
+      options.value = toTreeDataWithNoParent(optionData.value);
       return;
     }
     var roots = optionData.value.filter((ele) => ele[props.parentIdField] == props.rootParentValue).map((ele) => {
@@ -4896,6 +4900,7 @@ function useTree(props = {}, dataTree, defaultEmits, componentName) {
     options,
     defaultCheckedKeys,
     defaultExpandedKeys,
+    readData,
     handleAllSelect,
     filterNode,
     onLoadNode,
@@ -5368,6 +5373,9 @@ class TBaseSelect extends TBaseFormItem {
   constructor(props, ctx, comName) {
     super(props, ctx);
     this._selectState = useSelect(props, this._defaultEmits, this._formNode, comName);
+    ctx.expose({
+      readData: this._selectState.readData
+    });
     if (comName === "select") {
       this._childType.value = "picker";
     }
@@ -5403,6 +5411,9 @@ class TBaseTree extends TBaseFormItem {
     super(props, ctx);
     __publicField(this, "_treeRef", ref(null));
     this._selectState = useTree(props, this._treeRef, this._defaultEmits, comName);
+    ctx.expose({
+      readData: this._selectState.readData
+    });
   }
   watchModelValue() {
   }
@@ -12404,8 +12415,8 @@ const _sfc_main$1A = /* @__PURE__ */ defineComponent({
         title: _ctx.title,
         beforeClose: mobileBeforeClose,
         "close-on-click-overlay": _ctx.closeOnClickModal,
-        showCancelButton: _ctx.showCancelButton,
-        "show-confirm-button": _ctx.showConfirmButton,
+        showCancelButton: _ctx.confirm !== void 0,
+        "show-confirm-button": _ctx.confirm !== void 0,
         onCancel: handleCancel,
         onConfirm: handleConfirm
       }, createSlots({
@@ -12476,7 +12487,7 @@ const _sfc_main$1A = /* @__PURE__ */ defineComponent({
           ]),
           key: "1"
         } : void 0,
-        !unref(slots).footer && (_ctx.showCancelButton || _ctx.showConfirmButton) ? {
+        !unref(slots).footer && _ctx.confirm ? {
           name: "footer",
           fn: withCtx(() => [
             createVNode(_component_el_button, {
@@ -15287,7 +15298,8 @@ const _sfc_main$1j = /* @__PURE__ */ defineComponent({
   ...{ name: "ElsMenuTool" },
   __name: "menuTool",
   props: menuToolProps,
-  setup(__props, { expose: __expose }) {
+  emits: ["callback"],
+  setup(__props, { expose: __expose, emit: __emit }) {
     const container = useContainer();
     const props = __props;
     const menuConfig = utils.getMenuConfig();
@@ -15312,6 +15324,7 @@ const _sfc_main$1j = /* @__PURE__ */ defineComponent({
       previewImg: "",
       uploadUrl: ""
     });
+    const emits2 = __emit;
     watch(() => props.url, (val) => {
       if (val) {
         val.post({}).then((res) => {
@@ -15402,7 +15415,9 @@ const _sfc_main$1j = /* @__PURE__ */ defineComponent({
           uploadUrl: menu.TargetUrl
         };
       } else if (container.$menuCommand) {
-        container.$menuCommand(menu);
+        container.$menuCommand(menu).then((res) => {
+          emits2("callback", res);
+        });
       }
     }
     function uploadSuccess(res) {
@@ -37484,45 +37499,45 @@ const _sfc_main$19 = /* @__PURE__ */ defineComponent({
     });
     const completeReadTableIds = ref([]);
     function validate() {
-      return new Promise((resolve) => {
+      return new Promise((resolve2) => {
         const currValidates = [...elsPageStore.value.validates];
         if (elsPageStore.value.childContainer.length) {
           currValidates.push(...elsPageStore.value.childContainer);
         }
         Promise.all(currValidates.map((ele) => ele.validate())).then((res) => {
           if (res.every((ele) => ele == true)) {
-            resolve(true);
+            resolve2(true);
             emits2("validate", true);
           } else {
-            resolve(false);
+            resolve2(false);
             emits2("validate", false);
           }
         });
       });
     }
     function save(url) {
-      return new Promise((resolve, reject) => {
+      return new Promise((resolve2, reject) => {
         if (elsPageStore.value.saveForms.length) {
           validate().then((res) => {
             if (res) {
               Promise.all(elsPageStore.value.saveForms.map((ele) => ele.save(url))).then(() => {
-                resolve(true);
+                resolve2(true);
               }).catch((error) => {
                 reject(error);
               });
             } else {
-              resolve(false);
+              resolve2(false);
             }
           });
         } else {
-          resolve(true);
+          resolve2(true);
         }
       });
     }
     async function query(initPage = false, tableRef = "") {
       const parentRefs = ctx._.parent.refs;
       completeReadTableIds.value.length = 0;
-      return new Promise(async (resolve) => {
+      return new Promise(async (resolve2) => {
         if (tableRef) {
           const currForm = elsPageStore.value.queryForms.find((ele) => ele.tableRef == tableRef);
           if (currForm) {
@@ -37535,13 +37550,13 @@ const _sfc_main$19 = /* @__PURE__ */ defineComponent({
                 if (currTable && (currTable.initReadData || !initPage)) {
                   completeReadTableIds.value.push(currTable.tagID);
                   currTable.query(initPage, res).then(() => {
-                    resolve(true);
+                    resolve2(true);
                   });
                 }
               }
             });
           } else {
-            resolve(false);
+            resolve2(false);
           }
           return;
         }
@@ -37577,7 +37592,7 @@ const _sfc_main$19 = /* @__PURE__ */ defineComponent({
             });
           }
           Promise.all(queryAsyncs).then(() => {
-            resolve(true);
+            resolve2(true);
           });
         } else if (elsPageStore.value.dataTables.length) {
           const queryAsyncs = [];
@@ -37585,182 +37600,203 @@ const _sfc_main$19 = /* @__PURE__ */ defineComponent({
             queryAsyncs.push(item.query(initPage, {}));
           });
           Promise.all(queryAsyncs).then(() => {
-            resolve(true);
+            resolve2(true);
           });
         } else {
-          resolve(true);
+          resolve2(true);
         }
       });
     }
     function elsSaveTable() {
-      return new Promise(async (resolve) => {
+      return new Promise(async (resolve2) => {
         const queryAsyncs = [];
         elsPageStore.value.dataTables.forEach((ele) => {
           queryAsyncs.push(ele.saveTableData());
         });
         if (queryAsyncs.length) {
           Promise.all(queryAsyncs).then(() => {
-            resolve(true);
+            resolve2(true);
           }).catch(() => {
-            resolve(false);
+            resolve2(false);
           });
         }
       });
     }
     function elsMenuCommand(menu) {
-      switch (menu[$actionField]) {
-        case "Save":
-          menu.IsLoading = true;
-          if (menu[$confirmField] && !menu[$confirmPasswordField]) {
+      return new Promise((resolve2, reject) => {
+        switch (menu[$actionField]) {
+          case "Save":
             menu.IsLoading = true;
-            ElMessageBox.confirm(menu[$confirmField]).then((_) => {
-              save(menu[$urlField]).then(() => {
-                menu.IsLoading = false;
+            if (menu[$confirmField] && !menu[$confirmPasswordField]) {
+              menu.IsLoading = true;
+              ElMessageBox.confirm(menu[$confirmField]).then((res) => {
+                save(menu[$urlField]).then(() => {
+                  resolve2({ menu, res });
+                  menu.IsLoading = false;
+                }).catch((err) => {
+                  reject(err);
+                  menu.IsLoading = false;
+                });
               }).catch(() => {
                 menu.IsLoading = false;
               });
-            }).catch(() => {
-              menu.IsLoading = false;
-            });
-          } else if (menu[$confirmField] && menu[$confirmPasswordField]) {
-            ElMessageBox.prompt(`请输入密码${menu.IsShowPassword ? `【${menu[$confirmPasswordField]}】` : ""}`, menu[$confirmField], {
-              confirmButtonText: "确定",
-              cancelButtonText: "取消",
-              closeOnHashChange: false,
-              closeOnClickModal: false,
-              inputValidator: (val) => {
-                return val == menu[$confirmPasswordField];
-              },
-              inputErrorMessage: "密码错误"
-            }).then(() => {
-              save(menu[$urlField]).then(() => {
+            } else if (menu[$confirmField] && menu[$confirmPasswordField]) {
+              ElMessageBox.prompt(`请输入密码${menu.IsShowPassword ? `【${menu[$confirmPasswordField]}】` : ""}`, menu[$confirmField], {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                closeOnHashChange: false,
+                closeOnClickModal: false,
+                inputValidator: (val) => {
+                  return val == menu[$confirmPasswordField];
+                },
+                inputErrorMessage: "密码错误"
+              }).then(() => {
+                save(menu[$urlField]).then((res) => {
+                  resolve2({ menu, res });
+                  menu.IsLoading = false;
+                }).catch((err) => {
+                  reject(err);
+                  menu.IsLoading = false;
+                });
+              }).catch((err) => {
+                reject(err);
+              });
+            } else {
+              save(menu[$urlField]).then((res) => {
                 menu.IsLoading = false;
-              }).catch(() => {
+                resolve2({ menu, res });
+              }).catch((err) => {
                 menu.IsLoading = false;
+                reject(err);
               });
-            }).catch(() => {
-            });
-          } else {
-            save(menu[$urlField]).then(() => {
-              menu.IsLoading = false;
-            }).catch(() => {
-              menu.IsLoading = false;
-            });
-          }
-          break;
-        case "Drawer":
-          drawerUrl.value = menu[$urlField];
-          drawerVisible.value = true;
-          break;
-        case "Dialog":
-          dialogUrl.value = menu[$urlField];
-          dialogVisible.value = true;
-          break;
-        case "Target":
-          menu.IsLoading = true;
-          if (menu.IsQueryState == 1) {
-            elsPageStore.value.queryForms.forEach((ele) => {
-              ele.cacheQueryState();
-            });
-          }
-          window.location.href = menu[$urlField];
-          break;
-        case "TargetBlank":
-          window.open(menu[$urlField]);
-          break;
-        case "Select":
-          const currSelectData = {};
-          elsPageStore.value.dataTables.forEach((ele) => {
-            let keyData = ele.getTableSelectionWithQuery(props.selectMenuPostQuery);
-            Object.assign(currSelectData, keyData);
-          });
-          if (menu[$confirmField] && !menu[$confirmPasswordField]) {
+            }
+            break;
+          case "Drawer":
+            drawerUrl.value = menu[$urlField];
+            drawerVisible.value = true;
+            break;
+          case "Dialog":
+            dialogUrl.value = menu[$urlField];
+            dialogVisible.value = true;
+            break;
+          case "Target":
             menu.IsLoading = true;
-            ElMessageBox.confirm(menu[$confirmField]).then((_) => {
+            if (menu.IsQueryState == 1) {
+              elsPageStore.value.queryForms.forEach((ele) => {
+                ele.cacheQueryState();
+              });
+            }
+            window.location.href = menu[$urlField];
+            break;
+          case "TargetBlank":
+            window.open(menu[$urlField]);
+            break;
+          case "Select":
+            const currSelectData = {};
+            elsPageStore.value.dataTables.forEach((ele) => {
+              let keyData = ele.getTableSelectionWithQuery(props.selectMenuPostQuery);
+              Object.assign(currSelectData, keyData);
+            });
+            if (menu[$confirmField] && !menu[$confirmPasswordField]) {
+              menu.IsLoading = true;
+              ElMessageBox.confirm(menu[$confirmField]).then((_) => {
+                menu[$urlField].post(currSelectData).then((res) => {
+                  menu.IsLoading = false;
+                  resolve2({ menu, res });
+                  if (!res) {
+                    return;
+                  }
+                  elsApiResult(res);
+                }).catch((err) => {
+                  console.log(err);
+                  inject(err);
+                  menu.IsLoading = false;
+                });
+              }).catch((err) => {
+                menu.IsLoading = false;
+                inject(err);
+              });
+            } else if (menu[$confirmField] && menu[$confirmPasswordField]) {
+              ElMessageBox.prompt(`请输入密码${menu.IsShowPassword ? `【${menu[$confirmPasswordField]}】` : ""}`, menu[$confirmField], {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                closeOnHashChange: false,
+                closeOnClickModal: false,
+                inputValidator: (val) => {
+                  return val == menu[$confirmPasswordField];
+                },
+                inputErrorMessage: "密码错误"
+              }).then(() => {
+                menu.IsLoading = true;
+                menu[$urlField].post(currSelectData).then((res) => {
+                  menu.IsLoading = false;
+                  resolve2({ menu, res });
+                  if (!res) {
+                    return;
+                  }
+                  elsApiResult(res);
+                }).catch((err) => {
+                  console.log(err);
+                  inject(err);
+                  menu.IsLoading = false;
+                });
+              }).catch((err) => {
+                inject(err);
+              });
+            } else {
+              menu.IsLoading = true;
               menu[$urlField].post(currSelectData).then((res) => {
                 menu.IsLoading = false;
+                resolve2({ menu, res });
                 if (!res) {
                   return;
                 }
                 elsApiResult(res);
               }).catch((err) => {
                 console.log(err);
+                inject(err);
                 menu.IsLoading = false;
               });
-            }).catch(() => {
-              menu.IsLoading = false;
-            });
-          } else if (menu[$confirmField] && menu[$confirmPasswordField]) {
-            ElMessageBox.prompt(`请输入密码${menu.IsShowPassword ? `【${menu[$confirmPasswordField]}】` : ""}`, menu[$confirmField], {
-              confirmButtonText: "确定",
-              cancelButtonText: "取消",
-              closeOnHashChange: false,
-              closeOnClickModal: false,
-              inputValidator: (val) => {
-                return val == menu[$confirmPasswordField];
-              },
-              inputErrorMessage: "密码错误"
-            }).then(() => {
+            }
+            break;
+          case "Export":
+            if (menu[$urlField] && menu[$urlField].split("?")[0]) {
               menu.IsLoading = true;
-              menu[$urlField].post(currSelectData).then((res) => {
+              menu[$urlField].post((res) => {
                 menu.IsLoading = false;
+                resolve2({ menu, res: true });
                 if (!res) {
                   return;
                 }
-                elsApiResult(res);
-              }).catch((err) => {
-                console.log(err);
-                menu.IsLoading = false;
+                if (res[$codeField] == "0") {
+                  var currUrl = res.Data;
+                  if (currUrl.indexOf("txt") > -1) {
+                    utils.downLoadTxt(currUrl);
+                  } else {
+                    window.location.href = currUrl;
+                  }
+                } else {
+                  ElMessage.error(res[$messageField]);
+                }
               });
-            }).catch(() => {
-            });
-          } else {
+            } else {
+              elsExportAll();
+              resolve2({ menu, res: true });
+              menu.IsLoading = false;
+            }
+            break;
+          case "Search":
             menu.IsLoading = true;
-            menu[$urlField].post(currSelectData).then((res) => {
+            query().then(() => {
               menu.IsLoading = false;
-              if (!res) {
-                return;
-              }
-              elsApiResult(res);
+              resolve2({ menu, res: true });
             }).catch((err) => {
-              console.log(err);
-              menu.IsLoading = false;
-            });
-          }
-          break;
-        case "Export":
-          if (menu[$urlField] && menu[$urlField].split("?")[0]) {
-            menu.IsLoading = true;
-            menu[$urlField].post((res) => {
+              resolve2(err);
               menu.IsLoading = false;
-              if (!res) {
-                return;
-              }
-              if (res[$codeField] == "0") {
-                var currUrl = res.Data;
-                if (currUrl.indexOf("txt") > -1) {
-                  utils.downLoadTxt(currUrl);
-                } else {
-                  window.location.href = currUrl;
-                }
-              } else {
-                ElMessage.error(res[$messageField]);
-              }
             });
-          } else {
-            elsExportAll();
-            menu.IsLoading = false;
-          }
-          break;
-        case "Search":
-          menu.IsLoading = true;
-          query().then(() => {
-            menu.IsLoading = false;
-          }).catch(() => {
-            menu.IsLoading = false;
-          });
-          return false;
-      }
+            return false;
+        }
+      });
     }
     function elsApiResult(res) {
       if (!res) {
@@ -37807,10 +37843,10 @@ const _sfc_main$19 = /* @__PURE__ */ defineComponent({
       dataTable.exportTable();
     }
     function elsExportHtml() {
-      return new Promise((resolve) => {
+      return new Promise((resolve2) => {
         if (!elsPageStore) {
           ElMessage.warning("页面未包含在els-container中无法使用默认导出");
-          resolve(false);
+          resolve2(false);
           return;
         }
         const dataTables = elsPageStore.value.dataTables;
@@ -37848,7 +37884,7 @@ const _sfc_main$19 = /* @__PURE__ */ defineComponent({
               ele.changePageReadData();
             }
           });
-          resolve(true);
+          resolve2(true);
         });
       });
     }
@@ -38392,7 +38428,7 @@ const _sfc_main$17 = /* @__PURE__ */ defineComponent({
   emits: /* @__PURE__ */ mergeModels(["removeItem"], ["update:children"]),
   setup(__props, { emit: __emit }) {
     const DynamicDesignerInnerItem = defineAsyncComponent(() => {
-      return import("./innerItem-CjEXcxPQ.js");
+      return import("./innerItem-oVhiu6eJ.js");
     });
     const { getValue: getValue2 } = useProps();
     const tagID = getValue2("tagID");
@@ -39242,10 +39278,10 @@ const _sfc_main$15 = /* @__PURE__ */ defineComponent({
   emits: ["update:modelValue"],
   setup(__props, { expose: __expose, emit: __emit }) {
     const DynamicRenderInner = defineAsyncComponent(() => {
-      return import("./inner-wfALB2Xi.js").then((n) => n.i);
+      return import("./inner-7tCDHP4a.js").then((n) => n.i);
     });
     const DynamicRenderForm = defineAsyncComponent(() => {
-      return import("./inner-wfALB2Xi.js").then((n) => n.f);
+      return import("./inner-7tCDHP4a.js").then((n) => n.f);
     });
     const props = __props;
     const { getValue: getValue2, setValue, formNodeProps } = useProps(props);
@@ -39475,10 +39511,10 @@ const _sfc_main$14 = /* @__PURE__ */ defineComponent({
   emits: ["update:modelValue"],
   setup(__props, { expose: __expose, emit: __emit }) {
     const DynamicRenderInnerAsync = defineAsyncComponent(() => {
-      return import("./inner-wfALB2Xi.js").then((n) => n.i);
+      return import("./inner-7tCDHP4a.js").then((n) => n.i);
     });
     const DynamicRenderFormAsync = defineAsyncComponent(() => {
-      return import("./inner-wfALB2Xi.js").then((n) => n.f);
+      return import("./inner-7tCDHP4a.js").then((n) => n.f);
     });
     const props = __props;
     const { getValue: getValue2, setValue, formNodeProps } = useProps(props);
@@ -44287,31 +44323,31 @@ let AceEditor$1 = class AceEditor extends TBaseFormItem {
     __publicField(this, "editor", ref());
     onMounted(() => {
       if (props.language === "json") {
-        const currModule = import("./mode-json-BVtwLN-c.js").then((n) => n.m);
+        const currModule = import("./mode-json-Chpf6R8h.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-fhG4KxFO.js").then((n) => n.m);
+        const currModule = import("./mode-javascript-Cy4e6XSt.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-CFrOHziI.js").then((n) => n.m);
+        const currModule = import("./mode-csharp-2uFK_Xfk.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-ZefAWbv4.js").then((n) => n.m);
+        const currModule = import("./mode-mysql-B5NfPqi0.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-7U33znGJ.js").then((n) => n.m);
+        const currModule = import("./mode-css--MzwaiJV.js").then((n) => n.m);
         currModule.then((res) => {
           ace.config.setModuleUrl("ace/mode/css", res);
           this.init();