@fecp/vue 1.1.3 → 1.1.4

package/es/packages/vue/src/components/table/TableFilter.vue.mjs

@@ -3,9 +3,10 @@
 /* empty css                                                                                                                                    */
 /* empty css                                                                                                                                      */
 /* empty css                                                                                                                                         */
+/* empty css                                                                                                                                     */
+/* empty css                                                                                                                                            */
 import "../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/theme-chalk/el-date-picker.css.mjs";
 /* empty css                                                                                                                                                 */
-/* empty css                                                                                                                                     */
 /* empty css                                                                                                                                         */
 /* empty css                                                                                                                                      */
 import { useCssVars, computed, ref, watch, createElementBlock, openBlock, Fragment, createBlock, createCommentVNode, normalizeStyle, withCtx, createElementVNode, normalizeClass, renderList, withDirectives, createVNode, resolveDynamicComponent, mergeProps, vShow, unref, createTextVNode, toDisplayString } from "vue";
@@ -19,9 +20,14 @@ import { Number } from "../forms/number/index.mjs";
 import _export_sfc from "../../../../../_virtual/_plugin-vue_export-helper.mjs";
 import { ElForm, ElFormItem } from "../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/form/index.mjs";
 import { ElDatePicker } from "../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/date-picker/index.mjs";
+import { ElInputNumber } from "../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/input-number/index.mjs";
 import { ElButton } from "../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/button/index.mjs";
 import { ElDivider } from "../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/divider/index.mjs";
 import { ElIcon } from "../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/icon/index.mjs";
