@ditari/bsui 1.0.63 → 1.0.65

package/dist/cjs/components/select/Select.vue.cjs.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const a=require("vue"),x=require("../../store/modules/DataDictionary.cjs.js"),B={name:"DSelect"},y=a.defineComponent({...B,props:{value:{default:null},name:{default:""},disabled:{type:Boolean,default:!1},placeholder:{default:"请填写默认占位符啊！老铁"},include:{default:[]}},emits:["update:value","change","select"],setup(r,{emit:s}){const u=r,{getDicByKey:v}=x.useDataDicStore(),{modelValue:i,data:h,onSearch:p,onSelect:S,onChange:C}=g();function g(){const o=[...v(u.name)],l=a.ref([]),t=a.ref(u.value);a.watch(()=>u.include,()=>{f(t.value)}),a.watch(()=>u.value,e=>{t.value=e,m(e)}),f(t.value);const d=e=>{f(e)};function f(e){e=e??"",l.value=o.filter(n=>n.value.toLowerCase().indexOf(e.toLowerCase())!==-1||n.label.toLowerCase().includes(e.toLowerCase())).splice(0,10),l.value.length===0&&(l.value=[...o].splice(0,10))}function m(e){const n=o.findIndex(c=>c.value.toLowerCase().indexOf(e.toLowerCase())!==-1||c.label.toLowerCase().includes(e));n===-1?l.value=[...o].splice(0,10):l.value=L(o,n)}function L(e,n){const c=Math.max(0,n-5),_=Math.min(e.length,n+6);return e.slice(c,_)}const b=e=>{s("update:value",e),D()},w=()=>{s("update:value",t.value),s("change",t.value)};function D(){const n=v(u.name).find(c=>c.value===t.value);s("select",n)}return{data:l,modelValue:t,onSearch:d,onSelect:b,onChange:w}}return(o,l)=>{const t=a.resolveComponent("a-select");return a.openBlock(),a.createBlock(t,{value:a.unref(i),"onUpdate:value":l[0]||(l[0]=d=>a.isRef(i)?i.value=d:null),"allow-clear":"","show-search":"","filter-option":!1,options:a.unref(h),placeholder:r.placeholder,disabled:r.disabled,onSelect:a.unref(S),onSearch:a.unref(p),onChange:a.unref(C)},null,8,["value","options","placeholder","disabled","onSelect","onSearch","onChange"])}}});exports.default=y;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const n=require("vue"),x=require("../../store/modules/DataDictionary.cjs.js"),B={name:"DSelect"},y=n.defineComponent({...B,props:{value:{default:null},name:{default:""},disabled:{type:Boolean,default:!1},placeholder:{default:"请填写默认占位符啊！老铁"},include:{default:[]}},emits:["update:value","change","select"],setup(r,{emit:u}){const s=r,{getDicByKey:f}=x.useDataDicStore(),{modelValue:i,data:h,onSearch:M,onSelect:p,onChange:v}=S();function S(){const l=[...f(s.name)],t=n.ref(l),o=n.ref(s.value);n.watch(()=>s.value,e=>{o.value=e,m(e)});const d=e=>{g(e)};function g(e){e=e??"",t.value=l.filter(a=>a.value.toLowerCase().indexOf(e.toLowerCase())!==-1||a.label.toLowerCase().includes(e.toLowerCase())).splice(0,10),t.value.length===0&&(t.value=[...l].splice(0,10))}function m(e){e=e||"";const a=l.findIndex(c=>c.value.toLowerCase().indexOf(e.toLowerCase())!==-1||c.label.toLowerCase().includes(e));a===-1?t.value=[...l].splice(0,10):t.value=b(l,a)}function b(e,a){const c=Math.max(0,a-5),_=Math.min(e.length,a+6);return e.slice(c,_)}const L=e=>{u("update:value",e),D()},w=()=>{u("update:value",o.value),u("change",o.value)};function D(){const a=f(s.name).find(c=>c.value===o.value);u("select",a)}return{data:t,modelValue:o,onSearch:d,onSelect:L,onChange:w}}const C=(l,t)=>t.label.includes(l);return(l,t)=>{const o=n.resolveComponent("a-select");return n.openBlock(),n.createBlock(o,{value:n.unref(i),"onUpdate:value":t[0]||(t[0]=d=>n.isRef(i)?i.value=d:null),"allow-clear":"","show-search":"",options:n.unref(h),placeholder:r.placeholder,disabled:r.disabled,"filter-option":C,onSelect:n.unref(p),onChange:n.unref(v)},null,8,["value","options","placeholder","disabled","onSelect","onChange"])}}});exports.default=y;

