🔱: [client] sync upgrade with 5 commits [trident-sync]

chore: 1.14.0
chore: 1
feat: crudBinding.value.table.columns由array改成map
chore: 1

packages/ui/certd-client/src/views/crud/basis/columns-set/crud.tsx

@@ -42,14 +42,14 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti
           toggleColumnSetShow: {
             text: "切换列设置项显隐",
             click() {
-              crudBinding.value.toolbar.columnsFilter.originalColumns[3].columnSetShow = !crudBinding.value.toolbar.columnsFilter.originalColumns[3].columnSetShow;
+              crudBinding.value.toolbar.columnsFilter.originalColumns.hidden.columnSetShow = !crudBinding.value.toolbar.columnsFilter.originalColumns.hidden.columnSetShow;
               message.info("切换第4列的列设置显隐");
             }
           },
           toggleColumnSetDisabled: {
             text: "切换列设置项禁用",
             click() {
-              crudBinding.value.toolbar.columnsFilter.originalColumns[2].columnSetDisabled = !crudBinding.value.toolbar.columnsFilter.originalColumns[2].columnSetDisabled;
+              crudBinding.value.toolbar.columnsFilter.originalColumns.disabled.columnSetDisabled = !crudBinding.value.toolbar.columnsFilter.originalColumns.disabled.columnSetDisabled;
               message.info("切换第3列的列设置禁用启用");
             }
           },

packages/ui/certd-client/src/views/crud/basis/columns-set/index.vue

@@ -35,7 +35,7 @@ export default defineComponent({
     }
 
     function columnsSetShowToggle() {
-      crudBinding.value.table.columns[3].columnSetShow = !crudBinding.value.table.columns[3].columnSetShow;
+      crudBinding.value.table.columns.disabled.columnSetShow = !crudBinding.value.table.columns.disabled.columnSetShow;
     }
     return {
       crudBinding,

packages/ui/certd-client/src/views/crud/basis/compute/crud.tsx

@@ -2,10 +2,10 @@ import * as api from "./api";
 import { requestForMock } from "/src/api/service";
 import { AddReq, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, EditReq, GetContextFn, ScopeContext, useCompute, UserPageQuery, UserPageRes } from "@fast-crud/fast-crud";
 import { message } from "ant-design-vue";
-import { computed, ref } from "vue";
+import { computed } from "vue";
 
 const { asyncCompute, compute } = useCompute();
-export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOptionsRet {
+export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
   const pageRequest = async (query: UserPageQuery): Promise<UserPageRes> => {
     return await api.GetList(query);
   };
@@ -21,24 +21,9 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti
     return await api.AddObj(form);
   };
 
-  //普通的ref引用，可以动态切换配置
-  const showRef = ref(false);
-  const showTableRef = ref(true);
-  const showTableComputed = computed(() => {
-    return showTableRef.value;
-  });
-
-  const columnComponentShowRef = ref(true);
-  const columnComponentShowComputed = computed(() => {
-    return columnComponentShowRef.value;
-  });
+  const { showRef, showTableComputed, columnComponentShowComputed } = context;
 
   return {
-    output: {
-      showRef,
-      showTableRef,
-      columnComponentShowRef
-    },
     crudOptions: {
       request: {
         pageRequest,

packages/ui/certd-client/src/views/crud/basis/compute/index.vue

@@ -15,6 +15,7 @@
           <span class="ml-1">表格显隐:<a-switch v-model:checked="showTableRef"></a-switch></span>
         </a-tooltip>
         <span class="ml-1">列显隐:<a-switch v-model:checked="columnComponentShowRef"></a-switch></span>
+        <span class="ml-1">列显隐2:<a-button @click="columnsMapSetShow">列显隐2</a-button></span>
         <a-alert class="ml-1" type="info" message="点击下方右边的编辑按钮查看示例效果-----------> ↓↓↓↓↓" />
       </template>
       <template #form_refSwitch>
@@ -25,15 +26,37 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, onMounted } from "vue";
+import { computed, defineComponent, onMounted, ref } from "vue";
 import { useFs } from "@fast-crud/fast-crud";
 import createCrudOptions from "./crud";
 
 export default defineComponent({
   name: "BasisCompute",
   setup() {
-    const { crudBinding, crudRef, crudExpose, output } = useFs({ createCrudOptions });
+    //普通的ref引用，可以动态切换配置
+    const showRef = ref(false);
+    const showTableRef = ref(true);
+    const showTableComputed = computed(() => {
+      return showTableRef.value;
+    });
 
+    const columnComponentShowRef = ref(true);
+    const columnComponentShowComputed = computed(() => {
+      return columnComponentShowRef.value;
+    });
+
+    const context = {
+      showRef,
+      showTableRef,
+      showTableComputed,
+      columnComponentShowRef,
+      columnComponentShowComputed
+    };
+
+    const { crudBinding, crudRef, crudExpose } = useFs({ createCrudOptions, context });
+    function columnsMapSetShow() {
+      crudBinding.value.table.columnsMap["id"].show = !crudBinding.value.table.columnsMap["id"].show;
+    }
     // 页面打开后获取列表数据
     onMounted(() => {
       crudExpose.doRefresh();
@@ -42,7 +65,8 @@ export default defineComponent({
     return {
       crudBinding,
       crudRef,
-      ...output
+      ...context,
+      columnsMapSetShow
     };
   }
 });