+const _hoisted_1 = {
+  key: 1,
+  style: { "display": "flex", "align-items": "center", "gap": "8px", "width": "100%" }
+};
 const _sfc_main = {
   __name: "TableFilter",
   props: {
@@ -37,7 +43,7 @@ const _sfc_main = {
   emits: ["search", "reset"],
   setup(__props, { expose: __expose, emit: __emit }) {
     useCssVars((_ctx) => ({
-      "50ac82f0": `${config.value.collapseRows * 90}px`
+      "3f99436f": `${config.value.collapseRows * 90}px`
     }));
     const props = __props;
     const emit = __emit;
@@ -100,6 +106,8 @@ const _sfc_main = {
         select: "请选择",
         date: type === "start" ? "开始日期" : type === "end" ? "结束日期" : "请选择日期",
         number: "请输入",
+        number_min: "最小值",
+        number_max: "最大值",
         radio: "请选择",
         checkbox: "请选择",
         switch: "请选择"
@@ -107,6 +115,9 @@ const _sfc_main = {
       if (field.fieldType === "date") {
         return placeholderMap.date;
       }
+      if (field.fieldType === "number") {
+        return type === "min" ? placeholderMap.number_min : type === "max" ? placeholderMap.number_max : placeholderMap.number;
+      }
       return `${placeholderMap[field.fieldType] || "请输入"}${field.label || ""}`;
     };
     const toggleCollapse = () => {
@@ -121,15 +132,22 @@ const _sfc_main = {
             (field) => field.id == key
           );
           const fieldName = (fieldConfig == null ? void 0 : fieldConfig.fieldName) || key;
-          if (Array.isArray(value)) {
-            filters[fieldName] = value.join("|");
+          const maxKey = `${key}_max`;
+          const maxValue = filterValues.value[maxKey];
+          if (maxValue !== "" && maxValue !== null && maxValue !== void 0) {
+            filters[fieldName] = value + "|" + maxValue;
+          } else if (key.endsWith("_max")) {
+            return;
           } else {
-            filters[fieldName] = value;
+            if (Array.isArray(value)) {
+              filters[fieldName] = value.join("|");
+            } else {
+              filters[fieldName] = value;
+            }
           }
         }
       });
-      console.log("🚀 ~ handleSearch ~ filters:", filters);
-      emit("search", filters);
+      emit("search", { filters });
     };
     const handleReset = () => {
       filterValues.value = {};
@@ -152,6 +170,7 @@ const _sfc_main = {
     });
     return (_ctx, _cache) => {
       const _component_el_date_picker = ElDatePicker;
+      const _component_el_input_number = ElInputNumber;
       const _component_el_form_item = ElFormItem;
       const _component_el_button = ElButton;
       const _component_el_form = ElForm;
@@ -179,26 +198,46 @@ const _sfc_main = {
                     label: field.label || "筛选条件"
                   }, {
                     default: withCtx(() => [
-                      field.fieldType !== "date" ? (openBlock(), createBlock(resolveDynamicComponent(getFilterComponent(field.fieldType)), mergeProps({
+                      field.fieldType == "date" ? (openBlock(), createBlock(_component_el_date_picker, {
                         key: 0,
                         modelValue: filterValues.value[field.fieldId],
                         "onUpdate:modelValue": ($event) => filterValues.value[field.fieldId] = $event,
-                        config: { ...field, eventHandlers: {} },
-                        ref_for: true
-                      }, getComponentConfig(field), {
-                        placeholder: getPlaceholder(field)
-                      }), null, 16, ["modelValue", "onUpdate:modelValue", "config", "placeholder"])) : (openBlock(), createBlock(_component_el_date_picker, {
-                        key: 1,
-                        modelValue: filterValues.value[field.fieldId],
-                        "onUpdate:modelValue": ($event) => filterValues.value[field.fieldId] = $event,
                         type: "daterange",
                         "start-placeholder": getPlaceholder(field, "start"),
                         "end-placeholder": getPlaceholder(field, "end"),
                         format: "YYYY-MM-DD",
-                        "value-format": "YYYY-MM-DD",
+                        "value-format": "YYYYMMDD",
                         clearable: "",
                         style: { "width": "100%" }
-                      }, null, 8, ["modelValue", "onUpdate:modelValue", "start-placeholder", "end-placeholder"]))
+                      }, null, 8, ["modelValue", "onUpdate:modelValue", "start-placeholder", "end-placeholder"])) : field.fieldType == "number" ? (openBlock(), createElementBlock("div", _hoisted_1, [
+                        createVNode(_component_el_input_number, {
+                          modelValue: filterValues.value[field.fieldId],
+                          "onUpdate:modelValue": ($event) => filterValues.value[field.fieldId] = $event,
+                          placeholder: getPlaceholder(field, "min"),
+                          controls: false,
+                          "controls-position": "right",
+                          style: { "flex": "1" },
+                          clearable: ""
+                        }, null, 8, ["modelValue", "onUpdate:modelValue", "placeholder"]),
+                        _cache[0] || (_cache[0] = createElementVNode("span", null, "-", -1)),
+                        createVNode(_component_el_input_number, {
+                          modelValue: filterValues.value[`${field.fieldId}_max`],
+                          "onUpdate:modelValue": ($event) => filterValues.value[`${field.fieldId}_max`] = $event,
+                          placeholder: getPlaceholder(field, "max"),
+                          controls: false,
+                          "controls-position": "right",
+                          style: { "flex": "1" },
+                          clearable: ""
+                        }, null, 8, ["modelValue", "onUpdate:modelValue", "placeholder"])
+                      ])) : (openBlock(), createBlock(resolveDynamicComponent(getFilterComponent(field.fieldType)), mergeProps({
+                        key: 2,
+                        modelValue: filterValues.value[field.fieldId],
+                        "onUpdate:modelValue": ($event) => filterValues.value[field.fieldId] = $event,
+                        config: { ...field, eventHandlers: {} },
+                        ref_for: true
+                      }, getComponentConfig(field), {
+                        placeholder: getPlaceholder(field)
+                      }), null, 16, ["modelValue", "onUpdate:modelValue", "config", "placeholder"]))
                     ]),
                     _: 2
                   }, 1032, ["label"])
@@ -218,7 +257,7 @@ const _sfc_main = {
                 onClick: handleSearch,
                 icon: unref(search_default)
               }, {
-                default: withCtx(() => _cache[0] || (_cache[0] = [
+                default: withCtx(() => _cache[1] || (_cache[1] = [
                   createTextVNode("搜索")
                 ])),
                 _: 1
@@ -227,7 +266,7 @@ const _sfc_main = {
                 onClick: handleReset,
                 icon: unref(refresh_default)
               }, {
-                default: withCtx(() => _cache[1] || (_cache[1] = [
+                default: withCtx(() => _cache[2] || (_cache[2] = [
                   createTextVNode("重置")
                 ])),
                 _: 1
@@ -261,7 +300,7 @@ const _sfc_main = {
     };
   }
 };
-const TableFilter = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-e94ef8a9"]]);
+const TableFilter = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-e72fcecc"]]);
 export {
   TableFilter as default
 };

package/es/packages/vue/src/components/table/index.mjs

@@ -1,6 +1,6 @@
-import _Table from "./Table.vue.mjs";
+import Table$1 from "./Table.vue.mjs";
 import install from "../../utils/install.mjs";
-const Table = install.withInstall("Table", _Table);
+const Table = install.withInstall("Table", Table$1);
 export {
   Table,
   Table as default

package/es/packages/vue/src/composables/usePageEvents.mjs

@@ -12,10 +12,9 @@ function usePageEvents(getOptions) {
     const staticOptions = getOptions;
     getOptions = () => staticOptions;
   }
-  const executeEvent = (eventName) => {
-    var _a;
+  const executeEvent = async (eventName) => {
     const options = getOptions();
-    const { pageEventConfig, ctx, formData, localConfig, components } = options;
+    const { pageEventConfig, ctx, formData, localConfig, components, fields } = options;
     if (!pageEventConfig || !Array.isArray(pageEventConfig) || pageEventConfig.length === 0) {
       console.log(`页面事件 ${eventName} 未配置或配置未加载完成，跳过执行`);
       return;
@@ -26,7 +25,7 @@ function usePageEvents(getOptions) {
       return;
     }
     const { getEventHandlers: createEventHandlers } = useEventFlow({
-      fields: ((_a = localConfig == null ? void 0 : localConfig.fieldsData) == null ? void 0 : _a.map((item) => item.component)) || [],
+      fields: fields || [],
       ctx,
       dataSources: (localConfig == null ? void 0 : localConfig.dataSources) || [],
       components: components || {}
@@ -39,7 +38,7 @@ function usePageEvents(getOptions) {
     const eventKeys = Object.keys(handler);
     if (eventKeys.length > 0) {
       console.log(`执行页面事件 ${eventName}`);
-      handler[eventKeys[0]]();
+      await handler[eventKeys[0]]();
     }
   };
   const handleCreated = (checkConfigLoaded) => {

package/es/packages/vue/src/utils/common.mjs

@@ -1,3 +1,7 @@
+import cloneDeep$1 from "../../../../node_modules/.pnpm/lodash-es@4.17.23/node_modules/lodash-es/cloneDeep.mjs";
+function cloneDeep(data) {
+  return cloneDeep$1(data);
+}
 function removeEmptyValues(data) {
   if (typeof data !== "object" || data === null) {
     return data;
@@ -19,5 +23,6 @@ function removeEmptyValues(data) {
   return result;
 }
 export {
+  cloneDeep,
   removeEmptyValues
 };

package/es/packages/vue/src/utils/datasource.mjs

@@ -6,8 +6,10 @@ import { parseRouteParams } from "./parseRouteParams.mjs";
 import { ElMessage } from "../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/message/index.mjs";
 class DataSourceManager {
   constructor(options = {}) {
+    this.templateId = options.templateId;
     this.http = options.http;
     this.params = options.params || {};
+    this.initSearchData = options.initSearchData || {};
     this.dataSources = options.dataSources || [];
     this.currentDataSourceId = options.currentDataSourceId;
     this.pagination = options.pagination || false;
@@ -38,6 +40,9 @@ class DataSourceManager {
     const currentDs = this.getCurrentDataSource();
     if (!currentDs) return {};
     const params = { ...this.params };
+    if (this.templateId) {
+      params.tableId = this.templateId;
+    }
     if (currentDs.params && Array.isArray(currentDs.params)) {
       const parsedParams = parseRouteParams(
         currentDs.params,
@@ -53,7 +58,7 @@ class DataSourceManager {
     if (this.sortRules && this.sortRules.length > 0) {
       params.sortRules = this.sortRules;
     }
-    return { ...params, ...extraParams };
+    return { ...this.initSearchData, ...params, ...extraParams };
   }
   /**
    * 根据内容类型处理请求数据
@@ -283,6 +288,9 @@ class DataSourceManager {
   updateParams(newParams) {
     this.params = { ...this.params, ...newParams };
   }
+  updateInitSearchData(newParams) {
+    this.initSearchData = newParams;
+  }
   /**
    * 清空请求参数
    */

package/es/packages/vue/src/utils/formulajs/calculate.mjs

@@ -0,0 +1,57 @@
+import functionCore from "./functionCore.mjs";
+import "vue";
+function calculate(params) {
+  const { text, value = {} } = params;
+  if (!text) return new Error("非法公式");
+  try {
+    let str = text;
+    let offset = 0;
+    const regex = /\{(\w+)\}/g;
+    let match;
+    const fields = [];
+    while ((match = regex.exec(text)) !== null) {
+      fields.push({
+        enCode: match[1],
+        startIndex: match.index,
+        endIndex: match.index + match[0].length
+      });
+    }
+    for (const field of fields) {
+      const { enCode, startIndex, endIndex } = field;
+      let data = value[enCode];
+      if (enCode.indexOf(".") > -1) {
+        const [key, subKey] = enCode.split(".");
+        if (value[key]) data = value[key].map((o) => o[subKey]);
+      }
+      if (data !== void 0) {
+        data = JSON.stringify(data);
+        const actualStart = startIndex + offset;
+        const actualEnd = endIndex + offset;
+        str = str.slice(0, actualStart) + data.toString() + str.slice(actualEnd);
+        offset += data.toString().length - (endIndex - startIndex);
+      }
+    }
+    const result = functionCore.executeFunction(str);
+    return result;
+  } catch (e) {
+    const errorTypes = {
+      TypeError: () => "类型错误",
+      RangeError: () => "范围错误",
+      SyntaxError: () => "语法错误",
+      ReferenceError: () => {
+        const regex = /^(\w+)\s+is\s+not\s+defined$/;
+        const match = e.message.match(regex);
+        return match ? `${match[1]} 未定义` : "未定义的变量";
+      }
+    };
+    const errorType = errorTypes[e.constructor.name];
+    const errorMessage = (errorType == null ? void 0 : errorType()) || `其他错误: ${e.message}`;
+    return {
+      error: true,
+      message: errorMessage
+    };
+  }
+}
+export {
+  calculate
+};

package/es/packages/vue/src/utils/formulajs/functionCore.mjs

@@ -0,0 +1,17 @@
+import * as index from "../../../../../node_modules/.pnpm/@formulajs_formulajs@4.5.6/node_modules/@formulajs/formulajs/lib/esm/index.mjs";
+class FunctionCore {
+  constructor() {
+    Object.assign(FunctionCore.prototype, index);
+  }
+  executeFunction(str) {
+    const fn = new Function(
+      "with(this) { return " + str + "; }"
+      // 使用 `with` 来确保从当前实例中查找函数
+    ).bind(this);
+    return fn();
+  }
+}
+const functionCore = new FunctionCore();
+export {
+  functionCore as default
+};