package/dist/cjs/hooks/http/index.cjs.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const n=require("vue"),q=require("vue-request"),z=require("../../utils/get.cjs.js"),f=(r,e={})=>{e.pagination||(e.pagination={currentKey:"page",pageSizeKey:"limit",totalKey:"data.total"});const{dataKey:i,pagination:{currentKey:l,pageSizeKey:c}}=e,a=e.params||n.ref({}),{total:s,pageSize:g,current:v,loading:d,data:p,run:u}=q.usePagination(r,{manual:!0,pagination:e.pagination,loadingDelay:400,loadingKeep:100,onSuccess:(t,o)=>{e.onSuccess&&e.onSuccess(t,o)},onError:(t,o)=>{console.log(o,t)}}),y=n.computed(()=>({total:s.value,current:v.value,pageSize:g.value})),S=n.computed(()=>z.get(p.value,i||"data",[])||[]),m=t=>{a.value[l]=t.page,a.value[c]=t.size,u(a.value||{})},K=t=>{a.value={...a.value,...t},a.value[l]=1,u(a.value||{})};return n.onMounted(()=>{e.manual&&u(a.value)}),{data:S,pagination:y,loading:d,run:u,onPageChange:m,onQuery:K}};exports.useRequestList=f;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const n=require("vue"),q=require("vue-request"),f=require("../../utils/get.cjs.js"),z=(i,e={})=>{e.pagination||(e.pagination={currentKey:"page",pageSizeKey:"limit",totalKey:"data.total"}),e.manual===void 0&&(e.manual=!0);const{dataKey:o,pagination:{currentKey:r,pageSizeKey:c}}=e,a=e.params||n.ref({}),{total:s,pageSize:g,current:v,loading:d,data:m,run:u}=q.usePagination(i,{manual:!0,pagination:e.pagination,loadingDelay:400,loadingKeep:100,onSuccess:(t,l)=>{e.onSuccess&&e.onSuccess(t,l)},onError:(t,l)=>{console.log(l,t)}}),y=n.computed(()=>({total:s.value,current:v.value,pageSize:g.value})),S=n.computed(()=>f.get(m.value,o||"data",[])||[]),p=t=>{a.value[r]=t.page,a.value[c]=t.size,u(a.value||{})},K=t=>{a.value={...a.value,...t},a.value[r]=1,u(a.value||{})};return n.onMounted(()=>{e.manual&&u(a.value)}),{data:S,pagination:y,loading:d,run:u,onPageChange:p,onQuery:K}};exports.useRequestList=z;

package/dist/esm/components/select/Select.vue.esm.js

