@scx-js/scx-admin 0.0.7 → 0.0.9

package/components/easy-ckeditor/default-editor-config.js

@@ -194,6 +194,7 @@ const defaultEditorConfig = {
         ],
     },
     translations: [zhCNTranslations],
+    licenseKey: "GPL",
 };
 
 export {defaultEditorConfig};

package/components/easy-form-item/index.vue

@@ -6,7 +6,7 @@
 
 <script>
 import {computed} from "vue";
-import {notBlank} from "@scx-js/scx-common";
+import {notBlank, randomUUID} from "@scx-js/scx-common";
 import {checkIDCard, checkPhoneNumber, useCrudContext,} from "../../index.js";
 
 export default {
@@ -61,7 +61,7 @@ export default {
 
         const crudContext = useCrudContext();
 
-        const easyProp = computed(() => props.prop ? props.prop : getUUID());
+        const easyProp = computed(() => props.prop ? props.prop : randomUUID());
 
         const easyLabel = computed(() => {
             if (props.label) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scx-js/scx-admin",
-  "version": "0.0.7",
+  "version": "0.0.9",
   "description": "SCX Admin",
   "license": "MIT",
   "author": "scx567888",
@@ -17,13 +17,14 @@
   },
   "dependencies": {
     "@ckeditor/ckeditor5-vue": "^7.0.0",
-    "@scx-js/scx-app-x": "0.0.7",
-    "@scx-js/scx-common": "0.0.7",
-    "@scx-js/scx-dom": "0.0.7",
-    "@scx-js/scx-http": "0.0.7",
+    "@scx-js/scx-app-x": "0.0.9",
+    "@scx-js/scx-common": "0.0.9",
+    "@scx-js/scx-dom": "0.0.9",
+    "@scx-js/scx-http": "0.0.9",
     "ckeditor5": "^44.0.0",
     "element-plus": "^2.9.3",
     "lodash-es": "^4.17.21",
+    "monaco-editor": "^0.52.2",
     "nprogress": "^0.2.0",
     "vue": "^3.0.0"
   },

package/scx/crud-context.js

@@ -150,12 +150,17 @@ class CrudContext {
                     baseCrudApi,
                     defaultTemp = {},
                     defaultWhere = {},
+                    scxCrud = null,
                 } = {}) {
         this.req = useScxReq();
         this.userInfo = useScxUserInfo();
         this.defaultTemp = defaultTemp;
         this.defaultWhere = defaultWhere;
-        this.scxCrud = new ScxCrud(this.req, baseCrudApi);
+        if (scxCrud) {
+            this.scxCrud = scxCrud;
+        } else {
+            this.scxCrud = new ScxCrud(this.req, baseCrudApi);
+        }
 
         //重置全部对象
         this.resetPagination();
@@ -246,7 +251,9 @@ class CrudContext {
         q.offset((this.pagination.currentPage - 1) * this.pagination.pageSize);
 
         //2, 设置 orderBy
-        q.orderBy(new OrderBy(this.orderBy.fieldName, this.orderBy.sortType));
+        if (this.orderBy.sortType) {
+            q.orderBy(new OrderBy(this.orderBy.fieldName, this.orderBy.sortType));
+        }
 
         //3, 设置 where