@wzyjs/next 0.2.62 → 0.2.64

package/dist/Base.zmodel

@@ -7,7 +7,7 @@ generator json {
 }
 
 datasource db {
-  provider = "mysql"
+  provider = "postgresql"
   url      = env("DATABASE_URL")
 }
 

package/dist/plugin/crud/useHabitGroupCRUD.ts

@@ -1,5 +1,3 @@
-import React, { useState } from 'react'
-
 // @ts-ignore
 import { message } from '@/components'
 
@@ -29,6 +27,7 @@ interface Option<TList extends FindManyArgs = FindManyArgs, TInfo extends FindUn
     query: SelectSubset<TInfo, FindUniqueArgs>
     option?: UseOptions<GetPayload<TInfo> | null>
   }
+  allTags?: true
   create?: Parameters<typeof api.habitGroup.create.useMutation>[0]
   update?: Parameters<typeof api.habitGroup.update.useMutation>[0]
   remove?: Parameters<typeof api.habitGroup.update.useMutation>[0]
@@ -42,11 +41,13 @@ const r = (q: any) => {
   const query = JSON.parse(JSON.stringify(q))
   delete query?.skip
   delete query?.take
+  delete query?.include
+  delete query?.select
   return query
 }
 
 export const useHabitGroupCRUD = <TList extends FindManyArgs = FindManyArgs, TInfo extends FindUniqueArgs = FindUniqueArgs>(option: Option<TList, TInfo> = {}) => {
-  const { list, info, create, update, remove, delete: deleteOption, showTip = true } = option
+  const { list, info, create, update, remove, allTags = false, delete: deleteOption, showTip = true } = option
 
   const apiUtils = api.useUtils()
 
@@ -65,6 +66,10 @@ export const useHabitGroupCRUD = <TList extends FindManyArgs = FindManyArgs, TIn
     ...(info ? info.option : undefined),
   })
 
+  const allTagsState = api.habitGroup.getAllTags.useQuery(undefined, {
+    enabled: allTags,
+  })
+
   const onSuccess = (tip: string) => {
     message.destroy()
     if (showTip) {
@@ -172,15 +177,17 @@ export const useHabitGroupCRUD = <TList extends FindManyArgs = FindManyArgs, TIn
     },
   }
 
-  const [query, setQuery] = useState()
-
   return {
     listState,
     countState,
+
     infoState,
+
+    allTagsState,
+
     createState,
-    removeState,
     updateState,
+    removeState,
     deleteState,
 
     apiUtils,

package/dist/plugin/tags/index.js

@@ -43,9 +43,10 @@ var generateTags = function (model, outputPath) { return __awaiter(void 0, void
     var dataModels, modelsWithTags, _i, modelsWithTags_1, dataModel, modelName, routerFilePath, fileContent, getAllTagsInterface, lastCommaIndex, closingBraceIndex, beforeInsertion, afterInsertion, newContent;
     return __generator(this, function (_a) {
         dataModels = model.declarations.filter(function (item) { return item.$type === 'DataModel'; });
-        modelsWithTags = dataModels.filter(function (dataModel) {
-            return dataModel.fields.some(function (field) { return field.name === 'tags'; });
-        });
+        modelsWithTags = dataModels;
+        // .filter(dataModel => {
+        //   return dataModel.fields.some(field => field.name === 'tags')
+        // })
         if (modelsWithTags.length === 0) {
             return [2 /*return*/];
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wzyjs/next",
-  "version": "0.2.62",
+  "version": "0.2.64",
   "description": "description",
   "author": "wzy",
   "main": "dist/index.js",
@@ -17,7 +17,7 @@
   "dependencies": {
     "@zenstackhq/sdk": "^2.12.3"
   },
-  "gitHead": "d9493fc26e494769edcb3aab4d193e5d7ab68bc1",
+  "gitHead": "b04da8a500c4be43d8264efe4e904f954fe1bb82",
   "publishConfig": {
     "access": "public"
   }