widget.qw 1.0.45 → 1.0.46

package/build/style.css

@@ -840,13 +840,13 @@
 }
 .widget .readonly-field[data-v-0c8e09c0] {
   margin: 4px 0;
-}.widget[data-v-39b86a7f] {
+}.widget[data-v-756f99e9] {
   background: #fff;
   box-sizing: border-box;
   height: 100%;
   text-align: left;
 }
-.widget .option[data-v-39b86a7f] {
+.widget .option[data-v-756f99e9] {
   margin: 8px 8px;
   padding: 5px 5px;
   border-radius: 4px;
@@ -855,6 +855,6 @@
   display: inline-block;
   position: relative;
 }
-[data-v-39b86a7f] .van-field__label {
+[data-v-756f99e9] .van-field__label {
   margin: auto;
 }

package/build/widget.qw.es.js

@@ -20880,7 +20880,7 @@ const _sfc_main$1 = {
   }
 };
 var SingleApiPicker = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-0c8e09c0"]]);
-var ObjsEditor_vue_vue_type_style_index_0_scoped_true_lang = /* @__PURE__ */ (() => ".widget[data-v-39b86a7f] {\n  background: #fff;\n  box-sizing: border-box;\n  height: 100%;\n  text-align: left;\n}\n.widget .option[data-v-39b86a7f] {\n  margin: 8px 8px;\n  padding: 5px 5px;\n  border-radius: 4px;\n  background-color: rgb(217, 236, 255);\n  color: #409eff;\n  display: inline-block;\n  position: relative;\n}\n[data-v-39b86a7f] .van-field__label {\n  margin: auto;\n}")();
+var ObjsEditor_vue_vue_type_style_index_0_scoped_true_lang = /* @__PURE__ */ (() => ".widget[data-v-756f99e9] {\n  background: #fff;\n  box-sizing: border-box;\n  height: 100%;\n  text-align: left;\n}\n.widget .option[data-v-756f99e9] {\n  margin: 8px 8px;\n  padding: 5px 5px;\n  border-radius: 4px;\n  background-color: rgb(217, 236, 255);\n  color: #409eff;\n  display: inline-block;\n  position: relative;\n}\n[data-v-756f99e9] .van-field__label {\n  margin: auto;\n}")();
 const _hoisted_1 = {
   class: "widget"
 };
@@ -20984,12 +20984,22 @@ const _sfc_main = {
         let formatValues = v.map((e) => {
           let kvs = Object.keys(e).map((k) => {
             var _a2, _b2, _c2, _d2;
+            console.log("1111111");
+            console.log(props.schema[key]);
+            console.log(key);
+            console.log(v);
+            console.log(k);
             let label = props.schema[key].schema[k].label;
             let formatValue = e[k];
             if ((_b2 = (_a2 = props.schema[key].schema[k]) == null ? void 0 : _a2.schema) == null ? void 0 : _b2.options) {
               let one = (_d2 = (_c2 = props.schema[key].schema[k]) == null ? void 0 : _c2.schema) == null ? void 0 : _d2.options.find((item2) => item2[Object.keys(item2)[1]] === formatValue);
-              formatValue = one[Object.keys(one)[0]];
+              if (one)
+                formatValue = one[Object.keys(one)[0]];
+              else
+                formatValue = "";
             }
+            if (typeof formatValue === "boolean")
+              formatValue = formatValue ? "\u662F" : "\u5426";
             return `${label}:${formatValue}`;
           });
           return kvs.join(",");
@@ -20997,7 +21007,7 @@ const _sfc_main = {
         return formatValues.join(" > ");
       } else if ((_b = (_a = props.schema[key]) == null ? void 0 : _a.schema) == null ? void 0 : _b.options) {
         let one = (_d = (_c = props.schema[key]) == null ? void 0 : _c.schema) == null ? void 0 : _d.options.find((item2) => item2[Object.keys(item2)[1]] === v);
-        return one[Object.keys(one)[0]];
+        return one ? one[Object.keys(one)[0]] : "";
       } else {
         return v;
       }
@@ -21165,7 +21175,7 @@ const _sfc_main = {
     };
   }
 };
-var ObjsEditor = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-39b86a7f"]]);
+var ObjsEditor = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-756f99e9"]]);
 const secret_notify = () => {
   showNotify({ type: "danger", message: "\u4E25\u683C\u6267\u884C\u4FE1\u606F\u4FDD\u5BC6\u8981\u6C42\uFF0C\u5207\u5B9E\u9632\u8303\u4F01\u4E1A\u6CC4\u5BC6\u98CE\u9669", duration: 3e3 });
 };

package/build/widget.qw.umd.js

@@ -20883,7 +20883,7 @@ var __async = (__this, __arguments, generator) => {
     }
   };
   var SingleApiPicker = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-0c8e09c0"]]);
-  var ObjsEditor_vue_vue_type_style_index_0_scoped_true_lang = /* @__PURE__ */ (() => ".widget[data-v-39b86a7f] {\n  background: #fff;\n  box-sizing: border-box;\n  height: 100%;\n  text-align: left;\n}\n.widget .option[data-v-39b86a7f] {\n  margin: 8px 8px;\n  padding: 5px 5px;\n  border-radius: 4px;\n  background-color: rgb(217, 236, 255);\n  color: #409eff;\n  display: inline-block;\n  position: relative;\n}\n[data-v-39b86a7f] .van-field__label {\n  margin: auto;\n}")();
+  var ObjsEditor_vue_vue_type_style_index_0_scoped_true_lang = /* @__PURE__ */ (() => ".widget[data-v-756f99e9] {\n  background: #fff;\n  box-sizing: border-box;\n  height: 100%;\n  text-align: left;\n}\n.widget .option[data-v-756f99e9] {\n  margin: 8px 8px;\n  padding: 5px 5px;\n  border-radius: 4px;\n  background-color: rgb(217, 236, 255);\n  color: #409eff;\n  display: inline-block;\n  position: relative;\n}\n[data-v-756f99e9] .van-field__label {\n  margin: auto;\n}")();
   const _hoisted_1 = {
     class: "widget"
   };
@@ -20987,12 +20987,22 @@ var __async = (__this, __arguments, generator) => {
           let formatValues = v.map((e) => {
             let kvs = Object.keys(e).map((k) => {
               var _a2, _b2, _c2, _d2;
+              console.log("1111111");
+              console.log(props.schema[key]);
+              console.log(key);
+              console.log(v);
+              console.log(k);
               let label = props.schema[key].schema[k].label;
               let formatValue = e[k];
               if ((_b2 = (_a2 = props.schema[key].schema[k]) == null ? void 0 : _a2.schema) == null ? void 0 : _b2.options) {
                 let one = (_d2 = (_c2 = props.schema[key].schema[k]) == null ? void 0 : _c2.schema) == null ? void 0 : _d2.options.find((item2) => item2[Object.keys(item2)[1]] === formatValue);
-                formatValue = one[Object.keys(one)[0]];
+                if (one)
+                  formatValue = one[Object.keys(one)[0]];
+                else
+                  formatValue = "";
               }
+              if (typeof formatValue === "boolean")
+                formatValue = formatValue ? "\u662F" : "\u5426";
               return `${label}:${formatValue}`;
             });
             return kvs.join(",");
@@ -21000,7 +21010,7 @@ var __async = (__this, __arguments, generator) => {
           return formatValues.join(" > ");
         } else if ((_b = (_a = props.schema[key]) == null ? void 0 : _a.schema) == null ? void 0 : _b.options) {
           let one = (_d = (_c = props.schema[key]) == null ? void 0 : _c.schema) == null ? void 0 : _d.options.find((item2) => item2[Object.keys(item2)[1]] === v);
-          return one[Object.keys(one)[0]];
+          return one ? one[Object.keys(one)[0]] : "";
         } else {
           return v;
         }
@@ -21168,7 +21178,7 @@ var __async = (__this, __arguments, generator) => {
       };
     }
   };
-  var ObjsEditor = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-39b86a7f"]]);
+  var ObjsEditor = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-756f99e9"]]);
   const secret_notify = () => {
     showNotify({ type: "danger", message: "\u4E25\u683C\u6267\u884C\u4FE1\u606F\u4FDD\u5BC6\u8981\u6C42\uFF0C\u5207\u5B9E\u9632\u8303\u4F01\u4E1A\u6CC4\u5BC6\u98CE\u9669", duration: 3e3 });
   };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "widget.qw",
   "private": false,
-  "version": "1.0.45",
+  "version": "1.0.46",
   "description": "marqstree Vue3组件库",
   "main": "build/widget.qw.es.js",
   "keywords": [

package/src/components/ObjsEditor.vue

@@ -147,15 +147,28 @@ const key2value = (key, item) => {
     if (Array.isArray(v)) {
         let formatValues = v.map(e => {
             let kvs = Object.keys(e).map(k => {
+                console.log('1111111')
+                console.log(props.schema[key])
+                console.log(key)
+                console.log(v)
+                console.log(k)
+
                 let label = props.schema[key].schema[k].label
                 let formatValue = e[k]
-
+                
                 //下拉框选项，用选项的第二个属性value找选中的选项
                 //再取选项的第一个属性name作为标题
                 if (props.schema[key].schema[k]?.schema?.options) {
                     let one = props.schema[key].schema[k]?.schema?.options.find(item => item[Object.keys(item)[1]] === formatValue)
-                    formatValue = one[Object.keys(one)[0]]
+                    if(one)
+                        formatValue = one[Object.keys(one)[0]]
+                    else
+                        formatValue = ''
                 }
+
+                if(typeof formatValue === 'boolean')
+                    formatValue = formatValue ? '是' : '否'
+
                 return `${label}:${formatValue}`
             })
             return kvs.join(',')
@@ -167,7 +180,7 @@ const key2value = (key, item) => {
     //再取选项的第一个属性name作为标题
     else if (props.schema[key]?.schema?.options) {
         let one = props.schema[key]?.schema?.options.find(item => item[Object.keys(item)[1]] === v)
-        return one[Object.keys(one)[0]]
+        return one ? one[Object.keys(one)[0]] : ''
     }
     else {
         return v

package/src/env.d.ts

@@ -1,8 +1,8 @@
-/// <reference types="vite/client" />
-
-declare module '*.vue' {
-  import type { DefineComponent } from 'vue'
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/ban-types
-  const component: DefineComponent<{}, {}, any>
-  export default component
-}
+/// <reference types="vite/client" />
+
+declare module '*.vue' {
+  import type { DefineComponent } from 'vue'
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/ban-types
+  const component: DefineComponent<{}, {}, any>
+  export default component
+}

package/src/views/objseditor/index.vue

@@ -9,59 +9,140 @@ import { onMounted, reactive, watch } from "vue";
 
 const data = reactive({
     schema: {
-        id:{
-            label: 'id',
-            type: 'String',
-            // 自动生成8位uuid默认值
-            default: 'uuid',
-            //此字段是隐藏值
-            auth: 'gone',
-        },
         name: {
-            label: '房号',
+            label: '房型',
             type: 'String',
             default: '',
-            auth:'required'
-        },
-        finishQuantity:{
-            label: '完成数量',
-            type: 'Number',
-            default: 0,
-            auth: 'readonly'
+            auth: 'required',
+            schema: {
+                options: [
+                    {
+                        label: "a",
+                        value: "a",
+                        materials: [
+                            {
+                                materialId: "jiFdBeVT",
+                                quantity: 1,
+                            },
+                            {
+                                materialId: "v6tjBw4R",
+                                quantity: 2,
+                            }
+                        ]
+                    },
+                    {
+                        label: "b",
+                        value: "b",
+                        materials: [
+                            {
+                                materialId: "jiFdBeVT",
+                                quantity: 1,
+                            },
+                            {
+                                materialId: "v6tjBw4R",
+                                quantity: 2,
+                            }
+                        ]
+                    }
+                ]
+            }
         },
-        quantity:{
-            label: '每天最多完成数量',
+        quantity: {
+            label: '数量',
             type: 'Number',
-            default: 0,
-            auth: 'option'
+            default: 1,
+            auth: 'required',
         },
-        parts: {
-            label: '空调',
+        materials: {
+            label: '材料表',
             type: 'Array',
             default: [],
-            auth:'required',
+            auth: 'required',
             schema: {
-                partStandardId: {
-                    label: '名称',
+                materialId: {
+                    label: '材料id',
                     type: 'String',
                     default: '',
+                    auth: 'required',
                     schema: {
-                        options: [{
-                            name:'内机',
-                            value: 'nj',
-                            title: '内机'
-                        }]
+                        options: [
+                            {
+                                "name": "保温棉",
+                                "materialId": "jiFdBeVT",
+                                "specification": "6mm",
+                                "unit": "m"
+                            },
+                            {
+                                "name": "保温棉",
+                                "materialId": "v6tjBw4R",
+                                "specification": "8mm",
+                                "unit": "m"
+                            }]
                     }
                 },
                 quantity: {
                     label: '数量',
                     type: 'Number',
-                    default: 1,
+                    default: 0,
+                    auth: 'required'
                 }
             }
         }
     },
     // schema: {
+    //     id:{
+    //         label: 'id',
+    //         type: 'String',
+    //         // 自动生成8位uuid默认值
+    //         default: 'uuid',
+    //         //此字段是隐藏值
+    //         auth: 'gone',
+    //     },
+    //     name: {
+    //         label: '房号',
+    //         type: 'String',
+    //         default: '',
+    //         auth:'required'
+    //     },
+    //     finishQuantity:{
+    //         label: '完成数量',
+    //         type: 'Number',
+    //         default: 0,
+    //         auth: 'readonly'
+    //     },
+    //     quantity:{
+    //         label: '每天最多完成数量',
+    //         type: 'Number',
+    //         default: 0,
+    //         auth: 'option'
+    //     },
+    //     parts: {
+    //         label: '空调',
+    //         type: 'Array',
+    //         default: [],
+    //         auth:'required',
+    //         schema: {
+    //             partStandardId: {
+    //                 label: '名称',
+    //                 type: 'String',
+    //                 default: '',
+    //                 schema: {
+    //                     options: [{
+    //                         name:'内机',
+    //                         value: 'nj',
+    //                         title: '内机'
+    //                     }]
+    //                 }
+    //             },
+    //             quantity: {
+    //                 label: '数量',
+    //                 type: 'Number',
+    //                 default: 1,
+    //             }
+    //         }
+    //     }
+    // },
+    // schema: {
     //     title: {
     //         label: '标题',
     //         type: 'String',

package/tsconfig.json

@@ -1,19 +1,19 @@
-{
-  "compilerOptions": {
-    "target": "esnext",
-    "useDefineForClassFields": true,
-    "module": "esnext",
-    "moduleResolution": "node",
-    "strict": true,
-    "jsx": "preserve",
-    "sourceMap": true,
-    "resolveJsonModule": true,
-    "isolatedModules": true,
-    "esModuleInterop": true,
-    "lib": ["esnext", "dom"],
-    "skipLibCheck": true,
-    "allowJs": true,
-  },
-  "include": ["src/**/*.ts", "src/**/*.d.ts", "src/**/*.tsx", "src/**/*.vue"],
-  "references": [{ "path": "./tsconfig.node.json" }]
-}
+{
+  "compilerOptions": {
+    "target": "esnext",
+    "useDefineForClassFields": true,
+    "module": "esnext",
+    "moduleResolution": "node",
+    "strict": true,
+    "jsx": "preserve",
+    "sourceMap": true,
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "esModuleInterop": true,
+    "lib": ["esnext", "dom"],
+    "skipLibCheck": true,
+    "allowJs": true,
+  },
+  "include": ["src/**/*.ts", "src/**/*.d.ts", "src/**/*.tsx", "src/**/*.vue"],
+  "references": [{ "path": "./tsconfig.node.json" }]
+}

package/tsconfig.node.json

@@ -1,8 +1,8 @@
-{
-  "compilerOptions": {
-    "composite": true,
-    "module": "esnext",
-    "moduleResolution": "node"
-  },
-  "include": ["vite.config.ts"]
-}
+{
+  "compilerOptions": {
+    "composite": true,
+    "module": "esnext",
+    "moduleResolution": "node"
+  },
+  "include": ["vite.config.ts"]
+}