@@ -1,9 +1,9 @@
-import { defineComponent as V, ref as p, watch as v, resolveComponent as y, openBlock as M, createBlock as O, unref as u, isRef as A } from "vue";
-import { useDataDicStore as H } from "../../store/modules/DataDictionary.esm.js";
-const I = {
+import { defineComponent as _, ref as p, watch as O, resolveComponent as V, openBlock as y, createBlock as M, unref as s, isRef as A } from "vue";
+import { useDataDicStore as F } from "../../store/modules/DataDictionary.esm.js";
+const H = {
   name: "DSelect"
-}, U = /* @__PURE__ */ V({
-  ...I,
+}, U = /* @__PURE__ */ _({
+  ...H,
   props: {
     value: { default: null },
     name: { default: "" },
@@ -12,67 +12,63 @@ const I = {
     include: { default: [] }
   },
   emits: ["update:value", "change", "select"],
-  setup(r, { emit: s }) {
-    const c = r, { getDicByKey: h } = H(), { modelValue: d, data: S, onSearch: m, onSelect: C, onChange: g } = L();
-    function L() {
-      const t = [...h(c.name)], n = p([]), l = p(c.value);
-      v(
-        () => c.include,
-        () => {
-          f(l.value);
-        }
-      ), v(
-        () => c.value,
+  setup(r, { emit: c }) {
+    const u = r, { getDicByKey: f } = F(), { modelValue: i, data: h, onSearch: I, onSelect: v, onChange: m } = C();
+    function C() {
+      const l = [...f(u.name)], n = p(l), t = p(u.value);
+      O(
+        () => u.value,
         (e) => {
-          l.value = e, w(e);
+          t.value = e, L(e);
         }
-      ), f(l.value);
-      const i = (e) => {
-        f(e);
+      );
+      const d = (e) => {
+        g(e);
       };
-      function f(e) {
-        e = e ?? "", n.value = t.filter((a) => a.value.toLowerCase().indexOf(e.toLowerCase()) !== -1 || a.label.toLowerCase().includes(e.toLowerCase())).splice(0, 10), n.value.length === 0 && (n.value = [...t].splice(0, 10));
+      function g(e) {
+        e = e ?? "", n.value = l.filter((a) => a.value.toLowerCase().indexOf(e.toLowerCase()) !== -1 || a.label.toLowerCase().includes(e.toLowerCase())).splice(0, 10), n.value.length === 0 && (n.value = [...l].splice(0, 10));
       }
-      function w(e) {
-        const a = t.findIndex((o) => o.value.toLowerCase().indexOf(e.toLowerCase()) !== -1 || o.label.toLowerCase().includes(e));
-        a === -1 ? n.value = [...t].splice(0, 10) : n.value = x(t, a);
+      function L(e) {
+        e = e || "";
+        const a = l.findIndex((o) => o.value.toLowerCase().indexOf(e.toLowerCase()) !== -1 || o.label.toLowerCase().includes(e));
+        a === -1 ? n.value = [...l].splice(0, 10) : n.value = b(l, a);
       }
-      function x(e, a) {
-        const o = Math.max(0, a - 5), _ = Math.min(e.length, a + 6);
-        return e.slice(o, _);
+      function b(e, a) {
+        const o = Math.max(0, a - 5), D = Math.min(e.length, a + 6);
+        return e.slice(o, D);
       }
-      const b = (e) => {
-        s("update:value", e), D();
-      }, B = () => {
-        s("update:value", l.value), s("change", l.value);
+      const w = (e) => {
+        c("update:value", e), B();
+      }, x = () => {
+        c("update:value", t.value), c("change", t.value);
       };
-      function D() {
-        const a = h(c.name).find((o) => o.value === l.value);
-        s("select", a);
+      function B() {
+        const a = f(u.name).find((o) => o.value === t.value);
+        c("select", a);
       }
       return {
         data: n,
-        modelValue: l,
-        onSearch: i,
-        onSelect: b,
-        onChange: B
+        modelValue: t,
+        onSearch: d,
+        onSelect: w,
+        onChange: x
       };
     }
-    return (t, n) => {
-      const l = y("a-select");
-      return M(), O(l, {
-        value: u(d),
-        "onUpdate:value": n[0] || (n[0] = (i) => A(d) ? d.value = i : null),
+    const S = (l, n) => n.label.includes(l);
+    return (l, n) => {
+      const t = V("a-select");
+      return y(), M(t, {
+        value: s(i),
+        "onUpdate:value": n[0] || (n[0] = (d) => A(i) ? i.value = d : null),
         "allow-clear": "",
         "show-search": "",
-        "filter-option": !1,
-        options: u(S),
+        options: s(h),
         placeholder: r.placeholder,
         disabled: r.disabled,
-        onSelect: u(C),
-        onSearch: u(m),
-        onChange: u(g)
-      }, null, 8, ["value", "options", "placeholder", "disabled", "onSelect", "onSearch", "onChange"]);
+        "filter-option": S,
+        onSelect: s(v),
+        onChange: s(m)
+      }, null, 8, ["value", "options", "placeholder", "disabled", "onSelect", "onChange"]);
     };
   }
 });

package/dist/esm/hooks/http/index.esm.js

@@ -1,23 +1,23 @@
-import { ref as f, computed as l, onMounted as z } from "vue";
+import { ref as S, computed as r, onMounted as z } from "vue";
 import { usePagination as D } from "vue-request";
 import { get as P } from "../../utils/get.esm.js";
-const C = (r, a = {}) => {
+const C = (o, a = {}) => {
   a.pagination || (a.pagination = {
     currentKey: "page",
     pageSizeKey: "limit",
     totalKey: "data.total"
-  });
+  }), a.manual === void 0 && (a.manual = !0);
   const {
     dataKey: i,
-    pagination: { currentKey: o, pageSizeKey: c }
-  } = a, e = a.params || f({}), {
+    pagination: { currentKey: l, pageSizeKey: c }
+  } = a, e = a.params || S({}), {
     total: g,
-    pageSize: s,
-    current: v,
-    loading: m,
-    data: p,
+    pageSize: m,
+    current: s,
+    loading: v,
+    data: d,
     run: n
-  } = D(r, {
+  } = D(o, {
     manual: !0,
     pagination: a.pagination,
     loadingDelay: 400,
@@ -28,26 +28,26 @@ const C = (r, a = {}) => {
     onError: (t, u) => {
       console.log(u, t);
     }
-  }), d = l(() => ({
+  }), p = r(() => ({
     total: g.value,
-    current: v.value,
-    pageSize: s.value
-  })), y = l(
-    () => P(p.value, i || "data", []) || []
-  ), K = (t) => {
-    e.value[o] = t.page, e.value[c] = t.size, n(e.value || {});
-  }, S = (t) => {
-    e.value = { ...e.value, ...t }, e.value[o] = 1, n(e.value || {});
+    current: s.value,
+    pageSize: m.value
+  })), y = r(
+    () => P(d.value, i || "data", []) || []
+  ), f = (t) => {
+    e.value[l] = t.page, e.value[c] = t.size, n(e.value || {});
+  }, K = (t) => {
+    e.value = { ...e.value, ...t }, e.value[l] = 1, n(e.value || {});
   };
   return z(() => {
     a.manual && n(e.value);
   }), {
     data: y,
-    pagination: d,
-    loading: m,
+    pagination: p,
+    loading: v,
     run: n,
-    onPageChange: K,
-    onQuery: S
+    onPageChange: f,
+    onQuery: K
   };
 };
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditari/bsui",
-  "version": "1.0.63",
+  "version": "1.0.65",
   "files": [
     "dist/**",
     "src"

package/src/components/select/Select.vue

@@ -37,38 +37,12 @@ const { getDicByKey } = useDataDicStore();
 const { modelValue, data, onSearch, onSelect, onChange } = useSelect();
 
 function useSelect() {
-  // 保存worker启动状态
-  // let workerStatus = true;
+  // 字典数据
   const dicData: any[] = [...getDicByKey(props.name)];
-  const data = ref<any>([]);
+  const data = ref<any>(dicData);
   // 取值
   const modelValue = ref(props.value);
 
-  /**
-   * web worker 启动失败
-   */
-  // workerInstance.onerror = () => {
-  //   workerStatus = false;
-  //   // 启动失败使用store
-  //   dicData = getDicByKey(props.name);
-  // };
-  /**
-   * 监听web worker发送的数据
-   * @param e
-   */
-  // workerInstance.onmessage = (e: any) => {
-  //   // 赋值给下拉选择数据变量
-  //   data.value = e.data;
-  // };
-
-  // 当include变化的时候，需要重新发送搜索事件 返回对应的下拉数据
-  watch(
-    () => props.include,
-    () => {
-      sendWorkerSearch(modelValue.value);
-    }
-  );
-
   // 监听value值的变化
   watch(
     () => props.value,
@@ -78,8 +52,7 @@ function useSelect() {
     }
   );
 
-  // 首次创建的时候发送
-  sendWorkerSearch(modelValue.value);
+  //initSearch(modelValue.value);
 
   //监听用户搜索事件
   const onSearch = (keywords: string) => {
@@ -107,6 +80,7 @@ function useSelect() {
    * @param val
    */
   function initSearch(val: any) {
+    val = val || "";
     const index = dicData.findIndex((item: any) => {
       return (
         item.value.toLowerCase().indexOf(val.toLowerCase()) !== -1 ||
@@ -159,6 +133,15 @@ function useSelect() {
     onChange
   };
 }
+
+/**
+ * 过滤筛选
+ * @param inputValue
+ * @param options
+ */
+const onFilterOption = (inputValue: any, options: any) => {
+  return options.label.includes(inputValue);
+};
 </script>
 <script lang="ts">
 export default {
@@ -170,12 +153,11 @@ export default {
     v-model:value="modelValue"
     allow-clear
     show-search
-    :filter-option="false"
     :options="data"
     :placeholder="placeholder"
     :disabled="disabled"
+    :filter-option="onFilterOption"
     @select="onSelect"
-    @search="onSearch"
     @change="onChange"
   >
   </a-select>

package/src/hooks/http/index.ts

@@ -29,7 +29,9 @@ const useRequestList = (service: any, options: Options = {}) => {
       totalKey: "data.total"
     };
   }
-
+  if (options.manual === undefined) {
+    options.manual = true;
+  }
   const {
     dataKey,
     pagination: { currentKey, pageSizeKey }