@ebiz/designer-components 0.0.18-kzy.5 → 0.0.18-kzy.6

package/dist/index.mjs

@@ -126715,7 +126715,7 @@ const {
   formToJSON: f$t,
   getAdapter: h$t,
   mergeConfig: p$t
-} = $r, sy = "http://localhost:8090/api", yb = $r.create({
+} = $r, sy = "http://" + window.location.host + "/api", yb = $r.create({
   baseURL: sy,
   timeout: 3e4,
   headers: {
@@ -126955,9 +126955,16 @@ const ps = {
       "BATCH_DEL_DATA",
       "MULTIPLE_DATA_LINK_SEARCH"
     ], i = t, { text: o, isNormal: a, disabled: l, type: s, size: u, apiConfig: c, data: d, isUseMethod: f } = ot(n), h = re("请先设置接口配置"), p = () => {
-      n.onClick(), !a.value && c.value.apiId && (n.onPrepare(), ps.fetch(d.value, { key: c.value.key, apiId: c.value.apiId, apiType: r[c.value.apiType] }).then((v) => {
-        i("click", v), n.onFinish();
-      }));
+      if (n.onClick(), !(a.value || !isValidApiConfig()))
+        try {
+          if (n.onPrepare() === !1)
+            return null;
+          ps.fetch(d.value, { key: c.value.key, apiId: c.value.apiId, apiType: r[c.value.apiType] }).then((m) => {
+            i("click", m), n.onFinish();
+          });
+        } catch (v) {
+          n.onError(v);
+        }
     };
     return (v, m) => (T(), se(ht(Xn), {
       content: !ht(a) && !ht(c).apiId ? h.value : "",
@@ -138108,7 +138115,7 @@ const uDt = /* @__PURE__ */ Rt(rMt, [["render", iMt], ["__scopeId", "data-v-491f
     size: {
       type: String,
       default: "",
-      validator: (e) => ["small", "medium", "large"].includes(e)
+      validator: (e) => ["small", "medium", "large", ""].includes(e)
     },
     /**
      * 空数据文本
@@ -138216,9 +138223,8 @@ const uDt = /* @__PURE__ */ Rt(rMt, [["render", iMt], ["__scopeId", "data-v-491f
         (T(!0), R(Te, null, Je(d.value, (w) => (T(), se(ht(al), {
           key: w.value,
           value: w.value,
-          label: w.label,
-          onClick: (k) => y.handleClick(w.value)
-        }, null, 8, ["value", "label", "onClick"]))), 128))
+          label: w.label
+        }, null, 8, ["value", "label"]))), 128))
       ]),
       _: 2
     }, [
@@ -138238,7 +138244,7 @@ const uDt = /* @__PURE__ */ Rt(rMt, [["render", iMt], ["__scopeId", "data-v-491f
       } : void 0
     ]), 1032, ["modelValue", "loading", "multiple", "placeholder", "clearable", "disabled", "size", "empty", "popupProps"]));
   }
-}), CDt = /* @__PURE__ */ Rt(e9t, [["__scopeId", "data-v-e1cae77a"]]), t9t = {
+}), CDt = /* @__PURE__ */ Rt(e9t, [["__scopeId", "data-v-9da31a27"]]), t9t = {
   name: "EbizTimeline"
 }, n9t = /* @__PURE__ */ Object.assign(t9t, {
   props: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ebiz/designer-components",
-  "version": "0.0.18-kzy.5",
+  "version": "0.0.18-kzy.6",
   "private": false,
   "publishConfig": {
     "access": "public"

package/src/apiService/simpleDataService.js

@@ -8,9 +8,9 @@ import axios from 'axios'
 import { TinyNotify } from '@opentiny/vue'
 
 // 本地开发使用
-const API_BASE_URL = "http://localhost:8090/api";
+// const API_BASE_URL = "http://localhost:8090/api";
 // 组件发布使用
-// const API_BASE_URL = 'http://' + window.location.host + '/api'
+const API_BASE_URL = 'http://' + window.location.host + '/api'
 
 /**
  * 创建axios实例

package/src/components/Button.vue

@@ -90,12 +90,24 @@ const tooltipText = ref('请先设置接口配置')
 
 const click = () => {
     props.onClick()
-    if (!isNormal.value && apiConfig.value.apiId) {
-        props.onPrepare()
+    // 如果是普通按钮或API配置无效，不调用接口
+    if (isNormal.value || !isValidApiConfig()) {
+        return
+    }
+
+    try {
+        // 调用前置处理并获取返回值
+        const shouldContinue = props.onPrepare()
+        if (shouldContinue === false) {
+            return null
+        }
+
         dataService.fetch(data.value, { key: apiConfig.value.key, apiId: apiConfig.value.apiId, apiType: apiMap[apiConfig.value.apiType] }).then((res) => {
             emit('click', res)
             props.onFinish()
         })
+    } catch (error) {
+        props.onError(error)
     }
 }
 

package/src/components/EbizGridEditorSelect.vue

@@ -2,8 +2,7 @@
     <t-select ref="selectRef" v-model="selectedValue" :loading="loading" :filterable="true" @search="handleRemoteSearch"
         :multiple="multiple" :placeholder="placeholder" :clearable="clearable" :disabled="disabled" :size="size"
         :empty="emptyText" :popupProps="popupProps" @change="handleChange" @focus="handleFocus" @blur="handleBlur">
-        <t-option v-for="item in options" :key="item.value" :value="item.value" :label="item.label"
-            @click="handleClick(item.value)"></t-option>
+        <t-option v-for="item in options" :key="item.value" :value="item.value" :label="item.label"></t-option>
         <template #prefixIcon v-if="$slots.prefix">
             <slot name="prefix"></slot>
         </template>
@@ -98,7 +97,7 @@ const props = defineProps({
     size: {
         type: String,
         default: '',
-        validator: (val) => ['small', 'medium', 'large'].includes(val)
+        validator: (val) => ['small', 'medium', 'large', ''].includes(val)
     },
     /**
      * 空数据文本