ct-component-plus 0.0.11 → 0.0.13

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ct-component-plus",
   "private": false,
-  "version": "0.0.11",
+  "version": "0.0.13",
   "type": "module",
   "main": "packages/components/index.js",
   "files": [

package/packages/components/cascader/src/cascader.vue

@@ -12,6 +12,7 @@
     :show-all-levels="showAllLevels"
     :filterable="filterable"
     :clearable="clearable"
+    :disabled="disabled"
     :popper-class="popperClassShow"
     v-bind="{ ...$attrs, ...rawAttr }"
   />

package/packages/components/index.js

@@ -57,6 +57,7 @@ const install = function (app, options) {
   app.use(cingtaIcon)
   let serviceOptions = {}
   if (isObject(options)) {
+    const { tableEmptyDom } = options;
     if (!options.baseDao) {
       console.warn('当前使用的组件库没有配置baseDao')
     } else {
@@ -64,6 +65,7 @@ const install = function (app, options) {
     }
     if (isObject(options.serviceOptions)) serviceOptions = options.serviceOptions;
     if (isObject(options.searchBoxComponent)) app.provide('$userDefinedSearchComponent', options.searchBoxComponent)
+    if (isObject(tableEmptyDom)) app.provide('$tableEmptyDom', tableEmptyDom)
   }
   app.provide('$ctServiceConfig', { ...serviceConfig, ...serviceOptions })
 }

package/packages/components/search-box/src/search-box.vue

@@ -124,13 +124,15 @@ const getComponentProps = (item) => {
     param: item.param,
     label: item.label,
     options: item.list,
-    placeholder: item.placeholder,
     multiple: item.multiple,
+    api: item.api,
+    placeholder: item.placeholder,
     clearable: item.clearable,
     disabled: item.disabled,
     range: item.range,
     mapObj: item.mapObj,
     name: item.param, //用作插槽名
+    rawAttr: item.rawAttr,
 
     ["on" + bpKey]: handleBuriedParams,
   };

package/packages/components/select/src/select.vue

@@ -78,13 +78,13 @@ const serviceConfig = inject("$ctServiceConfig");
 const props = defineProps(selectProps);
 const emit = defineEmits(selectEmits);
 
-const getBuriedContent = () => {
-  const select = selectObj.value;
-  if (isArray(select)) {
-    return select.map((item) => item.label);
-  }
-  return select.label;
-};
+// const getBuriedContent = () => {
+//   const select = selectObj.value;
+//   if (isArray(select)) {
+//     return select.map((item) => item.label);
+//   }
+//   return select.label;
+// };
 const ns = useNamespace("select");
 const optionsByApi = ref([]);
 const showOptions = computed(() => {
@@ -107,12 +107,21 @@ const selectLength = computed(() => {
 });
 const filterOptions = ref([]);
 const noFilterOptions = ref(false);
-const selectObj = computed(() => {
-  if (!props.multiple)
-    return showOptions.value.find((item) => item.value === valueModel.value);
-  return showOptions.value.filter((item) => {
-    return valueModel.value.includes(item.value);
-  });
+const selectObj = computed({
+  get() {
+    if (!props.multiple)
+      return showOptions.value.find((item) => item.value === valueModel.value);
+    return showOptions.value.filter((item) => {
+      return valueModel.value.includes(item.value);
+    });
+  },
+  set(newValue) {
+    if (!props.multiple) {
+      valueModel.value = newValue.value;
+    } else {
+      valueModel.value = newValue.map((item) => item.value);
+    }
+  },
 });
 const selectText = computed(() => {
   if (!props.multiple) return "";

package/packages/components/table/src/index.js

@@ -43,5 +43,9 @@ export const tableProps = {
   },
   pagination: {
     type: [Number, String],
-  }
+  },
+  emptyText: {
+    type: String,
+    default: "暂无数据",
+  },
 }

package/packages/components/table/src/table.vue

@@ -75,6 +75,16 @@
             </el-table-column>
           </template>
         </el-table-column>
+        <template #empty>
+          <slot name="empty">
+            <component
+              :is="tableEmptyDom"
+              v-if="tableEmptyDom"
+              :text="emptyText"
+            ></component>
+            <span v-else>{{ emptyText }}</span>
+          </slot>
+        </template>
       </el-table>
       <ct-pagination
         :class="ns.e('pagination')"
@@ -92,21 +102,14 @@
 </template>
 
 <script setup>
-import {
-  computed,
-  defineAsyncComponent,
-  nextTick,
-  onMounted,
-  reactive,
-  ref,
-  watch,
-} from "vue";
+import { computed, inject, onMounted, ref, watch } from "vue";
 import { useNamespace } from "../../../hooks";
 import { copyObj } from "../../../utils";
 import { tableEmits, tableProps } from "./index";
 import TableSort from "./TableSort.vue";
 const props = defineProps(tableProps);
 const emit = defineEmits(tableEmits);
+const tableEmptyDom = inject("$tableEmptyDom");
 
 const ns = useNamespace("table");
 const tableRef = ref(null);