ct-component-plus 0.0.38 → 0.0.40

package/package.json

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

package/packages/components/checkbox/src/checkbox.vue

@@ -5,9 +5,13 @@
       v-for="item in optionList"
       :key="item.value"
       :label="item.value"
-      :disabled="item.disabled"
-      >{{ item.label }}</el-checkbox
-    >
+      :disabled="item.disabled">
+      <template #default>
+        <slot v-bind="item">
+          {{ item.label }}
+        </slot>
+      </template>
+    </el-checkbox>
   </el-checkbox-group>
 </template>
 
@@ -44,5 +48,4 @@ defineExpose({
 });
 onMounted(() => {});
 </script>
-<style lang='less'>
-</style>
+<style lang="less"></style>

package/packages/components/index.js

@@ -61,12 +61,13 @@ const install = function (app, options) {
   app.use(cingtaIcon)
   let serviceOptions = {}
   if (isObject(options)) {
-    const { tableEmptyDom } = options;
+    const { tableEmptyDom, selectTooltip = false } = options;
     if (!options.baseDao) {
       console.warn('当前使用的组件库没有配置baseDao')
     } else {
       app.provide('$ctBaseDao', options.baseDao)
     }
+    app.provide('$selectTooltip', selectTooltip)
     if (isObject(options.serviceOptions)) serviceOptions = options.serviceOptions;
     if (isObject(options.searchBoxComponent)) app.provide('$userDefinedSearchComponent', options.searchBoxComponent)
     if (isObject(tableEmptyDom)) app.provide('$tableEmptyDom', tableEmptyDom)

package/packages/components/page/src/modules/TableTitle.vue

@@ -5,8 +5,7 @@
         <slot name="table-title">
           <ct-icon
             :class="[ns.e('total-icon')]"
-            name="content-search_line"
-          ></ct-icon>
+            name="content-search_line"></ct-icon>
           <span>查询结果：</span>
           <span>共{{ total }}条记录</span>
           <span>，每页显示{{ pageSize }}条</span>
@@ -21,15 +20,13 @@
               :class="[ns.e('handle-item'), ns.is(item, true)]"
               v-for="(item, index) in handleList"
               :key="index"
-              v-show="handleItemShow(item)"
-            >
+              v-show="handleItemShow(item)">
               <component
                 v-if="handleItemShow(item)"
                 :is="getHandleComponent(item)"
                 v-bind="handleOptionsBind(item)"
                 v-model:sortObj="modelSort"
-                @download="download"
-              />
+                @download="download" />
             </div>
           </div>
           <slot name="table-handle-after"></slot>
@@ -103,7 +100,7 @@ const handleItemShow = (item) => {
 };
 onMounted(() => {});
 </script>
-<style lang='less' scoped>
+<style lang="less" scoped>
 .ct-page-table-title {
   &__container {
     display: flex;
@@ -120,6 +117,11 @@ onMounted(() => {});
   &__total-icon {
     margin-right: 8px;
   }
+  &__right {
+    display: flex;
+    align-items: center;
+    justify-content: flex-end;
+  }
   &__handle {
     display: flex;
     align-items: center;
@@ -146,4 +148,4 @@ onMounted(() => {});
     }
   }
 }
-</style>
+</style>

package/packages/components/page/src/page.vue

@@ -346,6 +346,7 @@ export default {
                       ),
                 ]),
           ]),
+          slots.default ? slots.default() : null,
         ]),
       ]);
   },

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

@@ -53,7 +53,9 @@
           :value="item.value"
           :disabled="item.disabled">
           <slot name="option" :item="item" :index="index">
-            <span>{{ item.label }}</span>
+            <span :title="selectTooltip ? item.label : undefined">{{
+              item.label
+            }}</span>
           </slot>
         </el-option>
       </slot>
@@ -75,6 +77,7 @@ import { isFunction, isArray } from "../../../utils";
 import Empty from "./empty.vue";
 const baseDao = inject("$ctBaseDao");
 const serviceConfig = inject("$ctServiceConfig");
+const selectTooltip = inject("$selectTooltip");
 
 const props = defineProps(selectProps);
 const emit = defineEmits(selectEmits);
@@ -186,7 +189,6 @@ const watchServiceHandle = async () => {
         if (paramsHandle === false) return;
         params = paramsHandle || params;
       }
-      console.log("method", method, props.api);
       baseDao[method](props.api, params).then((res) => {
         const mapObj = props.mapObj || {};
         const { list, label = "label", value = "value", self } = mapObj;

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

@@ -41,7 +41,7 @@ export const tableProps = {
     }
   },
   teleportDom: {
-    type: [String, Node],
+    type: [String, Object],
   },
   defaultSort: {
     type: Object,
@@ -57,4 +57,6 @@ export const tableProps = {
     default: "暂无数据",
   },
   mergeList: Array,
+  alignLeftKeys: Array,
+  alignRightKeys: Array,
 }

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

@@ -14,7 +14,8 @@
           type="selection"
           width="88"
           v-bind="multiSelectAttr"
-          :reserve-selection="true"></el-table-column>
+          :reserve-selection="true">
+        </el-table-column>
         <el-table-column
           v-for="(column, index) in columnData"
           :key="column.value + '-' + column.label"
@@ -24,7 +25,7 @@
           :min-width="judgeMinWidth(column, index)"
           :sort-orders="['ascending', 'descending']"
           :sortable="column.sortable ? 'custom' : false"
-          :align="column.align || 'center'"
+          :align="getColumnAlign(column)"
           :fixed="column.fixed || false"
           show-overflow-tooltip
           v-bind="column.rawAttr || {}">
@@ -54,7 +55,7 @@
               :min-width="judgeMinWidth(column1, index)"
               :sort-orders="['ascending', 'descending']"
               :sortable="column1.sortable ? 'custom' : false"
-              :align="column1.align || 'center'"
+              :align="getColumnAlign(column1)"
               :fixed="column1.fixed || false"
               show-overflow-tooltip
               v-bind="column1.rawAttr || {}">
@@ -136,6 +137,18 @@ const showData = computed(() => {
 const columnData = computed(() => {
   return props.tableProps.columnData || [];
 });
+const getColumnAlign = (column) => {
+  if (column.align) {
+    return column.align;
+  }
+  if (props.alignLeftKeys && props.alignLeftKeys.includes(column.value)) {
+    return "left";
+  }
+  if (props.alignRightKeys && props.alignRightKeys.includes(column.value)) {
+    return "right";
+  }
+  return "center";
+};
 const judgeWidth = (column, index) => {
   // 判断处理column的width
   const columnWidth = props.columnWidth;